From e91eb4007cadfeccef7dd26206632495f18e146a Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Sun, 20 Apr 2008 02:38:35 +0000 Subject: [PATCH] Flipped the damn mem_mask. It is no longer inverted when passed to read/write handlers. Updated all drivers accordingly. Hope I didn't miss anything important! Blame OG and smf for goading me into it. :) --- src/emu/cpu/h83002/h83002.c | 36 +-- src/emu/cpu/m37710/m37710.c | 6 +- src/emu/cpu/sh2/sh2.c | 22 +- src/emu/cpu/sh4/sh4.c | 12 +- src/emu/cpu/tms34010/tms34010.c | 6 +- src/emu/debug/debugcpu.c | 6 +- src/emu/devconv.h | 112 ++++---- src/emu/machine/am53cf96.c | 4 +- src/emu/machine/smc91c9x.c | 6 +- src/emu/memory.c | 436 ++++++++++++++++---------------- src/emu/memory.h | 30 +-- src/emu/sound/c352.c | 2 +- src/emu/sound/es5506.c | 4 +- src/emu/video/voodoo.c | 32 +-- src/mame/audio/amiga.c | 2 +- src/mame/audio/cage.c | 2 +- src/mame/audio/cchasm.c | 10 +- src/mame/audio/cps3.c | 2 +- src/mame/audio/dcs.c | 10 +- src/mame/audio/leland.c | 76 +++--- src/mame/audio/seibu.c | 4 +- src/mame/drivers/acommand.c | 4 +- src/mame/drivers/aquarium.c | 2 +- src/mame/drivers/armedf.c | 2 +- src/mame/drivers/asterix.c | 2 +- src/mame/drivers/atarigt.c | 8 +- src/mame/drivers/atarigx2.c | 2 +- src/mame/drivers/atarisy2.c | 12 +- src/mame/drivers/aztarac.c | 4 +- src/mame/drivers/badlands.c | 2 +- src/mame/drivers/bbusters.c | 6 +- src/mame/drivers/beathead.c | 4 +- src/mame/drivers/bfm_sc2.c | 2 +- src/mame/drivers/bigfghtr.c | 4 +- src/mame/drivers/btoads.c | 2 +- src/mame/drivers/capbowl.c | 8 +- src/mame/drivers/cave.c | 6 +- src/mame/drivers/cbuster.c | 2 +- src/mame/drivers/cojag.c | 8 +- src/mame/drivers/crystal.c | 6 +- src/mame/drivers/cvs.c | 12 +- src/mame/drivers/darius.c | 8 +- src/mame/drivers/darkseal.c | 2 +- src/mame/drivers/dcheese.c | 2 +- src/mame/drivers/deco32.c | 10 +- src/mame/drivers/deco_mlc.c | 8 +- src/mame/drivers/dgpix.c | 8 +- src/mame/drivers/djmain.c | 20 +- src/mame/drivers/dominob.c | 2 +- src/mame/drivers/exerion.c | 2 +- src/mame/drivers/exidy440.c | 2 +- src/mame/drivers/exterm.c | 3 +- src/mame/drivers/f-32.c | 2 +- src/mame/drivers/fcombat.c | 2 +- src/mame/drivers/findout.c | 2 +- src/mame/drivers/firebeat.c | 8 +- src/mame/drivers/foodf.c | 4 +- src/mame/drivers/funkybee.c | 2 +- src/mame/drivers/gaelco3d.c | 22 +- src/mame/drivers/gcpinbal.c | 6 +- src/mame/drivers/genesis.c | 2 +- src/mame/drivers/getrivia.c | 2 +- src/mame/drivers/gijoe.c | 2 +- src/mame/drivers/gottlieb.c | 8 +- src/mame/drivers/groundfx.c | 6 +- src/mame/drivers/gunbustr.c | 8 +- src/mame/drivers/hng64.c | 10 +- src/mame/drivers/itech32.c | 45 +--- src/mame/drivers/jalmah.c | 36 +-- src/mame/drivers/karnov.c | 2 +- src/mame/drivers/kinst.c | 4 +- src/mame/drivers/koikoi.c | 2 +- src/mame/drivers/konamigv.c | 18 +- src/mame/drivers/konamigx.c | 1 - src/mame/drivers/ksys573.c | 8 +- src/mame/drivers/macrossp.c | 2 +- src/mame/drivers/mainsnk.c | 2 +- src/mame/drivers/mcr68.c | 2 +- src/mame/drivers/megasys1.c | 14 +- src/mame/drivers/metro.c | 6 +- src/mame/drivers/model2.c | 22 +- src/mame/drivers/model3.c | 2 +- src/mame/drivers/mquake.c | 4 +- src/mame/drivers/namcona1.c | 10 +- src/mame/drivers/namconb1.c | 4 +- src/mame/drivers/namcos12.c | 2 +- src/mame/drivers/namcos22.c | 6 +- src/mame/drivers/namcos23.c | 2 +- src/mame/drivers/nemesis.c | 8 +- src/mame/drivers/neogeo.c | 4 +- src/mame/drivers/nmk16.c | 2 +- src/mame/drivers/nyny.c | 6 +- src/mame/drivers/overdriv.c | 2 +- src/mame/drivers/pacman.c | 4 +- src/mame/drivers/pasha2.c | 8 +- src/mame/drivers/peplus.c | 2 +- src/mame/drivers/pirates.c | 2 +- src/mame/drivers/plygonet.c | 12 +- src/mame/drivers/policetr.c | 6 +- src/mame/drivers/popeye.c | 4 +- src/mame/drivers/psikyo.c | 2 +- src/mame/drivers/psikyo4.c | 4 +- src/mame/drivers/punchout.c | 2 +- src/mame/drivers/qdrmfgp.c | 22 +- src/mame/drivers/quasar.c | 12 +- src/mame/drivers/rabbit.c | 6 +- src/mame/drivers/raiden.c | 2 +- src/mame/drivers/raiden2.c | 10 +- src/mame/drivers/rbmk.c | 2 +- src/mame/drivers/realbrk.c | 38 +-- src/mame/drivers/royalmah.c | 24 +- src/mame/drivers/rungun.c | 2 +- src/mame/drivers/seattle.c | 22 +- src/mame/drivers/segahang.c | 8 +- src/mame/drivers/segaorun.c | 12 +- src/mame/drivers/segas16a.c | 10 +- src/mame/drivers/segas16b.c | 10 +- src/mame/drivers/segas18.c | 10 +- src/mame/drivers/segas32.c | 16 +- src/mame/drivers/segaxbd.c | 2 +- src/mame/drivers/seibuspi.c | 4 +- src/mame/drivers/seta.c | 2 +- src/mame/drivers/sf.c | 6 +- src/mame/drivers/shisen.c | 8 +- src/mame/drivers/slapshot.c | 4 +- src/mame/drivers/snk.c | 2 +- src/mame/drivers/spiders.c | 6 +- src/mame/drivers/sshangha.c | 2 +- src/mame/drivers/stv.c | 4 +- src/mame/drivers/superchs.c | 12 +- src/mame/drivers/system16.c | 10 +- src/mame/drivers/taito_b.c | 18 +- src/mame/drivers/taito_f2.c | 94 +++---- src/mame/drivers/taito_z.c | 48 ++-- src/mame/drivers/thunderj.c | 2 +- src/mame/drivers/tickee.c | 4 +- src/mame/drivers/tmnt.c | 20 +- src/mame/drivers/toratora.c | 10 +- src/mame/drivers/tumbleb.c | 2 +- src/mame/drivers/ultrsprt.c | 4 +- src/mame/drivers/undrfire.c | 12 +- src/mame/drivers/unico.c | 8 +- src/mame/drivers/vegaeo.c | 26 +- src/mame/drivers/vegas.c | 22 +- src/mame/drivers/vicdual.c | 16 +- src/mame/drivers/wecleman.c | 4 +- src/mame/drivers/wwfwfest.c | 2 +- src/mame/drivers/xexex.c | 2 +- src/mame/drivers/xmen.c | 4 +- src/mame/drivers/zn.c | 10 +- src/mame/machine/amiga.c | 22 +- src/mame/machine/arkanoid.c | 6 +- src/mame/machine/asic65.c | 2 +- src/mame/machine/atarifb.c | 6 +- src/mame/machine/atarigen.c | 12 +- src/mame/machine/balsente.c | 10 +- src/mame/machine/bsktball.c | 10 +- src/mame/machine/cubocd32.c | 2 +- src/mame/machine/dc.c | 14 +- src/mame/machine/decocass.c | 8 +- src/mame/machine/decoprot.c | 12 +- src/mame/machine/galaxold.c | 4 +- src/mame/machine/harddriv.c | 2 +- src/mame/machine/midwayic.c | 16 +- src/mame/machine/midwunit.c | 8 +- src/mame/machine/n64.c | 12 +- src/mame/machine/psx.c | 18 +- src/mame/machine/segaic16.c | 2 +- src/mame/machine/segas32.c | 8 +- src/mame/machine/seicop.c | 162 ++++++------ src/mame/machine/stvcd.c | 6 +- src/mame/machine/stvprot.c | 6 +- src/mame/machine/subs.c | 10 +- src/mame/machine/taitosj.c | 2 +- src/mame/machine/toaplan1.c | 4 +- src/mame/machine/williams.c | 2 +- src/mame/video/amiga.c | 2 +- src/mame/video/armedf.c | 2 +- src/mame/video/atarisy1.c | 6 +- src/mame/video/beathead.c | 10 +- src/mame/video/bionicc.c | 2 +- src/mame/video/blstroid.c | 2 +- src/mame/video/btime.c | 2 +- src/mame/video/cave.c | 4 +- src/mame/video/cischeat.c | 14 +- src/mame/video/crshrace.c | 4 +- src/mame/video/dc.c | 6 +- src/mame/video/dcheese.c | 4 +- src/mame/video/dec0.c | 4 +- src/mame/video/decocass.c | 2 +- src/mame/video/dooyong.c | 2 +- src/mame/video/dynduke.c | 2 +- src/mame/video/eolith.c | 6 +- src/mame/video/gaelco2.c | 2 +- src/mame/video/genesis.c | 8 +- src/mame/video/groundfx.c | 4 +- src/mame/video/itech32.c | 4 +- src/mame/video/konamiic.c | 36 ++- src/mame/video/lastduel.c | 2 +- src/mame/video/m92.c | 2 +- src/mame/video/megasys1.c | 6 +- src/mame/video/neogeo.c | 8 +- src/mame/video/policetr.c | 12 +- src/mame/video/psikyosh.c | 2 +- src/mame/video/psx.c | 2 +- src/mame/video/rastan.c | 4 +- src/mame/video/stvvdp1.c | 2 +- src/mame/video/suprnova.c | 2 +- src/mame/video/taito_b.c | 2 +- src/mame/video/taitoic.c | 24 +- src/mame/video/thepit.c | 4 +- src/mame/video/tigeroad.c | 2 +- src/mame/video/toaplan1.c | 10 +- src/mame/video/toaplan2.c | 12 +- src/mame/video/toki.c | 4 +- src/mame/video/twin16.c | 2 +- src/mame/video/twincobr.c | 26 +- src/mame/video/undrfire.c | 4 +- src/mame/video/volfied.c | 2 +- 219 files changed, 1252 insertions(+), 1285 deletions(-) diff --git a/src/emu/cpu/h83002/h83002.c b/src/emu/cpu/h83002/h83002.c index 681e1f2b63e..315e034174a 100644 --- a/src/emu/cpu/h83002/h83002.c +++ b/src/emu/cpu/h83002/h83002.c @@ -3941,16 +3941,16 @@ static void h8_set_info(UINT32 state, cpuinfo *info) static READ16_HANDLER( h8_itu_r ) { - if (mem_mask == 0) + if (mem_mask == 0xffff) { // 16-bit read return h8_register_read8(offset*2 + 0xffff10)<<8 | h8_register_read8((offset*2) + 1 + 0xffff10); } - else if (mem_mask == 0xff) + else if (mem_mask == 0xff00) { return h8_register_read8(offset*2 + 0xffff10)<<8; } - else if (mem_mask == 0xff00) + else if (mem_mask == 0x00ff) { return h8_register_read8((offset*2) + 1 + 0xffff10); } @@ -3960,17 +3960,17 @@ static READ16_HANDLER( h8_itu_r ) static WRITE16_HANDLER( h8_itu_w ) { - if (mem_mask == 0) + if (mem_mask == 0xffff) { // 16-bit write h8_register_write8(offset*2 + 0xffff10, data>>8); h8_register_write8((offset*2) + 1 + 0xffff10, data&0xff); } - else if (mem_mask == 0xff) + else if (mem_mask == 0xff00) { h8_register_write8(offset*2 + 0xffff10, data>>8); } - else if (mem_mask == 0xff00) + else if (mem_mask == 0x00ff) { h8_register_write8((offset*2) + 1 + 0xffff10, data&0xff); } @@ -3978,16 +3978,16 @@ static WRITE16_HANDLER( h8_itu_w ) static READ16_HANDLER( h8_3007_itu_r ) { - if (mem_mask == 0) + if (mem_mask == 0xffff) { // 16-bit read return h8_3007_register_read8(offset*2 + 0xffff20)<<8 | h8_3007_register_read8((offset*2) + 1 + 0xffff20); } - else if (mem_mask == 0xff) + else if (mem_mask == 0xff00) { return h8_3007_register_read8(offset*2 + 0xffff20)<<8; } - else if (mem_mask == 0xff00) + else if (mem_mask == 0x00ff) { return h8_3007_register_read8((offset*2) + 1 + 0xffff20); } @@ -3996,17 +3996,17 @@ static READ16_HANDLER( h8_3007_itu_r ) } static WRITE16_HANDLER( h8_3007_itu_w ) { - if (mem_mask == 0) + if (mem_mask == 0xffff) { // 16-bit write h8_3007_register_write8(offset*2 + 0xffff20, data>>8); h8_3007_register_write8((offset*2) + 1 + 0xffff20, data&0xff); } - else if (mem_mask == 0xff) + else if (mem_mask == 0xff00) { h8_3007_register_write8(offset*2 + 0xffff20, data>>8); } - else if (mem_mask == 0xff00) + else if (mem_mask == 0x00ff) { h8_3007_register_write8((offset*2) + 1 + 0xffff20, data&0xff); } @@ -4014,16 +4014,16 @@ static WRITE16_HANDLER( h8_3007_itu_w ) static READ16_HANDLER( h8_3007_itu1_r ) { - if (mem_mask == 0) + if (mem_mask == 0xffff) { // 16-bit read return h8_3007_register1_read8(offset*2 + 0xfee000)<<8 | h8_3007_register1_read8((offset*2) + 1 + 0xfee000); } - else if (mem_mask == 0xff) + else if (mem_mask == 0xff00) { return h8_3007_register1_read8(offset*2 + 0xfee000)<<8; } - else if (mem_mask == 0xff00) + else if (mem_mask == 0x00ff) { return h8_3007_register1_read8((offset*2) + 1 + 0xfee000); } @@ -4032,17 +4032,17 @@ static READ16_HANDLER( h8_3007_itu1_r ) } static WRITE16_HANDLER( h8_3007_itu1_w ) { - if (mem_mask == 0) + if (mem_mask == 0xffff) { // 16-bit write h8_3007_register1_write8(offset*2 + 0xfee000, data>>8); h8_3007_register1_write8((offset*2) + 1 + 0xfee000, data&0xff); } - else if (mem_mask == 0xff) + else if (mem_mask == 0xff00) { h8_3007_register1_write8(offset*2 + 0xfee000, data>>8); } - else if (mem_mask == 0xff00) + else if (mem_mask == 0x00ff) { h8_3007_register1_write8((offset*2) + 1 + 0xfee000, data&0xff); } diff --git a/src/emu/cpu/m37710/m37710.c b/src/emu/cpu/m37710/m37710.c index c6632c2ea93..795d27f0654 100644 --- a/src/emu/cpu/m37710/m37710.c +++ b/src/emu/cpu/m37710/m37710.c @@ -669,16 +669,16 @@ static READ16_HANDLER( m37710_internal_word_r ) static WRITE16_HANDLER( m37710_internal_word_w ) { - if (mem_mask == 0) + if (mem_mask == 0xffff) { m37710_internal_w((offset*2), data & 0xff); m37710_internal_w((offset*2)+1, data>>8); } - else if (mem_mask == 0xff) + else if (mem_mask == 0xff00) { m37710_internal_w((offset*2)+1, data>>8); } - else if (mem_mask == 0xff00) + else if (mem_mask == 0x00ff) { m37710_internal_w((offset*2), data & 0xff); } diff --git a/src/emu/cpu/sh2/sh2.c b/src/emu/cpu/sh2/sh2.c index 213c451928e..52d9db39e3a 100644 --- a/src/emu/cpu/sh2/sh2.c +++ b/src/emu/cpu/sh2/sh2.c @@ -189,7 +189,7 @@ static TIMER_CALLBACK( sh2_timer_callback ); INLINE UINT8 RB(offs_t A) { if (A >= 0xe0000000) - return sh2_internal_r(Machine, (A & 0x1fc)>>2, ~(0xff << (((~A) & 3)*8))) >> (((~A) & 3)*8); + return sh2_internal_r(Machine, (A & 0x1fc)>>2, 0xff << (((~A) & 3)*8)) >> (((~A) & 3)*8); if (A >= 0xc0000000) return program_read_byte_32be(A); @@ -203,7 +203,7 @@ INLINE UINT8 RB(offs_t A) INLINE UINT16 RW(offs_t A) { if (A >= 0xe0000000) - return sh2_internal_r(Machine, (A & 0x1fc)>>2, ~(0xffff << (((~A) & 2)*8))) >> (((~A) & 2)*8); + return sh2_internal_r(Machine, (A & 0x1fc)>>2, 0xffff << (((~A) & 2)*8)) >> (((~A) & 2)*8); if (A >= 0xc0000000) return program_read_word_32be(A); @@ -217,7 +217,7 @@ INLINE UINT16 RW(offs_t A) INLINE UINT32 RL(offs_t A) { if (A >= 0xe0000000) - return sh2_internal_r(Machine, (A & 0x1fc)>>2, 0); + return sh2_internal_r(Machine, (A & 0x1fc)>>2, 0xffffffff); if (A >= 0xc0000000) return program_read_dword_32be(A); @@ -233,7 +233,7 @@ INLINE void WB(offs_t A, UINT8 V) if (A >= 0xe0000000) { - sh2_internal_w(Machine, (A & 0x1fc)>>2, V << (((~A) & 3)*8), ~(0xff << (((~A) & 3)*8))); + sh2_internal_w(Machine, (A & 0x1fc)>>2, V << (((~A) & 3)*8), 0xff << (((~A) & 3)*8)); return; } @@ -253,7 +253,7 @@ INLINE void WW(offs_t A, UINT16 V) { if (A >= 0xe0000000) { - sh2_internal_w(Machine, (A & 0x1fc)>>2, V << (((~A) & 2)*8), ~(0xffff << (((~A) & 2)*8))); + sh2_internal_w(Machine, (A & 0x1fc)>>2, V << (((~A) & 2)*8), 0xffff << (((~A) & 2)*8)); return; } @@ -273,7 +273,7 @@ INLINE void WL(offs_t A, UINT32 V) { if (A >= 0xe0000000) { - sh2_internal_w(Machine, (A & 0x1fc)>>2, V, 0); + sh2_internal_w(Machine, (A & 0x1fc)>>2, V, 0xffffffff); return; } @@ -2651,12 +2651,12 @@ WRITE32_HANDLER( sh2_internal_w ) { // Timers case 0x04: // TIER, FTCSR, FRC - if((mem_mask & 0x00ffffff) != 0xffffff) + if((mem_mask & 0x00ffffff) != 0) sh2_timer_resync(); logerror("SH2.%d: TIER write %04x @ %04x\n", sh2.cpu_number, data >> 16, mem_mask>>16); sh2.m[4] = (sh2.m[4] & ~(ICF|OCFA|OCFB|OVF)) | (old & sh2.m[4] & (ICF|OCFA|OCFB|OVF)); COMBINE_DATA(&sh2.frc); - if((mem_mask & 0x00ffffff) != 0xffffff) + if((mem_mask & 0x00ffffff) != 0) sh2_timer_activate(); sh2_recalc_irq(); break; @@ -2664,9 +2664,9 @@ WRITE32_HANDLER( sh2_internal_w ) logerror("SH2.%d: TCR write %08x @ %08x\n", sh2.cpu_number, data, mem_mask); sh2_timer_resync(); if(sh2.m[5] & 0x10) - sh2.ocrb = (sh2.ocrb & (mem_mask >> 16)) | ((data & ~mem_mask) >> 16); + sh2.ocrb = (sh2.ocrb & (~mem_mask >> 16)) | ((data & mem_mask) >> 16); else - sh2.ocra = (sh2.ocra & (mem_mask >> 16)) | ((data & ~mem_mask) >> 16); + sh2.ocra = (sh2.ocra & (~mem_mask >> 16)) | ((data & mem_mask) >> 16); sh2_timer_activate(); break; @@ -2813,7 +2813,7 @@ READ32_HANDLER( sh2_internal_r ) switch( offset ) { case 0x04: // TIER, FTCSR, FRC - if ( mem_mask == 0xff00ffff ) + if ( mem_mask == 0x00ff0000 ) if ( sh2.ftcsr_read_callback != NULL ) sh2.ftcsr_read_callback( (sh2.m[4] & 0xffff0000) | sh2.frc ); sh2_timer_resync(); diff --git a/src/emu/cpu/sh4/sh4.c b/src/emu/cpu/sh4/sh4.c index 42064a4ab52..9edbc008fb9 100644 --- a/src/emu/cpu/sh4/sh4.c +++ b/src/emu/cpu/sh4/sh4.c @@ -239,7 +239,7 @@ UINT32 abs; INLINE UINT8 RB(offs_t A) { if (A >= 0xfe000000) - return sh4_internal_r(Machine, ((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), ~(0xff << ((A & 3)*8))) >> ((A & 3)*8); + return sh4_internal_r(Machine, ((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), 0xff << ((A & 3)*8)) >> ((A & 3)*8); if (A >= 0xe0000000) return program_read_byte_64le(A); @@ -253,7 +253,7 @@ INLINE UINT8 RB(offs_t A) INLINE UINT16 RW(offs_t A) { if (A >= 0xfe000000) - return sh4_internal_r(Machine, ((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), ~(0xffff << ((A & 2)*8))) >> ((A & 2)*8); + return sh4_internal_r(Machine, ((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), 0xffff << ((A & 2)*8)) >> ((A & 2)*8); if (A >= 0xe0000000) return program_read_word_64le(A); @@ -267,7 +267,7 @@ INLINE UINT16 RW(offs_t A) INLINE UINT32 RL(offs_t A) { if (A >= 0xfe000000) - return sh4_internal_r(Machine, ((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), 0); + return sh4_internal_r(Machine, ((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), 0xffffffff); if (A >= 0xe0000000) return program_read_dword_64le(A); @@ -283,7 +283,7 @@ INLINE void WB(offs_t A, UINT8 V) if (A >= 0xfe000000) { - sh4_internal_w(Machine, ((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), V << ((A & 3)*8), ~(0xff << ((A & 3)*8))); + sh4_internal_w(Machine, ((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), V << ((A & 3)*8), 0xff << ((A & 3)*8)); return; } @@ -303,7 +303,7 @@ INLINE void WW(offs_t A, UINT16 V) { if (A >= 0xfe000000) { - sh4_internal_w(Machine, ((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), V << ((A & 2)*8), ~(0xffff << ((A & 2)*8))); + sh4_internal_w(Machine, ((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), V << ((A & 2)*8), 0xffff << ((A & 2)*8)); return; } @@ -323,7 +323,7 @@ INLINE void WL(offs_t A, UINT32 V) { if (A >= 0xfe000000) { - sh4_internal_w(Machine, ((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), V, 0); + sh4_internal_w(Machine, ((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), V, 0xffffffff); return; } diff --git a/src/emu/cpu/tms34010/tms34010.c b/src/emu/cpu/tms34010/tms34010.c index a48472395ee..194ac066631 100644 --- a/src/emu/cpu/tms34010/tms34010.c +++ b/src/emu/cpu/tms34010/tms34010.c @@ -701,7 +701,7 @@ static void tms34010_reset(void) /* the first time we are run */ state.reset_deferred = state.config->halt_on_reset; if (state.config->halt_on_reset) - tms34010_io_register_w(Machine, REG_HSTCTLH, 0x8000, 0); + tms34010_io_register_w(Machine, REG_HSTCTLH, 0x8000, 0xffff); } #if (HAS_TMS34020) @@ -1672,8 +1672,8 @@ void tms34010_host_w(int cpunum, int reg, int data) /* control register */ case TMS34010_HOST_CONTROL: external_host_access = TRUE; - tms34010_io_register_w(state.screen->machine, REG_HSTCTLH, data & 0xff00, 0); - tms34010_io_register_w(state.screen->machine, REG_HSTCTLL, data & 0x00ff, 0); + tms34010_io_register_w(state.screen->machine, REG_HSTCTLH, data & 0xff00, 0xffff); + tms34010_io_register_w(state.screen->machine, REG_HSTCTLL, data & 0x00ff, 0xffff); external_host_access = FALSE; break; diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c index 7ff14e6e603..e2d60e79ad3 100644 --- a/src/emu/debug/debugcpu.c +++ b/src/emu/debug/debugcpu.c @@ -1320,7 +1320,7 @@ static void check_watchpoints(int cpunum, int spacenum, int type, offs_t address within_debugger_code = TRUE; /* adjust address, size & value_to_write based on mem_mask. */ - if( mem_mask != 0 ) + if (mem_mask != 0) { const debug_cpu_info *info = &debug_cpuinfo[cpunum]; int address_offset = 0; @@ -1340,13 +1340,9 @@ static void check_watchpoints(int cpunum, int spacenum, int type, offs_t address } if (info->endianness == CPU_IS_LE) - { address += address_offset; - } else - { address += bus_size - size - address_offset; - } } /* if we are a write watchpoint, stash the value that will be written */ diff --git a/src/emu/devconv.h b/src/emu/devconv.h index d3ed803305b..b116a1041a4 100644 --- a/src/emu/devconv.h +++ b/src/emu/devconv.h @@ -88,9 +88,9 @@ INLINE UINT16 read16be_with_read8_device_handler(read8_device_func handler, const device_config *device, offs_t offset, UINT16 mem_mask) { UINT16 result = 0; - if ((mem_mask & 0xff00) != 0xff00) + if ((mem_mask & 0xff00) != 0) result |= ((UINT16)(*handler)(device, offset * 2 + 0)) << 8; - if ((mem_mask & 0x00ff) != 0x00ff) + if ((mem_mask & 0x00ff) != 0) result |= ((UINT16)(*handler)(device, offset * 2 + 1)) << 0; return result; } @@ -98,9 +98,9 @@ INLINE UINT16 read16be_with_read8_device_handler(read8_device_func handler, cons INLINE void write16be_with_write8_device_handler(write8_device_func handler, const device_config *device, offs_t offset, UINT16 data, UINT16 mem_mask) { - if ((mem_mask & 0xff00) != 0xff00) + if ((mem_mask & 0xff00) != 0) (*handler)(device, offset * 2 + 0, data >> 8); - if ((mem_mask & 0x00ff) != 0x00ff) + if ((mem_mask & 0x00ff) != 0) (*handler)(device, offset * 2 + 1, data >> 0); } @@ -114,9 +114,9 @@ INLINE void write16be_with_write8_device_handler(write8_device_func handler, con INLINE UINT16 read16le_with_read8_device_handler(read8_device_func handler, const device_config *device, offs_t offset, UINT16 mem_mask) { UINT16 result = 0; - if ((mem_mask & 0x00ff) != 0x00ff) + if ((mem_mask & 0x00ff) != 0) result |= ((UINT16) (*handler)(device, offset * 2 + 0)) << 0; - if ((mem_mask & 0xff00) != 0xff00) + if ((mem_mask & 0xff00) != 0) result |= ((UINT16) (*handler)(device, offset * 2 + 1)) << 8; return result; } @@ -124,9 +124,9 @@ INLINE UINT16 read16le_with_read8_device_handler(read8_device_func handler, cons INLINE void write16le_with_write8_device_handler(write8_device_func handler, const device_config *device, offs_t offset, UINT16 data, UINT16 mem_mask) { - if ((mem_mask & 0x00ff) != 0x00ff) + if ((mem_mask & 0x00ff) != 0) (*handler)(device, offset * 2 + 0, data >> 0); - if ((mem_mask & 0xff00) != 0xff00) + if ((mem_mask & 0xff00) != 0) (*handler)(device, offset * 2 + 1, data >> 8); } @@ -140,9 +140,9 @@ INLINE void write16le_with_write8_device_handler(write8_device_func handler, con INLINE UINT32 read32be_with_read8_device_handler(read8_device_func handler, const device_config *device, offs_t offset, UINT32 mem_mask) { UINT32 result = 0; - if ((mem_mask & 0xffff0000) != 0xffff0000) + if ((mem_mask & 0xffff0000) != 0) result |= read16be_with_read8_device_handler(handler, device, offset * 2 + 0, mem_mask >> 16) << 16; - if ((mem_mask & 0x0000ffff) != 0x0000ffff) + if ((mem_mask & 0x0000ffff) != 0) result |= read16be_with_read8_device_handler(handler, device, offset * 2 + 1, mem_mask) << 0; return result; } @@ -150,9 +150,9 @@ INLINE UINT32 read32be_with_read8_device_handler(read8_device_func handler, cons INLINE void write32be_with_write8_device_handler(write8_device_func handler, const device_config *device, offs_t offset, UINT32 data, UINT32 mem_mask) { - if ((mem_mask & 0xffff0000) != 0xffff0000) + if ((mem_mask & 0xffff0000) != 0) write16be_with_write8_device_handler(handler, device, offset * 2 + 0, data >> 16, mem_mask >> 16); - if ((mem_mask & 0x0000ffff) != 0x0000ffff) + if ((mem_mask & 0x0000ffff) != 0) write16be_with_write8_device_handler(handler, device, offset * 2 + 1, data, mem_mask); } @@ -166,9 +166,9 @@ INLINE void write32be_with_write8_device_handler(write8_device_func handler, con INLINE UINT32 read32le_with_read8_device_handler(read8_device_func handler, const device_config *device, offs_t offset, UINT32 mem_mask) { UINT32 result = 0; - if ((mem_mask & 0x0000ffff) != 0x0000ffff) + if ((mem_mask & 0x0000ffff) != 0) result |= read16le_with_read8_device_handler(handler, device, offset * 2 + 0, mem_mask) << 0; - if ((mem_mask & 0xffff0000) != 0xffff0000) + if ((mem_mask & 0xffff0000) != 0) result |= read16le_with_read8_device_handler(handler, device, offset * 2 + 1, mem_mask >> 16) << 16; return result; } @@ -176,9 +176,9 @@ INLINE UINT32 read32le_with_read8_device_handler(read8_device_func handler, cons INLINE void write32le_with_write8_device_handler(write8_device_func handler, const device_config *device, offs_t offset, UINT32 data, UINT32 mem_mask) { - if ((mem_mask & 0x0000ffff) != 0x0000ffff) + if ((mem_mask & 0x0000ffff) != 0) write16le_with_write8_device_handler(handler, device, offset * 2 + 0, data, mem_mask); - if ((mem_mask & 0xffff0000) != 0xffff0000) + if ((mem_mask & 0xffff0000) != 0) write16le_with_write8_device_handler(handler, device, offset * 2 + 1, data >> 16, mem_mask >> 16); } @@ -192,9 +192,9 @@ INLINE void write32le_with_write8_device_handler(write8_device_func handler, con INLINE UINT32 read32be_with_16be_device_handler(read16_device_func handler, const device_config *device, offs_t offset, UINT32 mem_mask) { UINT32 result = 0; - if ((mem_mask & 0xffff0000) != 0xffff0000) + if ((mem_mask & 0xffff0000) != 0) result |= (*handler)(device, offset * 2 + 0, mem_mask >> 16) << 16; - if ((mem_mask & 0x0000ffff) != 0x0000ffff) + if ((mem_mask & 0x0000ffff) != 0) result |= (*handler)(device, offset * 2 + 1, mem_mask) << 0; return result; } @@ -202,9 +202,9 @@ INLINE UINT32 read32be_with_16be_device_handler(read16_device_func handler, cons INLINE void write32be_with_16be_device_handler(write16_device_func handler, const device_config *device, offs_t offset, UINT32 data, UINT32 mem_mask) { - if ((mem_mask & 0xffff0000) != 0xffff0000) + if ((mem_mask & 0xffff0000) != 0) (*handler)(device, offset * 2 + 0, data >> 16, mem_mask >> 16); - if ((mem_mask & 0x0000ffff) != 0x0000ffff) + if ((mem_mask & 0x0000ffff) != 0) (*handler)(device, offset * 2 + 1, data, mem_mask); } @@ -218,9 +218,9 @@ INLINE void write32be_with_16be_device_handler(write16_device_func handler, cons INLINE UINT32 read32le_with_16le_device_handler(read16_device_func handler, const device_config *device, offs_t offset, UINT32 mem_mask) { UINT32 result = 0; - if ((mem_mask & 0x0000ffff) != 0x0000ffff) + if ((mem_mask & 0x0000ffff) != 0) result |= (*handler)(device, offset * 2 + 0, mem_mask) << 0; - if ((mem_mask & 0xffff0000) != 0xffff0000) + if ((mem_mask & 0xffff0000) != 0) result |= (*handler)(device, offset * 2 + 1, mem_mask >> 16) << 16; return result; } @@ -228,9 +228,9 @@ INLINE UINT32 read32le_with_16le_device_handler(read16_device_func handler, cons INLINE void write32le_with_16le_device_handler(write16_device_func handler, const device_config *device, offs_t offset, UINT32 data, UINT32 mem_mask) { - if ((mem_mask & 0x0000ffff) != 0x0000ffff) + if ((mem_mask & 0x0000ffff) != 0) (*handler)(device, offset * 2 + 0, data, mem_mask); - if ((mem_mask & 0xffff0000) != 0xffff0000) + if ((mem_mask & 0xffff0000) != 0) (*handler)(device, offset * 2 + 1, data >> 16, mem_mask >> 16); } @@ -290,9 +290,9 @@ INLINE void write32le_with_16be_device_handler(write16_device_func handler, cons INLINE UINT64 read64be_with_read8_device_handler(read8_device_func handler, const device_config *device, offs_t offset, UINT64 mem_mask) { UINT64 result = 0; - if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000)) + if ((mem_mask & U64(0xffffffff00000000)) != 0) result |= (UINT64)read32be_with_read8_device_handler(handler, device, offset * 2 + 0, mem_mask >> 32) << 32; - if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff)) + if ((mem_mask & U64(0x00000000ffffffff)) != 0) result |= (UINT64)read32be_with_read8_device_handler(handler, device, offset * 2 + 1, mem_mask) << 0; return result; } @@ -300,9 +300,9 @@ INLINE UINT64 read64be_with_read8_device_handler(read8_device_func handler, cons INLINE void write64be_with_write8_device_handler(write8_device_func handler, const device_config *device, offs_t offset, UINT64 data, UINT64 mem_mask) { - if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000)) + if ((mem_mask & U64(0xffffffff00000000)) != 0) write32be_with_write8_device_handler(handler, device, offset * 2 + 0, data >> 32, mem_mask >> 32); - if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff)) + if ((mem_mask & U64(0x00000000ffffffff)) != 0) write32be_with_write8_device_handler(handler, device, offset * 2 + 1, data, mem_mask); } @@ -316,9 +316,9 @@ INLINE void write64be_with_write8_device_handler(write8_device_func handler, con INLINE UINT64 read64le_with_read8_device_handler(read8_device_func handler, const device_config *device, offs_t offset, UINT64 mem_mask) { UINT64 result = 0; - if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff)) + if ((mem_mask & U64(0x00000000ffffffff)) != 0) result |= (UINT64)read32le_with_read8_device_handler(handler, device, offset * 2 + 0, mem_mask >> 0) << 0; - if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000)) + if ((mem_mask & U64(0xffffffff00000000)) != 0) result |= (UINT64)read32le_with_read8_device_handler(handler, device, offset * 2 + 1, mem_mask >> 32) << 32; return result; } @@ -326,9 +326,9 @@ INLINE UINT64 read64le_with_read8_device_handler(read8_device_func handler, cons INLINE void write64le_with_write8_device_handler(write8_device_func handler, const device_config *device, offs_t offset, UINT64 data, UINT64 mem_mask) { - if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff)) + if ((mem_mask & U64(0x00000000ffffffff)) != 0) write32le_with_write8_device_handler(handler, device, offset * 2 + 0, data >> 0, mem_mask >> 0); - if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000)) + if ((mem_mask & U64(0xffffffff00000000)) != 0) write32le_with_write8_device_handler(handler, device, offset * 2 + 1, data >> 32, mem_mask >> 32); } @@ -342,9 +342,9 @@ INLINE void write64le_with_write8_device_handler(write8_device_func handler, con INLINE UINT32 read64be_with_16be_device_handler(read16_device_func handler, const device_config *device, offs_t offset, UINT64 mem_mask) { UINT64 result = 0; - if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000)) + if ((mem_mask & U64(0xffffffff00000000)) != 0) result |= (UINT64)read32be_with_16be_device_handler(handler, device, offset * 2 + 0, mem_mask >> 32) << 32; - if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff)) + if ((mem_mask & U64(0x00000000ffffffff)) != 0) result |= (UINT64)read32be_with_16be_device_handler(handler, device, offset * 2 + 1, mem_mask >> 0) << 0; return result; } @@ -352,9 +352,9 @@ INLINE UINT32 read64be_with_16be_device_handler(read16_device_func handler, cons INLINE void write64be_with_16be_device_handler(write16_device_func handler, const device_config *device, offs_t offset, UINT64 data, UINT64 mem_mask) { - if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000)) + if ((mem_mask & U64(0xffffffff00000000)) != 0) write32be_with_16be_device_handler(handler, device, offset * 2 + 0, data >> 32, mem_mask >> 32); - if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff)) + if ((mem_mask & U64(0x00000000ffffffff)) != 0) write32be_with_16be_device_handler(handler, device, offset * 2 + 1, data >> 0, mem_mask >> 0); } @@ -368,9 +368,9 @@ INLINE void write64be_with_16be_device_handler(write16_device_func handler, cons INLINE UINT32 read64le_with_16le_device_handler(read16_device_func handler, const device_config *device, offs_t offset, UINT64 mem_mask) { UINT64 result = 0; - if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff)) + if ((mem_mask & U64(0x00000000ffffffff)) != 0) result |= (UINT64)read32le_with_16le_device_handler(handler, device, offset * 2 + 0, mem_mask >> 0) << 0; - if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000)) + if ((mem_mask & U64(0xffffffff00000000)) != 0) result |= (UINT64)read32le_with_16le_device_handler(handler, device, offset * 2 + 1, mem_mask >> 32) << 32; return result; } @@ -378,9 +378,9 @@ INLINE UINT32 read64le_with_16le_device_handler(read16_device_func handler, cons INLINE void write64le_with_16le_device_handler(write16_device_func handler, const device_config *device, offs_t offset, UINT64 data, UINT64 mem_mask) { - if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff)) + if ((mem_mask & U64(0x00000000ffffffff)) != 0) write32le_with_16le_device_handler(handler, device, offset * 2 + 0, data >> 0, mem_mask >> 0); - if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000)) + if ((mem_mask & U64(0xffffffff00000000)) != 0) write32le_with_16le_device_handler(handler, device, offset * 2 + 1, data >> 32, mem_mask >> 32); } @@ -394,9 +394,9 @@ INLINE void write64le_with_16le_device_handler(write16_device_func handler, cons INLINE UINT32 read64be_with_16le_device_handler(read16_device_func handler, const device_config *device, offs_t offset, UINT64 mem_mask) { UINT64 result = 0; - if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000)) + if ((mem_mask & U64(0xffffffff00000000)) != 0) result |= (UINT64)read32be_with_16le_device_handler(handler, device, offset * 2 + 0, mem_mask >> 32) << 32; - if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff)) + if ((mem_mask & U64(0x00000000ffffffff)) != 0) result |= (UINT64)read32be_with_16le_device_handler(handler, device, offset * 2 + 1, mem_mask >> 0) << 0; return result; } @@ -404,9 +404,9 @@ INLINE UINT32 read64be_with_16le_device_handler(read16_device_func handler, cons INLINE void write64be_with_16le_device_handler(write16_device_func handler, const device_config *device, offs_t offset, UINT64 data, UINT64 mem_mask) { - if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000)) + if ((mem_mask & U64(0xffffffff00000000)) != 0) write32be_with_16le_device_handler(handler, device, offset * 2 + 0, data >> 32, mem_mask >> 32); - if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff)) + if ((mem_mask & U64(0x00000000ffffffff)) != 0) write32be_with_16le_device_handler(handler, device, offset * 2 + 1, data >> 0, mem_mask >> 0); } @@ -420,9 +420,9 @@ INLINE void write64be_with_16le_device_handler(write16_device_func handler, cons INLINE UINT32 read64le_with_16be_device_handler(read16_device_func handler, const device_config *device, offs_t offset, UINT64 mem_mask) { UINT64 result = 0; - if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff)) + if ((mem_mask & U64(0x00000000ffffffff)) != 0) result |= (UINT64)read32le_with_16be_device_handler(handler, device, offset * 2 + 0, mem_mask >> 0) << 0; - if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000)) + if ((mem_mask & U64(0xffffffff00000000)) != 0) result |= (UINT64)read32le_with_16be_device_handler(handler, device, offset * 2 + 1, mem_mask >> 32) << 32; return result; } @@ -430,9 +430,9 @@ INLINE UINT32 read64le_with_16be_device_handler(read16_device_func handler, cons INLINE void write64le_with_16be_device_handler(write16_device_func handler, const device_config *device, offs_t offset, UINT64 data, UINT64 mem_mask) { - if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff)) + if ((mem_mask & U64(0x00000000ffffffff)) != 0) write32le_with_16be_device_handler(handler, device, offset * 2 + 0, data >> 0, mem_mask >> 0); - if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000)) + if ((mem_mask & U64(0xffffffff00000000)) != 0) write32le_with_16be_device_handler(handler, device, offset * 2 + 1, data >> 32, mem_mask >> 32); } @@ -446,9 +446,9 @@ INLINE void write64le_with_16be_device_handler(write16_device_func handler, cons INLINE UINT64 read64be_with_32be_device_handler(read32_device_func handler, const device_config *device, offs_t offset, UINT64 mem_mask) { UINT64 result = 0; - if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000)) + if ((mem_mask & U64(0xffffffff00000000)) != 0) result |= (UINT64)(*handler)(device, offset * 2 + 0, mem_mask >> 32) << 32; - if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff)) + if ((mem_mask & U64(0x00000000ffffffff)) != 0) result |= (UINT64)(*handler)(device, offset * 2 + 1, mem_mask >> 0) << 0; return result; } @@ -456,9 +456,9 @@ INLINE UINT64 read64be_with_32be_device_handler(read32_device_func handler, cons INLINE void write64be_with_32be_device_handler(write32_device_func handler, const device_config *device, offs_t offset, UINT64 data, UINT64 mem_mask) { - if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000)) + if ((mem_mask & U64(0xffffffff00000000)) != 0) (*handler)(device, offset * 2 + 0, data >> 32, mem_mask >> 32); - if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff)) + if ((mem_mask & U64(0x00000000ffffffff)) != 0) (*handler)(device, offset * 2 + 1, data >> 0, mem_mask >> 0); } @@ -472,9 +472,9 @@ INLINE void write64be_with_32be_device_handler(write32_device_func handler, cons INLINE UINT64 read64le_with_32le_device_handler(read32_device_func handler, const device_config *device, offs_t offset, UINT64 mem_mask) { UINT64 result = 0; - if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff)) + if ((mem_mask & U64(0x00000000ffffffff)) != 0) result |= (UINT64)(*handler)(device, offset * 2 + 0, mem_mask >> 0) << 0; - if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000)) + if ((mem_mask & U64(0xffffffff00000000)) != 0) result |= (UINT64)(*handler)(device, offset * 2 + 1, mem_mask >> 32) << 32; return result; } @@ -482,9 +482,9 @@ INLINE UINT64 read64le_with_32le_device_handler(read32_device_func handler, cons INLINE void write64le_with_32le_device_handler(write32_device_func handler, const device_config *device, offs_t offset, UINT64 data, UINT64 mem_mask) { - if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff)) + if ((mem_mask & U64(0x00000000ffffffff)) != 0) (*handler)(device, offset * 2 + 0, data >> 0, mem_mask >> 0); - if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000)) + if ((mem_mask & U64(0xffffffff00000000)) != 0) (*handler)(device, offset * 2 + 1, data >> 32, mem_mask >> 32); } diff --git a/src/emu/machine/am53cf96.c b/src/emu/machine/am53cf96.c index b930d6796a3..be86f987303 100644 --- a/src/emu/machine/am53cf96.c +++ b/src/emu/machine/am53cf96.c @@ -45,7 +45,7 @@ READ32_HANDLER( am53cf96_r ) static const int states[] = { 0, 0, 1, 1, 2, 3, 4, 5, 6, 7, 0 }; reg = offset * 2; - if (mem_mask == 0xffffff00) + if (mem_mask == 0x000000ff) { shift = 0; } @@ -96,7 +96,7 @@ WRITE32_HANDLER( am53cf96_w ) reg = offset * 2; val = data; - if (mem_mask == 0xffffff00) + if (mem_mask == 0x000000ff) { } else diff --git a/src/emu/machine/smc91c9x.c b/src/emu/machine/smc91c9x.c index d034b7643c4..a74c4171ae9 100644 --- a/src/emu/machine/smc91c9x.c +++ b/src/emu/machine/smc91c9x.c @@ -440,7 +440,7 @@ READ16_HANDLER( smc91c94_r ) } if (LOG_ETHERNET && offset != EREG_BANK) - logerror("%08X:ethernet_r(%s) = %04X & %04X\n", activecpu_get_pc(), ethernet_regname[offset], result, mem_mask ^ 0xffff); + logerror("%08X:ethernet_r(%s) = %04X & %04X\n", activecpu_get_pc(), ethernet_regname[offset], result, mem_mask); return result; } @@ -463,11 +463,11 @@ WRITE16_HANDLER( smc91c94_w ) /* update the data generically */ olddata = ethernet.reg[offset]; - mem_mask |= ~ethernet.regmask[offset]; + mem_mask &= ethernet.regmask[offset]; COMBINE_DATA(ðernet.reg[offset]); if (LOG_ETHERNET && offset != 7) - logerror("%08X:ethernet_w(%s) = %04X & %04X\n", activecpu_get_pc(), ethernet_regname[offset], data, mem_mask ^ 0xffff); + logerror("%08X:ethernet_w(%s) = %04X & %04X\n", activecpu_get_pc(), ethernet_regname[offset], data, mem_mask); /* handle it */ switch (offset) diff --git a/src/emu/memory.c b/src/emu/memory.c index 4765f6d9d83..96eb735eeef 100644 --- a/src/emu/memory.c +++ b/src/emu/memory.c @@ -2610,17 +2610,17 @@ static READ8_HANDLER( mrh8_unmap_program ) } static READ16_HANDLER( mrh16_unmap_program ) { - if (log_unmap[ADDRESS_SPACE_PROGRAM] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped program memory word read from %08X & %04X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_PROGRAM], offset*2), mem_mask ^ 0xffff); + if (log_unmap[ADDRESS_SPACE_PROGRAM] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped program memory word read from %08X & %04X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_PROGRAM], offset*2), mem_mask); return cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_PROGRAM].unmap; } static READ32_HANDLER( mrh32_unmap_program ) { - if (log_unmap[ADDRESS_SPACE_PROGRAM] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped program memory dword read from %08X & %08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_PROGRAM], offset*4), mem_mask ^ 0xffffffff); + if (log_unmap[ADDRESS_SPACE_PROGRAM] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped program memory dword read from %08X & %08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_PROGRAM], offset*4), mem_mask); return cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_PROGRAM].unmap; } static READ64_HANDLER( mrh64_unmap_program ) { - if (log_unmap[ADDRESS_SPACE_PROGRAM] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped program memory qword read from %08X & %08X%08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_PROGRAM], offset*8), (int)(mem_mask >> 32) ^ 0xffffffff, (int)(mem_mask & 0xffffffff) ^ 0xffffffff); + if (log_unmap[ADDRESS_SPACE_PROGRAM] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped program memory qword read from %08X & %08X%08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_PROGRAM], offset*8), (int)(mem_mask >> 32), (int)(mem_mask & 0xffffffff)); return cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_PROGRAM].unmap; } @@ -2630,15 +2630,15 @@ static WRITE8_HANDLER( mwh8_unmap_program ) } static WRITE16_HANDLER( mwh16_unmap_program ) { - if (log_unmap[ADDRESS_SPACE_PROGRAM] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped program memory word write to %08X = %04X & %04X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_PROGRAM], offset*2), data, mem_mask ^ 0xffff); + if (log_unmap[ADDRESS_SPACE_PROGRAM] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped program memory word write to %08X = %04X & %04X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_PROGRAM], offset*2), data, mem_mask); } static WRITE32_HANDLER( mwh32_unmap_program ) { - if (log_unmap[ADDRESS_SPACE_PROGRAM] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped program memory dword write to %08X = %08X & %08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_PROGRAM], offset*4), data, mem_mask ^ 0xffffffff); + if (log_unmap[ADDRESS_SPACE_PROGRAM] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped program memory dword write to %08X = %08X & %08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_PROGRAM], offset*4), data, mem_mask); } static WRITE64_HANDLER( mwh64_unmap_program ) { - if (log_unmap[ADDRESS_SPACE_PROGRAM] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped program memory qword write to %08X = %08X%08X & %08X%08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_PROGRAM], offset*8), (int)(data >> 32), (int)(data & 0xffffffff), (int)(mem_mask >> 32) ^ 0xffffffff, (int)(mem_mask & 0xffffffff) ^ 0xffffffff); + if (log_unmap[ADDRESS_SPACE_PROGRAM] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped program memory qword write to %08X = %08X%08X & %08X%08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_PROGRAM], offset*8), (int)(data >> 32), (int)(data & 0xffffffff), (int)(mem_mask >> 32), (int)(mem_mask & 0xffffffff)); } static READ8_HANDLER( mrh8_unmap_data ) @@ -2648,17 +2648,17 @@ static READ8_HANDLER( mrh8_unmap_data ) } static READ16_HANDLER( mrh16_unmap_data ) { - if (log_unmap[ADDRESS_SPACE_DATA] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped data memory word read from %08X & %04X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_DATA], offset*2), mem_mask ^ 0xffff); + if (log_unmap[ADDRESS_SPACE_DATA] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped data memory word read from %08X & %04X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_DATA], offset*2), mem_mask); return cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_DATA].unmap; } static READ32_HANDLER( mrh32_unmap_data ) { - if (log_unmap[ADDRESS_SPACE_DATA] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped data memory dword read from %08X & %08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_DATA], offset*4), mem_mask ^ 0xffffffff); + if (log_unmap[ADDRESS_SPACE_DATA] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped data memory dword read from %08X & %08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_DATA], offset*4), mem_mask); return cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_DATA].unmap; } static READ64_HANDLER( mrh64_unmap_data ) { - if (log_unmap[ADDRESS_SPACE_DATA] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped data memory qword read from %08X & %08X%08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_DATA], offset*8), (int)(mem_mask >> 32) ^ 0xffffffff, (int)(mem_mask & 0xffffffff) ^ 0xffffffff); + if (log_unmap[ADDRESS_SPACE_DATA] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped data memory qword read from %08X & %08X%08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_DATA], offset*8), (int)(mem_mask >> 32), (int)(mem_mask & 0xffffffff)); return cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_DATA].unmap; } @@ -2668,15 +2668,15 @@ static WRITE8_HANDLER( mwh8_unmap_data ) } static WRITE16_HANDLER( mwh16_unmap_data ) { - if (log_unmap[ADDRESS_SPACE_DATA] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped data memory word write to %08X = %04X & %04X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_DATA], offset*2), data, mem_mask ^ 0xffff); + if (log_unmap[ADDRESS_SPACE_DATA] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped data memory word write to %08X = %04X & %04X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_DATA], offset*2), data, mem_mask); } static WRITE32_HANDLER( mwh32_unmap_data ) { - if (log_unmap[ADDRESS_SPACE_DATA] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped data memory dword write to %08X = %08X & %08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_DATA], offset*4), data, mem_mask ^ 0xffffffff); + if (log_unmap[ADDRESS_SPACE_DATA] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped data memory dword write to %08X = %08X & %08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_DATA], offset*4), data, mem_mask); } static WRITE64_HANDLER( mwh64_unmap_data ) { - if (log_unmap[ADDRESS_SPACE_DATA] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped data memory qword write to %08X = %08X%08X & %08X%08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_DATA], offset*8), (int)(data >> 32), (int)(data & 0xffffffff), (int)(mem_mask >> 32) ^ 0xffffffff, (int)(mem_mask & 0xffffffff) ^ 0xffffffff); + if (log_unmap[ADDRESS_SPACE_DATA] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped data memory qword write to %08X = %08X%08X & %08X%08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_DATA], offset*8), (int)(data >> 32), (int)(data & 0xffffffff), (int)(mem_mask >> 32), (int)(mem_mask & 0xffffffff)); } static READ8_HANDLER( mrh8_unmap_io ) @@ -2686,17 +2686,17 @@ static READ8_HANDLER( mrh8_unmap_io ) } static READ16_HANDLER( mrh16_unmap_io ) { - if (log_unmap[ADDRESS_SPACE_IO] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped I/O word read from %08X & %04X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_IO], offset*2), mem_mask ^ 0xffff); + if (log_unmap[ADDRESS_SPACE_IO] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped I/O word read from %08X & %04X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_IO], offset*2), mem_mask); return cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_IO].unmap; } static READ32_HANDLER( mrh32_unmap_io ) { - if (log_unmap[ADDRESS_SPACE_IO] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped I/O dword read from %08X & %08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_IO], offset*4), mem_mask ^ 0xffffffff); + if (log_unmap[ADDRESS_SPACE_IO] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped I/O dword read from %08X & %08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_IO], offset*4), mem_mask); return cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_IO].unmap; } static READ64_HANDLER( mrh64_unmap_io ) { - if (log_unmap[ADDRESS_SPACE_IO] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped I/O qword read from %08X & %08X%08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_IO], offset*8), (int)(mem_mask >> 32) ^ 0xffffffff, (int)(mem_mask & 0xffffffff) ^ 0xffffffff); + if (log_unmap[ADDRESS_SPACE_IO] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped I/O qword read from %08X & %08X%08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_IO], offset*8), (int)(mem_mask >> 32), (int)(mem_mask & 0xffffffff)); return cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_IO].unmap; } @@ -2706,15 +2706,15 @@ static WRITE8_HANDLER( mwh8_unmap_io ) } static WRITE16_HANDLER( mwh16_unmap_io ) { - if (log_unmap[ADDRESS_SPACE_IO] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped I/O word write to %08X = %04X & %04X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_IO], offset*2), data, mem_mask ^ 0xffff); + if (log_unmap[ADDRESS_SPACE_IO] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped I/O word write to %08X = %04X & %04X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_IO], offset*2), data, mem_mask); } static WRITE32_HANDLER( mwh32_unmap_io ) { - if (log_unmap[ADDRESS_SPACE_IO] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped I/O dword write to %08X = %08X & %08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_IO], offset*4), data, mem_mask ^ 0xffffffff); + if (log_unmap[ADDRESS_SPACE_IO] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped I/O dword write to %08X = %08X & %08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_IO], offset*4), data, mem_mask); } static WRITE64_HANDLER( mwh64_unmap_io ) { - if (log_unmap[ADDRESS_SPACE_IO] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped I/O qword write to %08X = %08X%08X & %08X%08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_IO], offset*8), (int)(data >> 32), (int)(data & 0xffffffff), (int)(mem_mask >> 32) ^ 0xffffffff, (int)(mem_mask & 0xffffffff) ^ 0xffffffff); + if (log_unmap[ADDRESS_SPACE_IO] && !debugger_access) logerror("cpu #%d (PC=%08X): unmapped I/O qword write to %08X = %08X%08X & %08X%08X\n", cpu_getactivecpu(), activecpu_get_pc(), BYTE2ADDR(&cpudata[cpu_getactivecpu()].space[ADDRESS_SPACE_IO], offset*8), (int)(data >> 32), (int)(data & 0xffffffff), (int)(mem_mask >> 32), (int)(mem_mask & 0xffffffff)); } @@ -3015,7 +3015,7 @@ static READ16_HANDLER( stub_read8_from_16 ) while (subunits-- != 0) { int shift = *subshift++; - if ((UINT8)(mem_mask >> shift) != 0xff) + if ((UINT8)(mem_mask >> shift) != 0) result |= (*handler->subhandler.read.mhandler8)(handler->subobject, offset) << shift; offset++; } @@ -3039,7 +3039,7 @@ static READ32_HANDLER( stub_read8_from_32 ) while (subunits-- != 0) { int shift = *subshift++; - if ((UINT8)(mem_mask >> shift) != 0xff) + if ((UINT8)(mem_mask >> shift) != 0) result |= (*handler->subhandler.read.mhandler8)(handler->subobject, offset) << shift; offset++; } @@ -3063,7 +3063,7 @@ static READ64_HANDLER( stub_read8_from_64 ) while (subunits-- != 0) { int shift = *subshift++; - if ((UINT8)(mem_mask >> shift) != 0xff) + if ((UINT8)(mem_mask >> shift) != 0) result |= (UINT64)(*handler->subhandler.read.mhandler8)(handler->subobject, offset) << shift; offset++; } @@ -3087,7 +3087,7 @@ static READ32_HANDLER( stub_read16_from_32 ) while (subunits-- != 0) { int shift = *subshift++; - if ((UINT16)(mem_mask >> shift) != 0xffff) + if ((UINT16)(mem_mask >> shift) != 0) result |= (*handler->subhandler.read.mhandler16)(handler->subobject, offset, mem_mask >> shift) << shift; offset++; } @@ -3111,7 +3111,7 @@ static READ64_HANDLER( stub_read16_from_64 ) while (subunits-- != 0) { int shift = *subshift++; - if ((UINT16)(mem_mask >> shift) != 0xffff) + if ((UINT16)(mem_mask >> shift) != 0) result |= (UINT64)(*handler->subhandler.read.mhandler16)(handler->subobject, offset, mem_mask >> shift) << shift; offset++; } @@ -3135,7 +3135,7 @@ static READ64_HANDLER( stub_read32_from_64 ) while (subunits-- != 0) { int shift = *subshift++; - if ((UINT32)(mem_mask >> shift) != 0xffffffff) + if ((UINT32)(mem_mask >> shift) != 0) result |= (UINT64)(*handler->subhandler.read.mhandler32)(handler->subobject, offset, mem_mask >> shift) << shift; offset++; } @@ -3163,7 +3163,7 @@ static WRITE16_HANDLER( stub_write8_from_16 ) while (subunits-- != 0) { int shift = *subshift++; - if ((UINT8)(mem_mask >> shift) != 0xff) + if ((UINT8)(mem_mask >> shift) != 0) (*handler->subhandler.write.mhandler8)(handler->subobject, offset, data >> shift); offset++; } @@ -3207,7 +3207,7 @@ static WRITE64_HANDLER( stub_write8_from_64 ) while (subunits-- != 0) { int shift = *subshift++; - if ((UINT8)(mem_mask >> shift) != 0xff) + if ((UINT8)(mem_mask >> shift) != 0) (*handler->subhandler.write.mhandler8)(handler->subobject, offset, data >> shift); offset++; } @@ -3229,7 +3229,7 @@ static WRITE32_HANDLER( stub_write16_from_32 ) while (subunits-- != 0) { int shift = *subshift++; - if ((UINT16)(mem_mask >> shift) != 0xffff) + if ((UINT16)(mem_mask >> shift) != 0) (*handler->subhandler.write.mhandler16)(handler->subobject, offset, data >> shift, mem_mask >> shift); offset++; } @@ -3251,7 +3251,7 @@ static WRITE64_HANDLER( stub_write16_from_64 ) while (subunits-- != 0) { int shift = *subshift++; - if ((UINT16)(mem_mask >> shift) != 0xffff) + if ((UINT16)(mem_mask >> shift) != 0) (*handler->subhandler.write.mhandler16)(handler->subobject, offset, data >> shift, mem_mask >> shift); offset++; } @@ -3273,7 +3273,7 @@ static WRITE64_HANDLER( stub_write32_from_64 ) while (subunits-- != 0) { int shift = *subshift++; - if ((UINT32)(mem_mask >> shift) != 0xffffffff) + if ((UINT32)(mem_mask >> shift) != 0) (*handler->subhandler.write.mhandler32)(handler->subobject, offset, data >> shift, mem_mask >> shift); offset++; } @@ -4043,7 +4043,7 @@ INLINE UINT16 read_word_masked_generic(UINT8 spacenum, offs_t address, UINT16 me entry = lookup_read_entry(space, address); handler = &space->readhandlers[entry]; - DEBUG_HOOK_READ(spacenum, address & ~1, (UINT16)~mem_mask); + DEBUG_HOOK_READ(spacenum, address & ~1, mem_mask); offset = (address - handler->bytestart) & handler->bytemask; if (entry < STATIC_RAM) @@ -4064,33 +4064,33 @@ INLINE UINT16 read_word_masked_generic(UINT8 spacenum, offs_t address, UINT16 me UINT8 program_read_byte_16le(offs_t address) { UINT32 shift = (address & 1) * 8; - return read_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~(0xff << shift)) >> shift; + return read_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, 0xff << shift) >> shift; } UINT8 program_read_byte_16be(offs_t address) { UINT32 shift = (~address & 1) * 8; - return read_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~(0xff << shift)) >> shift; + return read_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, 0xff << shift) >> shift; } UINT16 program_read_word_16le(offs_t address) { - return read_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, 0); + return read_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, 0xffff); } UINT16 program_read_word_masked_16le(offs_t address, UINT16 mask) { - return read_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~mask); + return read_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, mask); } UINT16 program_read_word_16be(offs_t address) { - return read_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, 0); + return read_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, 0xffff); } UINT16 program_read_word_masked_16be(offs_t address, UINT16 mask) { - return read_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~mask); + return read_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, mask); } UINT32 program_read_dword_16le(offs_t address) @@ -4157,33 +4157,33 @@ UINT64 program_read_qword_masked_16be(offs_t address, UINT64 mask) UINT8 data_read_byte_16le(offs_t address) { UINT32 shift = (address & 1) * 8; - return read_word_masked_generic(ADDRESS_SPACE_DATA, address, ~(0xff << shift)) >> shift; + return read_word_masked_generic(ADDRESS_SPACE_DATA, address, 0xff << shift) >> shift; } UINT8 data_read_byte_16be(offs_t address) { UINT32 shift = (~address & 1) * 8; - return read_word_masked_generic(ADDRESS_SPACE_DATA, address, ~(0xff << shift)) >> shift; + return read_word_masked_generic(ADDRESS_SPACE_DATA, address, 0xff << shift) >> shift; } UINT16 data_read_word_16le(offs_t address) { - return read_word_masked_generic(ADDRESS_SPACE_DATA, address, 0); + return read_word_masked_generic(ADDRESS_SPACE_DATA, address, 0xffff); } UINT16 data_read_word_masked_16le(offs_t address, UINT16 mask) { - return read_word_masked_generic(ADDRESS_SPACE_DATA, address, ~mask); + return read_word_masked_generic(ADDRESS_SPACE_DATA, address, mask); } UINT16 data_read_word_16be(offs_t address) { - return read_word_masked_generic(ADDRESS_SPACE_DATA, address, 0); + return read_word_masked_generic(ADDRESS_SPACE_DATA, address, 0xffff); } UINT16 data_read_word_masked_16be(offs_t address, UINT16 mask) { - return read_word_masked_generic(ADDRESS_SPACE_DATA, address, ~mask); + return read_word_masked_generic(ADDRESS_SPACE_DATA, address, mask); } UINT32 data_read_dword_16le(offs_t address) @@ -4250,33 +4250,33 @@ UINT64 data_read_qword_masked_16be(offs_t address, UINT64 mask) UINT8 io_read_byte_16le(offs_t address) { UINT32 shift = (address & 1) * 8; - return read_word_masked_generic(ADDRESS_SPACE_IO, address, ~(0xff << shift)) >> shift; + return read_word_masked_generic(ADDRESS_SPACE_IO, address, 0xff << shift) >> shift; } UINT8 io_read_byte_16be(offs_t address) { UINT32 shift = (~address & 1) * 8; - return read_word_masked_generic(ADDRESS_SPACE_IO, address, ~(0xff << shift)) >> shift; + return read_word_masked_generic(ADDRESS_SPACE_IO, address, 0xff << shift) >> shift; } UINT16 io_read_word_16le(offs_t address) { - return read_word_masked_generic(ADDRESS_SPACE_IO, address, 0); + return read_word_masked_generic(ADDRESS_SPACE_IO, address, 0xffff); } UINT16 io_read_word_masked_16le(offs_t address, UINT16 mask) { - return read_word_masked_generic(ADDRESS_SPACE_IO, address, ~mask); + return read_word_masked_generic(ADDRESS_SPACE_IO, address, mask); } UINT16 io_read_word_16be(offs_t address) { - return read_word_masked_generic(ADDRESS_SPACE_IO, address, 0); + return read_word_masked_generic(ADDRESS_SPACE_IO, address, 0xffff); } UINT16 io_read_word_masked_16be(offs_t address, UINT16 mask) { - return read_word_masked_generic(ADDRESS_SPACE_IO, address, ~mask); + return read_word_masked_generic(ADDRESS_SPACE_IO, address, mask); } UINT32 io_read_dword_16le(offs_t address) @@ -4359,13 +4359,13 @@ INLINE void write_word_masked_generic(UINT8 spacenum, offs_t address, UINT16 dat entry = lookup_write_entry(space, address); handler = &space->writehandlers[entry]; - DEBUG_HOOK_WRITE(spacenum, address & ~1, data, (UINT16)~mem_mask); + DEBUG_HOOK_WRITE(spacenum, address & ~1, data, mem_mask); offset = (address - handler->bytestart) & handler->bytemask; if (entry < STATIC_RAM) { UINT16 *dest = (UINT16 *)&bank_ptr[entry][offset & ~1]; - *dest = (*dest & mem_mask) | (data & ~mem_mask); + *dest = (*dest & ~mem_mask) | (data & mem_mask); } else (*handler->handler.write.mhandler16)(handler->object, offset >> 1, data, mem_mask); @@ -4381,33 +4381,33 @@ INLINE void write_word_masked_generic(UINT8 spacenum, offs_t address, UINT16 dat void program_write_byte_16le(offs_t address, UINT8 data) { UINT32 shift = (address & 1) * 8; - write_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, data << shift, ~(0xff << shift)); + write_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, data << shift, 0xff << shift); } void program_write_byte_16be(offs_t address, UINT8 data) { UINT32 shift = (~address & 1) * 8; - write_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, data << shift, ~(0xff << shift)); + write_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, data << shift, 0xff << shift); } void program_write_word_16le(offs_t address, UINT16 data) { - write_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, 0); + write_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, 0xffff); } void program_write_word_masked_16le(offs_t address, UINT16 data, UINT16 mask) { - write_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, ~mask); + write_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, mask); } void program_write_word_16be(offs_t address, UINT16 data) { - write_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, 0); + write_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, 0xffff); } void program_write_word_masked_16be(offs_t address, UINT16 data, UINT16 mask) { - write_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, ~mask); + write_word_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, mask); } void program_write_dword_16le(offs_t address, UINT32 data) @@ -4466,33 +4466,33 @@ void program_write_qword_masked_16be(offs_t address, UINT64 data, UINT64 mask) void data_write_byte_16le(offs_t address, UINT8 data) { UINT32 shift = (address & 1) * 8; - write_word_masked_generic(ADDRESS_SPACE_DATA, address, data << shift, ~(0xff << shift)); + write_word_masked_generic(ADDRESS_SPACE_DATA, address, data << shift, 0xff << shift); } void data_write_byte_16be(offs_t address, UINT8 data) { UINT32 shift = (~address & 1) * 8; - write_word_masked_generic(ADDRESS_SPACE_DATA, address, data << shift, ~(0xff << shift)); + write_word_masked_generic(ADDRESS_SPACE_DATA, address, data << shift, 0xff << shift); } void data_write_word_16le(offs_t address, UINT16 data) { - write_word_masked_generic(ADDRESS_SPACE_DATA, address, data, 0); + write_word_masked_generic(ADDRESS_SPACE_DATA, address, data, 0xffff); } void data_write_word_masked_16le(offs_t address, UINT16 data, UINT16 mask) { - write_word_masked_generic(ADDRESS_SPACE_DATA, address, data, ~mask); + write_word_masked_generic(ADDRESS_SPACE_DATA, address, data, mask); } void data_write_word_16be(offs_t address, UINT16 data) { - write_word_masked_generic(ADDRESS_SPACE_DATA, address, data, 0); + write_word_masked_generic(ADDRESS_SPACE_DATA, address, data, 0xffff); } void data_write_word_masked_16be(offs_t address, UINT16 data, UINT16 mask) { - write_word_masked_generic(ADDRESS_SPACE_DATA, address, data, ~mask); + write_word_masked_generic(ADDRESS_SPACE_DATA, address, data, mask); } void data_write_dword_16le(offs_t address, UINT32 data) @@ -4551,33 +4551,33 @@ void data_write_qword_masked_16be(offs_t address, UINT64 data, UINT64 mask) void io_write_byte_16le(offs_t address, UINT8 data) { UINT32 shift = (address & 1) * 8; - write_word_masked_generic(ADDRESS_SPACE_IO, address, data << shift, ~(0xff << shift)); + write_word_masked_generic(ADDRESS_SPACE_IO, address, data << shift, 0xff << shift); } void io_write_byte_16be(offs_t address, UINT8 data) { UINT32 shift = (~address & 1) * 8; - write_word_masked_generic(ADDRESS_SPACE_IO, address, data << shift, ~(0xff << shift)); + write_word_masked_generic(ADDRESS_SPACE_IO, address, data << shift, 0xff << shift); } void io_write_word_16le(offs_t address, UINT16 data) { - write_word_masked_generic(ADDRESS_SPACE_IO, address, data, 0); + write_word_masked_generic(ADDRESS_SPACE_IO, address, data, 0xffff); } void io_write_word_masked_16le(offs_t address, UINT16 data, UINT16 mask) { - write_word_masked_generic(ADDRESS_SPACE_IO, address, data, ~mask); + write_word_masked_generic(ADDRESS_SPACE_IO, address, data, mask); } void io_write_word_16be(offs_t address, UINT16 data) { - write_word_masked_generic(ADDRESS_SPACE_IO, address, data, 0); + write_word_masked_generic(ADDRESS_SPACE_IO, address, data, 0xffff); } void io_write_word_masked_16be(offs_t address, UINT16 data, UINT16 mask) { - write_word_masked_generic(ADDRESS_SPACE_IO, address, data, ~mask); + write_word_masked_generic(ADDRESS_SPACE_IO, address, data, mask); } void io_write_dword_16le(offs_t address, UINT32 data) @@ -4653,7 +4653,7 @@ INLINE UINT32 read_dword_masked_generic(UINT8 spacenum, offs_t address, UINT32 m entry = lookup_read_entry(space, address); handler = &space->readhandlers[entry]; - DEBUG_HOOK_READ(spacenum, address & ~3, (UINT32)~mem_mask); + DEBUG_HOOK_READ(spacenum, address & ~3, mem_mask); offset = (address - handler->bytestart) & handler->bytemask; if (entry < STATIC_RAM) @@ -4674,57 +4674,57 @@ INLINE UINT32 read_dword_masked_generic(UINT8 spacenum, offs_t address, UINT32 m UINT8 program_read_byte_32le(offs_t address) { UINT32 shift = (address & 3) * 8; - return read_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~(0xff << shift)) >> shift; + return read_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, 0xff << shift) >> shift; } UINT8 program_read_byte_32be(offs_t address) { UINT32 shift = (~address & 3) * 8; - return read_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~(0xff << shift)) >> shift; + return read_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, 0xff << shift) >> shift; } UINT16 program_read_word_32le(offs_t address) { UINT32 shift = (address & 2) * 8; - return read_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~(0xffff << shift)) >> shift; + return read_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, 0xffff << shift) >> shift; } UINT16 program_read_word_masked_32le(offs_t address, UINT16 mask) { UINT32 shift = (address & 2) * 8; - return read_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~(mask << shift)) >> shift; + return read_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, mask << shift) >> shift; } UINT16 program_read_word_32be(offs_t address) { UINT32 shift = (~address & 2) * 8; - return read_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~(0xffff << shift)) >> shift; + return read_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, 0xffff << shift) >> shift; } UINT16 program_read_word_masked_32be(offs_t address, UINT16 mask) { UINT32 shift = (~address & 2) * 8; - return read_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~(mask << shift)) >> shift; + return read_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, mask << shift) >> shift; } UINT32 program_read_dword_32le(offs_t address) { - return read_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, 0); + return read_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, 0xffffffff); } UINT32 program_read_dword_masked_32le(offs_t address, UINT32 mask) { - return read_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~mask); + return read_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, mask); } UINT32 program_read_dword_32be(offs_t address) { - return read_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, 0); + return read_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, 0xffffffff); } UINT32 program_read_dword_masked_32be(offs_t address, UINT32 mask) { - return read_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~mask); + return read_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, mask); } UINT64 program_read_qword_32le(offs_t address) @@ -4763,57 +4763,57 @@ UINT64 program_read_qword_masked_32be(offs_t address, UINT64 mask) UINT8 data_read_byte_32le(offs_t address) { UINT32 shift = (address & 3) * 8; - return read_dword_masked_generic(ADDRESS_SPACE_DATA, address, ~(0xff << shift)) >> shift; + return read_dword_masked_generic(ADDRESS_SPACE_DATA, address, 0xff << shift) >> shift; } UINT8 data_read_byte_32be(offs_t address) { UINT32 shift = (~address & 3) * 8; - return read_dword_masked_generic(ADDRESS_SPACE_DATA, address, ~(0xff << shift)) >> shift; + return read_dword_masked_generic(ADDRESS_SPACE_DATA, address, 0xff << shift) >> shift; } UINT16 data_read_word_32le(offs_t address) { UINT32 shift = (address & 2) * 8; - return read_dword_masked_generic(ADDRESS_SPACE_DATA, address, ~(0xffff << shift)) >> shift; + return read_dword_masked_generic(ADDRESS_SPACE_DATA, address, 0xffff << shift) >> shift; } UINT16 data_read_word_masked_32le(offs_t address, UINT16 mask) { UINT32 shift = (address & 2) * 8; - return read_dword_masked_generic(ADDRESS_SPACE_DATA, address, ~(mask << shift)) >> shift; + return read_dword_masked_generic(ADDRESS_SPACE_DATA, address, mask << shift) >> shift; } UINT16 data_read_word_32be(offs_t address) { UINT32 shift = (~address & 2) * 8; - return read_dword_masked_generic(ADDRESS_SPACE_DATA, address, ~(0xffff << shift)) >> shift; + return read_dword_masked_generic(ADDRESS_SPACE_DATA, address, 0xffff << shift) >> shift; } UINT16 data_read_word_masked_32be(offs_t address, UINT16 mask) { UINT32 shift = (~address & 2) * 8; - return read_dword_masked_generic(ADDRESS_SPACE_DATA, address, ~(mask << shift)) >> shift; + return read_dword_masked_generic(ADDRESS_SPACE_DATA, address, mask << shift) >> shift; } UINT32 data_read_dword_32le(offs_t address) { - return read_dword_masked_generic(ADDRESS_SPACE_DATA, address, 0); + return read_dword_masked_generic(ADDRESS_SPACE_DATA, address, 0xffffffff); } UINT32 data_read_dword_masked_32le(offs_t address, UINT32 mask) { - return read_dword_masked_generic(ADDRESS_SPACE_DATA, address, ~mask); + return read_dword_masked_generic(ADDRESS_SPACE_DATA, address, mask); } UINT32 data_read_dword_32be(offs_t address) { - return read_dword_masked_generic(ADDRESS_SPACE_DATA, address, 0); + return read_dword_masked_generic(ADDRESS_SPACE_DATA, address, 0xffffffff); } UINT32 data_read_dword_masked_32be(offs_t address, UINT32 mask) { - return read_dword_masked_generic(ADDRESS_SPACE_DATA, address, ~mask); + return read_dword_masked_generic(ADDRESS_SPACE_DATA, address, mask); } UINT64 data_read_qword_32le(offs_t address) @@ -4852,57 +4852,57 @@ UINT64 data_read_qword_masked_32be(offs_t address, UINT64 mask) UINT8 io_read_byte_32le(offs_t address) { UINT32 shift = (address & 3) * 8; - return read_dword_masked_generic(ADDRESS_SPACE_IO, address, ~(0xff << shift)) >> shift; + return read_dword_masked_generic(ADDRESS_SPACE_IO, address, 0xff << shift) >> shift; } UINT8 io_read_byte_32be(offs_t address) { UINT32 shift = (~address & 3) * 8; - return read_dword_masked_generic(ADDRESS_SPACE_IO, address, ~(0xff << shift)) >> shift; + return read_dword_masked_generic(ADDRESS_SPACE_IO, address, 0xff << shift) >> shift; } UINT16 io_read_word_32le(offs_t address) { UINT32 shift = (address & 2) * 8; - return read_dword_masked_generic(ADDRESS_SPACE_IO, address, ~(0xffff << shift)) >> shift; + return read_dword_masked_generic(ADDRESS_SPACE_IO, address, 0xffff << shift) >> shift; } UINT16 io_read_word_masked_32le(offs_t address, UINT16 mask) { UINT32 shift = (address & 2) * 8; - return read_dword_masked_generic(ADDRESS_SPACE_IO, address, ~(mask << shift)) >> shift; + return read_dword_masked_generic(ADDRESS_SPACE_IO, address, mask << shift) >> shift; } UINT16 io_read_word_32be(offs_t address) { UINT32 shift = (~address & 2) * 8; - return read_dword_masked_generic(ADDRESS_SPACE_IO, address, ~(0xffff << shift)) >> shift; + return read_dword_masked_generic(ADDRESS_SPACE_IO, address, 0xffff << shift) >> shift; } UINT16 io_read_word_masked_32be(offs_t address, UINT16 mask) { UINT32 shift = (~address & 2) * 8; - return read_dword_masked_generic(ADDRESS_SPACE_IO, address, ~(mask << shift)) >> shift; + return read_dword_masked_generic(ADDRESS_SPACE_IO, address, mask << shift) >> shift; } UINT32 io_read_dword_32le(offs_t address) { - return read_dword_masked_generic(ADDRESS_SPACE_IO, address, 0); + return read_dword_masked_generic(ADDRESS_SPACE_IO, address, 0xffffffff); } UINT32 io_read_dword_masked_32le(offs_t address, UINT32 mask) { - return read_dword_masked_generic(ADDRESS_SPACE_IO, address, ~mask); + return read_dword_masked_generic(ADDRESS_SPACE_IO, address, mask); } UINT32 io_read_dword_32be(offs_t address) { - return read_dword_masked_generic(ADDRESS_SPACE_IO, address, 0); + return read_dword_masked_generic(ADDRESS_SPACE_IO, address, 0xffffffff); } UINT32 io_read_dword_masked_32be(offs_t address, UINT32 mask) { - return read_dword_masked_generic(ADDRESS_SPACE_IO, address, ~mask); + return read_dword_masked_generic(ADDRESS_SPACE_IO, address, mask); } UINT64 io_read_qword_32le(offs_t address) @@ -4957,13 +4957,13 @@ INLINE void write_dword_masked_generic(UINT8 spacenum, offs_t address, UINT32 da entry = lookup_write_entry(space, address); handler = &space->writehandlers[entry]; - DEBUG_HOOK_WRITE(spacenum, address & ~3, data, (UINT32)~mem_mask); + DEBUG_HOOK_WRITE(spacenum, address & ~3, data, mem_mask); offset = (address - handler->bytestart) & handler->bytemask; if (entry < STATIC_RAM) { UINT32 *dest = (UINT32 *)&bank_ptr[entry][offset & ~3]; - *dest = (*dest & mem_mask) | (data & ~mem_mask); + *dest = (*dest & ~mem_mask) | (data & mem_mask); } else (*handler->handler.write.mhandler32)(handler->object, offset >> 2, data, mem_mask); @@ -4979,57 +4979,57 @@ INLINE void write_dword_masked_generic(UINT8 spacenum, offs_t address, UINT32 da void program_write_byte_32le(offs_t address, UINT8 data) { UINT32 shift = (address & 3) * 8; - write_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data << shift, ~(0xff << shift)); + write_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data << shift, 0xff << shift); } void program_write_byte_32be(offs_t address, UINT8 data) { UINT32 shift = (~address & 3) * 8; - write_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data << shift, ~(0xff << shift)); + write_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data << shift, 0xff << shift); } void program_write_word_32le(offs_t address, UINT16 data) { UINT32 shift = (address & 2) * 8; - write_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data << shift, ~(0xffff << shift)); + write_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data << shift, 0xffff << shift); } void program_write_word_masked_32le(offs_t address, UINT16 data, UINT16 mask) { UINT32 shift = (address & 2) * 8; - write_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data << shift, ~(mask << shift)); + write_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data << shift, mask << shift); } void program_write_word_32be(offs_t address, UINT16 data) { UINT32 shift = (~address & 2) * 8; - write_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data << shift, ~(0xffff << shift)); + write_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data << shift, 0xffff << shift); } void program_write_word_masked_32be(offs_t address, UINT16 data, UINT16 mask) { UINT32 shift = (~address & 2) * 8; - write_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data << shift, ~(mask << shift)); + write_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data << shift, mask << shift); } void program_write_dword_32le(offs_t address, UINT32 data) { - write_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, 0); + write_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, 0xffffffff); } void program_write_dword_masked_32le(offs_t address, UINT32 data, UINT32 mask) { - write_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, ~mask); + write_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, mask); } void program_write_dword_32be(offs_t address, UINT32 data) { - write_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, 0); + write_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, 0xffffffff); } void program_write_dword_masked_32be(offs_t address, UINT32 data, UINT32 mask) { - write_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, ~mask); + write_dword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, mask); } void program_write_qword_32le(offs_t address, UINT64 data) @@ -5064,57 +5064,57 @@ void program_write_qword_masked_32be(offs_t address, UINT64 data, UINT64 mask) void data_write_byte_32le(offs_t address, UINT8 data) { UINT32 shift = (address & 3) * 8; - write_dword_masked_generic(ADDRESS_SPACE_DATA, address, data << shift, ~(0xff << shift)); + write_dword_masked_generic(ADDRESS_SPACE_DATA, address, data << shift, 0xff << shift); } void data_write_byte_32be(offs_t address, UINT8 data) { UINT32 shift = (~address & 3) * 8; - write_dword_masked_generic(ADDRESS_SPACE_DATA, address, data << shift, ~(0xff << shift)); + write_dword_masked_generic(ADDRESS_SPACE_DATA, address, data << shift, 0xff << shift); } void data_write_word_32le(offs_t address, UINT16 data) { UINT32 shift = (address & 2) * 8; - write_dword_masked_generic(ADDRESS_SPACE_DATA, address, data << shift, ~(0xffff << shift)); + write_dword_masked_generic(ADDRESS_SPACE_DATA, address, data << shift, 0xffff << shift); } void data_write_word_masked_32le(offs_t address, UINT16 data, UINT16 mask) { UINT32 shift = (address & 2) * 8; - write_dword_masked_generic(ADDRESS_SPACE_DATA, address, data << shift, ~(mask << shift)); + write_dword_masked_generic(ADDRESS_SPACE_DATA, address, data << shift, mask << shift); } void data_write_word_32be(offs_t address, UINT16 data) { UINT32 shift = (~address & 2) * 8; - write_dword_masked_generic(ADDRESS_SPACE_DATA, address, data << shift, ~(0xffff << shift)); + write_dword_masked_generic(ADDRESS_SPACE_DATA, address, data << shift, 0xffff << shift); } void data_write_word_masked_32be(offs_t address, UINT16 data, UINT16 mask) { UINT32 shift = (~address & 2) * 8; - write_dword_masked_generic(ADDRESS_SPACE_DATA, address, data << shift, ~(mask << shift)); + write_dword_masked_generic(ADDRESS_SPACE_DATA, address, data << shift, mask << shift); } void data_write_dword_32le(offs_t address, UINT32 data) { - write_dword_masked_generic(ADDRESS_SPACE_DATA, address, data, 0); + write_dword_masked_generic(ADDRESS_SPACE_DATA, address, data, 0xffffffff); } void data_write_dword_masked_32le(offs_t address, UINT32 data, UINT32 mask) { - write_dword_masked_generic(ADDRESS_SPACE_DATA, address, data, ~mask); + write_dword_masked_generic(ADDRESS_SPACE_DATA, address, data, mask); } void data_write_dword_32be(offs_t address, UINT32 data) { - write_dword_masked_generic(ADDRESS_SPACE_DATA, address, data, 0); + write_dword_masked_generic(ADDRESS_SPACE_DATA, address, data, 0xffffffff); } void data_write_dword_masked_32be(offs_t address, UINT32 data, UINT32 mask) { - write_dword_masked_generic(ADDRESS_SPACE_DATA, address, data, ~mask); + write_dword_masked_generic(ADDRESS_SPACE_DATA, address, data, mask); } void data_write_qword_32le(offs_t address, UINT64 data) @@ -5149,57 +5149,57 @@ void data_write_qword_masked_32be(offs_t address, UINT64 data, UINT64 mask) void io_write_byte_32le(offs_t address, UINT8 data) { UINT32 shift = (address & 3) * 8; - write_dword_masked_generic(ADDRESS_SPACE_IO, address, data << shift, ~(0xff << shift)); + write_dword_masked_generic(ADDRESS_SPACE_IO, address, data << shift, 0xff << shift); } void io_write_byte_32be(offs_t address, UINT8 data) { UINT32 shift = (~address & 3) * 8; - write_dword_masked_generic(ADDRESS_SPACE_IO, address, data << shift, ~(0xff << shift)); + write_dword_masked_generic(ADDRESS_SPACE_IO, address, data << shift, 0xff << shift); } void io_write_word_32le(offs_t address, UINT16 data) { UINT32 shift = (address & 2) * 8; - write_dword_masked_generic(ADDRESS_SPACE_IO, address, data << shift, ~(0xffff << shift)); + write_dword_masked_generic(ADDRESS_SPACE_IO, address, data << shift, 0xffff << shift); } void io_write_word_masked_32le(offs_t address, UINT16 data, UINT16 mask) { UINT32 shift = (address & 2) * 8; - write_dword_masked_generic(ADDRESS_SPACE_IO, address, data << shift, ~(mask << shift)); + write_dword_masked_generic(ADDRESS_SPACE_IO, address, data << shift, mask << shift); } void io_write_word_32be(offs_t address, UINT16 data) { UINT32 shift = (~address & 2) * 8; - write_dword_masked_generic(ADDRESS_SPACE_IO, address, data << shift, ~(0xffff << shift)); + write_dword_masked_generic(ADDRESS_SPACE_IO, address, data << shift, 0xffff << shift); } void io_write_word_masked_32be(offs_t address, UINT16 data, UINT16 mask) { UINT32 shift = (~address & 2) * 8; - write_dword_masked_generic(ADDRESS_SPACE_IO, address, data << shift, ~(mask << shift)); + write_dword_masked_generic(ADDRESS_SPACE_IO, address, data << shift, mask << shift); } void io_write_dword_32le(offs_t address, UINT32 data) { - write_dword_masked_generic(ADDRESS_SPACE_IO, address, data, 0); + write_dword_masked_generic(ADDRESS_SPACE_IO, address, data, 0xffffffff); } void io_write_dword_masked_32le(offs_t address, UINT32 data, UINT32 mask) { - write_dword_masked_generic(ADDRESS_SPACE_IO, address, data, ~mask); + write_dword_masked_generic(ADDRESS_SPACE_IO, address, data, mask); } void io_write_dword_32be(offs_t address, UINT32 data) { - write_dword_masked_generic(ADDRESS_SPACE_IO, address, data, 0); + write_dword_masked_generic(ADDRESS_SPACE_IO, address, data, 0xffffffff); } void io_write_dword_masked_32be(offs_t address, UINT32 data, UINT32 mask) { - write_dword_masked_generic(ADDRESS_SPACE_IO, address, data, ~mask); + write_dword_masked_generic(ADDRESS_SPACE_IO, address, data, mask); } void io_write_qword_32le(offs_t address, UINT64 data) @@ -5251,7 +5251,7 @@ INLINE UINT64 read_qword_masked_generic(UINT8 spacenum, offs_t address, UINT64 m entry = lookup_read_entry(space, address); handler = &space->readhandlers[entry]; - DEBUG_HOOK_READ(spacenum, address & ~7, ~mem_mask); + DEBUG_HOOK_READ(spacenum, address & ~7, mem_mask); offset = (address - handler->bytestart) & handler->bytemask; if (entry < STATIC_RAM) @@ -5272,81 +5272,81 @@ INLINE UINT64 read_qword_masked_generic(UINT8 spacenum, offs_t address, UINT64 m UINT8 program_read_byte_64le(offs_t address) { UINT32 shift = (address & 7) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~((UINT64)0xff << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)0xff << shift) >> shift; } UINT8 program_read_byte_64be(offs_t address) { UINT32 shift = (~address & 7) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~((UINT64)0xff << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)0xff << shift) >> shift; } UINT16 program_read_word_64le(offs_t address) { UINT32 shift = (address & 6) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~((UINT64)0xffff << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)0xffff << shift) >> shift; } UINT16 program_read_word_masked_64le(offs_t address, UINT16 mask) { UINT32 shift = (address & 6) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~((UINT64)mask << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)mask << shift) >> shift; } UINT16 program_read_word_64be(offs_t address) { UINT32 shift = (~address & 6) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~((UINT64)0xffff << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)0xffff << shift) >> shift; } UINT16 program_read_word_masked_64be(offs_t address, UINT16 mask) { UINT32 shift = (~address & 6) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~((UINT64)mask << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)mask << shift) >> shift; } UINT32 program_read_dword_64le(offs_t address) { UINT32 shift = (address & 4) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~((UINT64)0xffffffff << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)0xffffffff << shift) >> shift; } UINT32 program_read_dword_masked_64le(offs_t address, UINT32 mask) { UINT32 shift = (address & 4) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~((UINT64)mask << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)mask << shift) >> shift; } UINT32 program_read_dword_64be(offs_t address) { UINT32 shift = (~address & 4) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~((UINT64)0xffffffff << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)0xffffffff << shift) >> shift; } UINT32 program_read_dword_masked_64be(offs_t address, UINT32 mask) { UINT32 shift = (~address & 4) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~((UINT64)mask << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)mask << shift) >> shift; } UINT64 program_read_qword_64le(offs_t address) { - return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, 0); + return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, U64(0xffffffffffffffff)); } UINT64 program_read_qword_masked_64le(offs_t address, UINT64 mask) { - return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~mask); + return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, mask); } UINT64 program_read_qword_64be(offs_t address) { - return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, 0); + return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, U64(0xffffffffffffffff)); } UINT64 program_read_qword_masked_64be(offs_t address, UINT64 mask) { - return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, ~mask); + return read_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, mask); } @@ -5357,81 +5357,81 @@ UINT64 program_read_qword_masked_64be(offs_t address, UINT64 mask) UINT8 data_read_byte_64le(offs_t address) { UINT32 shift = (address & 7) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, ~((UINT64)0xff << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)0xff << shift) >> shift; } UINT8 data_read_byte_64be(offs_t address) { UINT32 shift = (~address & 7) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, ~((UINT64)0xff << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)0xff << shift) >> shift; } UINT16 data_read_word_64le(offs_t address) { UINT32 shift = (address & 6) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, ~((UINT64)0xffff << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)0xffff << shift) >> shift; } UINT16 data_read_word_masked_64le(offs_t address, UINT16 mask) { UINT32 shift = (address & 6) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, ~((UINT64)mask << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)mask << shift) >> shift; } UINT16 data_read_word_64be(offs_t address) { UINT32 shift = (~address & 6) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, ~((UINT64)0xffff << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)0xffff << shift) >> shift; } UINT16 data_read_word_masked_64be(offs_t address, UINT16 mask) { UINT32 shift = (~address & 6) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, ~((UINT64)mask << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)mask << shift) >> shift; } UINT32 data_read_dword_64le(offs_t address) { UINT32 shift = (address & 4) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, ~((UINT64)0xffffffff << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)0xffffffff << shift) >> shift; } UINT32 data_read_dword_masked_64le(offs_t address, UINT32 mask) { UINT32 shift = (address & 4) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, ~((UINT64)mask << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)mask << shift) >> shift; } UINT32 data_read_dword_64be(offs_t address) { UINT32 shift = (~address & 4) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, ~((UINT64)0xffffffff << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)0xffffffff << shift) >> shift; } UINT32 data_read_dword_masked_64be(offs_t address, UINT32 mask) { UINT32 shift = (~address & 4) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, ~((UINT64)mask << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)mask << shift) >> shift; } UINT64 data_read_qword_64le(offs_t address) { - return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, 0); + return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, U64(0xffffffffffffffff)); } UINT64 data_read_qword_masked_64le(offs_t address, UINT64 mask) { - return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, ~mask); + return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, mask); } UINT64 data_read_qword_64be(offs_t address) { - return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, 0); + return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, U64(0xffffffffffffffff)); } UINT64 data_read_qword_masked_64be(offs_t address, UINT64 mask) { - return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, ~mask); + return read_qword_masked_generic(ADDRESS_SPACE_DATA, address, mask); } @@ -5442,81 +5442,81 @@ UINT64 data_read_qword_masked_64be(offs_t address, UINT64 mask) UINT8 io_read_byte_64le(offs_t address) { UINT32 shift = (address & 7) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_IO, address, ~((UINT64)0xff << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)0xff << shift) >> shift; } UINT8 io_read_byte_64be(offs_t address) { UINT32 shift = (~address & 7) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_IO, address, ~((UINT64)0xff << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)0xff << shift) >> shift; } UINT16 io_read_word_64le(offs_t address) { UINT32 shift = (address & 6) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_IO, address, ~((UINT64)0xffff << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)0xffff << shift) >> shift; } UINT16 io_read_word_masked_64le(offs_t address, UINT16 mask) { UINT32 shift = (address & 6) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_IO, address, ~((UINT64)mask << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)mask << shift) >> shift; } UINT16 io_read_word_64be(offs_t address) { UINT32 shift = (~address & 6) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_IO, address, ~((UINT64)0xffff << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)0xffff << shift) >> shift; } UINT16 io_read_word_masked_64be(offs_t address, UINT16 mask) { UINT32 shift = (~address & 6) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_IO, address, ~((UINT64)mask << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)mask << shift) >> shift; } UINT32 io_read_dword_64le(offs_t address) { UINT32 shift = (address & 4) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_IO, address, ~((UINT64)0xffffffff << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)0xffffffff << shift) >> shift; } UINT32 io_read_dword_masked_64le(offs_t address, UINT32 mask) { UINT32 shift = (address & 4) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_IO, address, ~((UINT64)mask << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)mask << shift) >> shift; } UINT32 io_read_dword_64be(offs_t address) { UINT32 shift = (~address & 4) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_IO, address, ~((UINT64)0xffffffff << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)0xffffffff << shift) >> shift; } UINT32 io_read_dword_masked_64be(offs_t address, UINT32 mask) { UINT32 shift = (~address & 4) * 8; - return read_qword_masked_generic(ADDRESS_SPACE_IO, address, ~((UINT64)mask << shift)) >> shift; + return read_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)mask << shift) >> shift; } UINT64 io_read_qword_64le(offs_t address) { - return read_qword_masked_generic(ADDRESS_SPACE_IO, address, 0); + return read_qword_masked_generic(ADDRESS_SPACE_IO, address, U64(0xffffffffffffffff)); } UINT64 io_read_qword_masked_64le(offs_t address, UINT64 mask) { - return read_qword_masked_generic(ADDRESS_SPACE_IO, address, ~mask); + return read_qword_masked_generic(ADDRESS_SPACE_IO, address, mask); } UINT64 io_read_qword_64be(offs_t address) { - return read_qword_masked_generic(ADDRESS_SPACE_IO, address, 0); + return read_qword_masked_generic(ADDRESS_SPACE_IO, address, U64(0xffffffffffffffff)); } UINT64 io_read_qword_masked_64be(offs_t address, UINT64 mask) { - return read_qword_masked_generic(ADDRESS_SPACE_IO, address, ~mask); + return read_qword_masked_generic(ADDRESS_SPACE_IO, address, mask); } @@ -5543,13 +5543,13 @@ INLINE void write_qword_masked_generic(UINT8 spacenum, offs_t address, UINT64 da entry = lookup_write_entry(space, address); handler = &space->writehandlers[entry]; - DEBUG_HOOK_WRITE(spacenum, address & ~7, data, ~mem_mask); + DEBUG_HOOK_WRITE(spacenum, address & ~7, data, mem_mask); offset = (address - handler->bytestart) & handler->bytemask; if (entry < STATIC_RAM) { UINT64 *dest = (UINT64 *)&bank_ptr[entry][offset & ~7]; - *dest = (*dest & mem_mask) | (data & ~mem_mask); + *dest = (*dest & ~mem_mask) | (data & mem_mask); } else (*handler->handler.write.mhandler64)(handler->object, offset >> 3, data, mem_mask); @@ -5565,81 +5565,81 @@ INLINE void write_qword_masked_generic(UINT8 spacenum, offs_t address, UINT64 da void program_write_byte_64le(offs_t address, UINT8 data) { UINT32 shift = (address & 7) * 8; - write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)data << shift, ~((UINT64)0xff << shift)); + write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)data << shift, (UINT64)0xff << shift); } void program_write_byte_64be(offs_t address, UINT8 data) { UINT32 shift = (~address & 7) * 8; - write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)data << shift, ~((UINT64)0xff << shift)); + write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)data << shift, (UINT64)0xff << shift); } void program_write_word_64le(offs_t address, UINT16 data) { UINT32 shift = (address & 6) * 8; - write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)data << shift, ~((UINT64)0xffff << shift)); + write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)data << shift, (UINT64)0xffff << shift); } void program_write_word_masked_64le(offs_t address, UINT16 data, UINT16 mask) { UINT32 shift = (address & 6) * 8; - write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)data << shift, ~((UINT64)mask << shift)); + write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)data << shift, (UINT64)mask << shift); } void program_write_word_64be(offs_t address, UINT16 data) { UINT32 shift = (~address & 6) * 8; - write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)data << shift, ~((UINT64)0xffff << shift)); + write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)data << shift, (UINT64)0xffff << shift); } void program_write_word_masked_64be(offs_t address, UINT16 data, UINT16 mask) { UINT32 shift = (~address & 6) * 8; - write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)data << shift, ~((UINT64)mask << shift)); + write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)data << shift, (UINT64)mask << shift); } void program_write_dword_64le(offs_t address, UINT32 data) { UINT32 shift = (address & 4) * 8; - write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)data << shift, ~((UINT64)0xffffffff << shift)); + write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)data << shift, (UINT64)0xffffffff << shift); } void program_write_dword_masked_64le(offs_t address, UINT32 data, UINT32 mask) { UINT32 shift = (address & 4) * 8; - write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)data << shift, ~((UINT64)mask << shift)); + write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)data << shift, (UINT64)mask << shift); } void program_write_dword_64be(offs_t address, UINT32 data) { UINT32 shift = (~address & 4) * 8; - write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)data << shift, ~((UINT64)0xffffffff << shift)); + write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)data << shift, (UINT64)0xffffffff << shift); } void program_write_dword_masked_64be(offs_t address, UINT32 data, UINT32 mask) { UINT32 shift = (~address & 4) * 8; - write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)data << shift, ~((UINT64)mask << shift)); + write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, (UINT64)data << shift, (UINT64)mask << shift); } void program_write_qword_64le(offs_t address, UINT64 data) { - write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, 0); + write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, U64(0xffffffffffffffff)); } void program_write_qword_masked_64le(offs_t address, UINT64 data, UINT64 mask) { - write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, ~mask); + write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, mask); } void program_write_qword_64be(offs_t address, UINT64 data) { - write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, 0); + write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, U64(0xffffffffffffffff)); } void program_write_qword_masked_64be(offs_t address, UINT64 data, UINT64 mask) { - write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, ~mask); + write_qword_masked_generic(ADDRESS_SPACE_PROGRAM, address, data, mask); } @@ -5650,81 +5650,81 @@ void program_write_qword_masked_64be(offs_t address, UINT64 data, UINT64 mask) void data_write_byte_64le(offs_t address, UINT8 data) { UINT32 shift = (address & 7) * 8; - write_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)data << shift, ~((UINT64)0xff << shift)); + write_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)data << shift, (UINT64)0xff << shift); } void data_write_byte_64be(offs_t address, UINT8 data) { UINT32 shift = (~address & 7) * 8; - write_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)data << shift, ~((UINT64)0xff << shift)); + write_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)data << shift, (UINT64)0xff << shift); } void data_write_word_64le(offs_t address, UINT16 data) { UINT32 shift = (address & 6) * 8; - write_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)data << shift, ~((UINT64)0xffff << shift)); + write_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)data << shift, (UINT64)0xffff << shift); } void data_write_word_masked_64le(offs_t address, UINT16 data, UINT16 mask) { UINT32 shift = (address & 6) * 8; - write_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)data << shift, ~((UINT64)mask << shift)); + write_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)data << shift, (UINT64)mask << shift); } void data_write_word_64be(offs_t address, UINT16 data) { UINT32 shift = (~address & 6) * 8; - write_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)data << shift, ~((UINT64)0xffff << shift)); + write_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)data << shift, (UINT64)0xffff << shift); } void data_write_word_masked_64be(offs_t address, UINT16 data, UINT16 mask) { UINT32 shift = (~address & 6) * 8; - write_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)data << shift, ~((UINT64)mask << shift)); + write_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)data << shift, (UINT64)mask << shift); } void data_write_dword_64le(offs_t address, UINT32 data) { UINT32 shift = (address & 4) * 8; - write_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)data << shift, ~((UINT64)0xffffffff << shift)); + write_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)data << shift, (UINT64)0xffffffff << shift); } void data_write_dword_masked_64le(offs_t address, UINT32 data, UINT32 mask) { UINT32 shift = (address & 4) * 8; - write_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)data << shift, ~((UINT64)mask << shift)); + write_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)data << shift, (UINT64)mask << shift); } void data_write_dword_64be(offs_t address, UINT32 data) { UINT32 shift = (~address & 4) * 8; - write_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)data << shift, ~((UINT64)0xffffffff << shift)); + write_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)data << shift, (UINT64)0xffffffff << shift); } void data_write_dword_masked_64be(offs_t address, UINT32 data, UINT32 mask) { UINT32 shift = (~address & 4) * 8; - write_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)data << shift, ~((UINT64)mask << shift)); + write_qword_masked_generic(ADDRESS_SPACE_DATA, address, (UINT64)data << shift, (UINT64)mask << shift); } void data_write_qword_64le(offs_t address, UINT64 data) { - write_qword_masked_generic(ADDRESS_SPACE_DATA, address, data, 0); + write_qword_masked_generic(ADDRESS_SPACE_DATA, address, data, U64(0xffffffffffffffff)); } void data_write_qword_masked_64le(offs_t address, UINT64 data, UINT64 mask) { - write_qword_masked_generic(ADDRESS_SPACE_DATA, address, data, ~mask); + write_qword_masked_generic(ADDRESS_SPACE_DATA, address, data, mask); } void data_write_qword_64be(offs_t address, UINT64 data) { - write_qword_masked_generic(ADDRESS_SPACE_DATA, address, data, 0); + write_qword_masked_generic(ADDRESS_SPACE_DATA, address, data, U64(0xffffffffffffffff)); } void data_write_qword_masked_64be(offs_t address, UINT64 data, UINT64 mask) { - write_qword_masked_generic(ADDRESS_SPACE_DATA, address, data, ~mask); + write_qword_masked_generic(ADDRESS_SPACE_DATA, address, data, mask); } @@ -5735,79 +5735,79 @@ void data_write_qword_masked_64be(offs_t address, UINT64 data, UINT64 mask) void io_write_byte_64le(offs_t address, UINT8 data) { UINT32 shift = (address & 7) * 8; - write_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)data << shift, ~((UINT64)0xff << shift)); + write_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)data << shift, (UINT64)0xff << shift); } void io_write_byte_64be(offs_t address, UINT8 data) { UINT32 shift = (~address & 7) * 8; - write_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)data << shift, ~((UINT64)0xff << shift)); + write_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)data << shift, (UINT64)0xff << shift); } void io_write_word_64le(offs_t address, UINT16 data) { UINT32 shift = (address & 6) * 8; - write_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)data << shift, ~((UINT64)0xffff << shift)); + write_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)data << shift, (UINT64)0xffff << shift); } void io_write_word_masked_64le(offs_t address, UINT16 data, UINT16 mask) { UINT32 shift = (address & 6) * 8; - write_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)data << shift, ~((UINT64)mask << shift)); + write_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)data << shift, (UINT64)mask << shift); } void io_write_word_64be(offs_t address, UINT16 data) { UINT32 shift = (~address & 6) * 8; - write_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)data << shift, ~((UINT64)0xffff << shift)); + write_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)data << shift, (UINT64)0xffff << shift); } void io_write_word_masked_64be(offs_t address, UINT16 data, UINT16 mask) { UINT32 shift = (~address & 6) * 8; - write_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)data << shift, ~((UINT64)mask << shift)); + write_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)data << shift, (UINT64)mask << shift); } void io_write_dword_64le(offs_t address, UINT32 data) { UINT32 shift = (address & 4) * 8; - write_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)data << shift, ~((UINT64)0xffffffff << shift)); + write_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)data << shift, (UINT64)0xffffffff << shift); } void io_write_dword_masked_64le(offs_t address, UINT32 data, UINT32 mask) { UINT32 shift = (address & 4) * 8; - write_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)data << shift, ~((UINT64)mask << shift)); + write_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)data << shift, (UINT64)mask << shift); } void io_write_dword_64be(offs_t address, UINT32 data) { UINT32 shift = (~address & 4) * 8; - write_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)data << shift, ~((UINT64)0xffffffff << shift)); + write_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)data << shift, (UINT64)0xffffffff << shift); } void io_write_dword_masked_64be(offs_t address, UINT32 data, UINT32 mask) { UINT32 shift = (~address & 4) * 8; - write_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)data << shift, ~((UINT64)mask << shift)); + write_qword_masked_generic(ADDRESS_SPACE_IO, address, (UINT64)data << shift, (UINT64)mask << shift); } void io_write_qword_64le(offs_t address, UINT64 data) { - write_qword_masked_generic(ADDRESS_SPACE_IO, address, data, 0); + write_qword_masked_generic(ADDRESS_SPACE_IO, address, data, U64(0xffffffffffffffff)); } void io_write_qword_masked_64le(offs_t address, UINT64 data, UINT64 mask) { - write_qword_masked_generic(ADDRESS_SPACE_IO, address, data, ~mask); + write_qword_masked_generic(ADDRESS_SPACE_IO, address, data, mask); } void io_write_qword_64be(offs_t address, UINT64 data) { - write_qword_masked_generic(ADDRESS_SPACE_IO, address, data, 0); + write_qword_masked_generic(ADDRESS_SPACE_IO, address, data, U64(0xffffffffffffffff)); } void io_write_qword_masked_64be(offs_t address, UINT64 data, UINT64 mask) { - write_qword_masked_generic(ADDRESS_SPACE_IO, address, data, ~mask); + write_qword_masked_generic(ADDRESS_SPACE_IO, address, data, mask); } diff --git a/src/emu/memory.h b/src/emu/memory.h index 837ae0f7b00..54598177d97 100644 --- a/src/emu/memory.h +++ b/src/emu/memory.h @@ -428,24 +428,24 @@ union _addrmap64_token /* helper macro for merging data with the memory mask */ -#define COMBINE_DATA(varptr) (*(varptr) = (*(varptr) & mem_mask) | (data & ~mem_mask)) +#define COMBINE_DATA(varptr) (*(varptr) = (*(varptr) & ~mem_mask) | (data & mem_mask)) -#define ACCESSING_BITS_0_7 ((~mem_mask & 0x000000ff) != 0) -#define ACCESSING_BITS_8_15 ((~mem_mask & 0x0000ff00) != 0) -#define ACCESSING_BITS_16_23 ((~mem_mask & 0x00ff0000) != 0) -#define ACCESSING_BITS_24_31 ((~mem_mask & 0xff000000) != 0) -#define ACCESSING_BITS_32_39 ((~mem_mask & U64(0x000000ff00000000)) != 0) -#define ACCESSING_BITS_40_47 ((~mem_mask & U64(0x0000ff0000000000)) != 0) -#define ACCESSING_BITS_48_55 ((~mem_mask & U64(0x00ff000000000000)) != 0) -#define ACCESSING_BITS_56_63 ((~mem_mask & U64(0xff00000000000000)) != 0) +#define ACCESSING_BITS_0_7 ((mem_mask & 0x000000ff) != 0) +#define ACCESSING_BITS_8_15 ((mem_mask & 0x0000ff00) != 0) +#define ACCESSING_BITS_16_23 ((mem_mask & 0x00ff0000) != 0) +#define ACCESSING_BITS_24_31 ((mem_mask & 0xff000000) != 0) +#define ACCESSING_BITS_32_39 ((mem_mask & U64(0x000000ff00000000)) != 0) +#define ACCESSING_BITS_40_47 ((mem_mask & U64(0x0000ff0000000000)) != 0) +#define ACCESSING_BITS_48_55 ((mem_mask & U64(0x00ff000000000000)) != 0) +#define ACCESSING_BITS_56_63 ((mem_mask & U64(0xff00000000000000)) != 0) -#define ACCESSING_BITS_0_15 ((~mem_mask & 0x0000ffff) != 0) -#define ACCESSING_BITS_16_31 ((~mem_mask & 0xffff0000) != 0) -#define ACCESSING_BITS_32_47 ((~mem_mask & U64(0x0000ffff00000000)) != 0) -#define ACCESSING_BITS_48_63 ((~mem_mask & U64(0xffff000000000000)) != 0) +#define ACCESSING_BITS_0_15 ((mem_mask & 0x0000ffff) != 0) +#define ACCESSING_BITS_16_31 ((mem_mask & 0xffff0000) != 0) +#define ACCESSING_BITS_32_47 ((mem_mask & U64(0x0000ffff00000000)) != 0) +#define ACCESSING_BITS_48_63 ((mem_mask & U64(0xffff000000000000)) != 0) -#define ACCESSING_BITS_0_31 ((~mem_mask & 0xffffffff) != 0) -#define ACCESSING_BITS_32_63 ((~mem_mask & U64(0xffffffff00000000)) != 0) +#define ACCESSING_BITS_0_31 ((mem_mask & 0xffffffff) != 0) +#define ACCESSING_BITS_32_63 ((mem_mask & U64(0xffffffff00000000)) != 0) /* bank switching for CPU cores */ diff --git a/src/emu/sound/c352.c b/src/emu/sound/c352.c index f8db2d09c97..8cadcaaad7d 100644 --- a/src/emu/sound/c352.c +++ b/src/emu/sound/c352.c @@ -572,7 +572,7 @@ READ16_HANDLER( c352_0_r ) WRITE16_HANDLER( c352_0_w ) { - if (mem_mask == 0) + if (mem_mask == 0xffff) { c352_write_reg16(sndti_token(SOUND_C352, 0), offset*2, data); } diff --git a/src/emu/sound/es5506.c b/src/emu/sound/es5506.c index 93929cc325c..f6134cd7c62 100644 --- a/src/emu/sound/es5506.c +++ b/src/emu/sound/es5506.c @@ -1711,7 +1711,7 @@ INLINE void es5505_reg_write_high(struct ES5506Chip *chip, struct ES5506Voice *v ((data << 2) & (CONTROL_CA0 | CONTROL_CA1)); } if (LOG_COMMANDS && eslog) - fprintf(eslog, "%06x:voice %d, control=%04x (raw=%04x & %04x)\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->control, data, mem_mask ^ 0xffff); + fprintf(eslog, "%06x:voice %d, control=%04x (raw=%04x & %04x)\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->control, data, mem_mask); break; case 0x01: /* O4(n-1) */ @@ -1847,7 +1847,7 @@ static void es5505_reg_write(struct ES5506Chip *chip, offs_t offset, UINT16 data { struct ES5506Voice *voice = &chip->voice[chip->current_page & 0x1f]; -// logerror("%04x:ES5505 write %02x/%02x = %04x & %04x\n", activecpu_get_previouspc(), chip->current_page, offset, data, mem_mask ^ 0xffff); +// logerror("%04x:ES5505 write %02x/%02x = %04x & %04x\n", activecpu_get_previouspc(), chip->current_page, offset, data, mem_mask); /* force an update */ stream_update(chip->stream); diff --git a/src/emu/video/voodoo.c b/src/emu/video/voodoo.c index 4d0363857fb..005aa55b0a1 100644 --- a/src/emu/video/voodoo.c +++ b/src/emu/video/voodoo.c @@ -2014,7 +2014,7 @@ static UINT32 cmdfifo_execute(voodoo_state *v, cmdfifo_info *f) /* loop over words */ for (i = 0; i < count; i++) - cycles += lfb_w(v, target++, *src++, 0, FALSE); + cycles += lfb_w(v, target++, *src++, 0xffffffff, FALSE); } else if ((command >> 30) == 3) { @@ -3535,13 +3535,13 @@ static void flush_fifos(voodoo_state *v, attotime current_time) cycles = texture_w(v, address, data); else { - UINT32 mem_mask = 0; + UINT32 mem_mask = 0xffffffff; /* compute mem_mask */ if (address & 0x80000000) - mem_mask |= 0xffff0000; + mem_mask &= 0x0000ffff; if (address & 0x40000000) - mem_mask |= 0x0000ffff; + mem_mask &= 0xffff0000; address &= 0xffffff; cycles = lfb_w(v, address, data, mem_mask, FALSE); @@ -4384,7 +4384,7 @@ static void banshee_agp_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 me } if (LOG_REGISTERS) - logerror("%08X:banshee_w(AGP:%s) = %08X & %08X\n", activecpu_get_pc(), banshee_agp_reg_name[offset], data, ~mem_mask); + logerror("%08X:banshee_w(AGP:%s) = %08X & %08X\n", activecpu_get_pc(), banshee_agp_reg_name[offset], data, mem_mask); } @@ -4399,15 +4399,15 @@ static void banshee_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem_ma else if (offset < 0x100000/4) banshee_agp_w(v, offset, data, mem_mask); else if (offset < 0x200000/4) - logerror("%08X:banshee_w(2D:%X) = %08X & %08X\n", activecpu_get_pc(), (offset*4) & 0xfffff, data, ~mem_mask); + logerror("%08X:banshee_w(2D:%X) = %08X & %08X\n", activecpu_get_pc(), (offset*4) & 0xfffff, data, mem_mask); else if (offset < 0x600000/4) register_w(v, offset & 0x1fffff/4, data); else if (offset < 0x800000/4) - logerror("%08X:banshee_w(TEX:%X) = %08X & %08X\n", activecpu_get_pc(), (offset*4) & 0x1fffff, data, ~mem_mask); + logerror("%08X:banshee_w(TEX:%X) = %08X & %08X\n", activecpu_get_pc(), (offset*4) & 0x1fffff, data, mem_mask); else if (offset < 0xc00000/4) - logerror("%08X:banshee_w(RES:%X) = %08X & %08X\n", activecpu_get_pc(), (offset*4) & 0x3fffff, data, ~mem_mask); + logerror("%08X:banshee_w(RES:%X) = %08X & %08X\n", activecpu_get_pc(), (offset*4) & 0x3fffff, data, mem_mask); else if (offset < 0x1000000/4) - logerror("%08X:banshee_w(YUV:%X) = %08X & %08X\n", activecpu_get_pc(), (offset*4) & 0x3fffff, data, ~mem_mask); + logerror("%08X:banshee_w(YUV:%X) = %08X & %08X\n", activecpu_get_pc(), (offset*4) & 0x3fffff, data, mem_mask); else if (offset < 0x2000000/4) { UINT8 temp = v->fbi.lfb_stride; @@ -4436,7 +4436,7 @@ static void banshee_fb_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem { if (offset*4 <= v->fbi.mask) COMBINE_DATA(&((UINT32 *)v->fbi.ram)[offset]); - logerror("%08X:banshee_fb_w(%X) = %08X & %08X\n", activecpu_get_pc(), offset*4, data, ~mem_mask); + logerror("%08X:banshee_fb_w(%X) = %08X & %08X\n", activecpu_get_pc(), offset*4, data, mem_mask); } } else @@ -4518,7 +4518,7 @@ static void banshee_io_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem if ((v->banshee.io[offset] ^ old) & 0x2800) v->fbi.clut_dirty = TRUE; if (LOG_REGISTERS) - logerror("%08X:banshee_io_w(%s) = %08X & %08X\n", activecpu_get_pc(), banshee_io_reg_name[offset], data, ~mem_mask); + logerror("%08X:banshee_io_w(%s) = %08X & %08X\n", activecpu_get_pc(), banshee_io_reg_name[offset], data, mem_mask); break; case io_dacData: @@ -4529,14 +4529,14 @@ static void banshee_io_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem v->fbi.clut_dirty = TRUE; } if (LOG_REGISTERS) - logerror("%08X:banshee_dac_w(%X) = %08X & %08X\n", activecpu_get_pc(), v->banshee.io[io_dacAddr] & 0x1ff, data, ~mem_mask); + logerror("%08X:banshee_dac_w(%X) = %08X & %08X\n", activecpu_get_pc(), v->banshee.io[io_dacAddr] & 0x1ff, data, mem_mask); break; case io_miscInit0: COMBINE_DATA(&v->banshee.io[offset]); v->fbi.yorigin = (data >> 18) & 0xfff; if (LOG_REGISTERS) - logerror("%08X:banshee_io_w(%s) = %08X & %08X\n", activecpu_get_pc(), banshee_io_reg_name[offset], data, ~mem_mask); + logerror("%08X:banshee_io_w(%s) = %08X & %08X\n", activecpu_get_pc(), banshee_io_reg_name[offset], data, mem_mask); break; case io_vidScreenSize: @@ -4550,14 +4550,14 @@ static void banshee_io_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem video_screen_set_visarea(v->screen, 0, v->fbi.width - 1, 0, v->fbi.height - 1); adjust_vblank_timer(v); if (LOG_REGISTERS) - logerror("%08X:banshee_io_w(%s) = %08X & %08X\n", activecpu_get_pc(), banshee_io_reg_name[offset], data, ~mem_mask); + logerror("%08X:banshee_io_w(%s) = %08X & %08X\n", activecpu_get_pc(), banshee_io_reg_name[offset], data, mem_mask); break; case io_lfbMemoryConfig: v->fbi.lfb_base = (data & 0x1fff) << 10; v->fbi.lfb_stride = ((data >> 13) & 7) + 9; if (LOG_REGISTERS) - logerror("%08X:banshee_io_w(%s) = %08X & %08X\n", activecpu_get_pc(), banshee_io_reg_name[offset], data, ~mem_mask); + logerror("%08X:banshee_io_w(%s) = %08X & %08X\n", activecpu_get_pc(), banshee_io_reg_name[offset], data, mem_mask); break; case io_vgab0: case io_vgab4: case io_vgab8: case io_vgabc: @@ -4576,7 +4576,7 @@ static void banshee_io_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem default: COMBINE_DATA(&v->banshee.io[offset]); if (LOG_REGISTERS) - logerror("%08X:banshee_io_w(%s) = %08X & %08X\n", activecpu_get_pc(), banshee_io_reg_name[offset], data, ~mem_mask); + logerror("%08X:banshee_io_w(%s) = %08X & %08X\n", activecpu_get_pc(), banshee_io_reg_name[offset], data, mem_mask); break; } } diff --git a/src/mame/audio/amiga.c b/src/mame/audio/amiga.c index 40d9b08c190..05062d31a9c 100644 --- a/src/mame/audio/amiga.c +++ b/src/mame/audio/amiga.c @@ -83,7 +83,7 @@ static amiga_audio *audio_state; static TIMER_CALLBACK( signal_irq ) { - amiga_custom_w(machine, REG_INTREQ, 0x8000 | (0x80 << param), 0); + amiga_custom_w(machine, REG_INTREQ, 0x8000 | (0x80 << param), 0xffff); } diff --git a/src/mame/audio/cage.c b/src/mame/audio/cage.c index 4417690215f..52a151994d3 100644 --- a/src/mame/audio/cage.c +++ b/src/mame/audio/cage.c @@ -506,7 +506,7 @@ UINT16 main_from_cage_r(void) logerror("%06X:main read data = %04X\n", activecpu_get_pc(), soundlatch_word_r(Machine, 0, 0)); cage_to_cpu_ready = 0; update_control_lines(); - return soundlatch_word_r(Machine, 0, 0); + return soundlatch_word_r(Machine, 0, 0xffff); } diff --git a/src/mame/audio/cchasm.c b/src/mame/audio/cchasm.c index 25a779a4bf4..d42730a6d21 100644 --- a/src/mame/audio/cchasm.c +++ b/src/mame/audio/cchasm.c @@ -22,7 +22,7 @@ READ8_HANDLER( cchasm_snd_io_r ) switch (offset & 0x61 ) { case 0x00: - coin = (input_port_3_r (machine, offset) >> 4) & 0x7; + coin = (input_port_read_indexed(machine, 3) >> 4) & 0x7; if (coin != 0x7) coin |= 0x8; return sound_flags | coin; @@ -119,11 +119,11 @@ READ16_HANDLER( cchasm_io_r ) sound_flags &= ~0x40; return soundlatch4_r (machine,offset) << 8; case 0x2: - return (sound_flags| (input_port_3_r (machine, offset) & 0x07) | 0x08) << 8; + return (sound_flags| (input_port_read_indexed(machine, 3) & 0x07) | 0x08) << 8; case 0x5: - return input_port_2_r (machine, offset) << 8; + return input_port_read_indexed(machine, 2) << 8; case 0x8: - return input_port_1_r (machine, offset) << 8; + return input_port_read_indexed(machine, 1) << 8; default: return 0xff << 8; } @@ -169,7 +169,7 @@ static z80ctc_interface ctc_intf = static TIMER_CALLBACK( cchasm_sh_update ) { - if ((input_port_3_r (machine, 0) & 0x70) != 0x70) + if ((input_port_read_indexed(machine, 3) & 0x70) != 0x70) z80ctc_0_trg0_w (machine, 0, 1); } diff --git a/src/mame/audio/cps3.c b/src/mame/audio/cps3.c index 5256aecdb70..16e0e903a5f 100644 --- a/src/mame/audio/cps3.c +++ b/src/mame/audio/cps3.c @@ -142,7 +142,7 @@ READ32_HANDLER( cps3_sound_r ) if (offset < 0x80) { - return chip.voice[offset / 8].regs[offset & 7] & ~mem_mask; + return chip.voice[offset / 8].regs[offset & 7] & mem_mask; } else if (offset == 0x80) { diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c index 3870ea74c55..97940251184 100644 --- a/src/mame/audio/dcs.c +++ b/src/mame/audio/dcs.c @@ -1562,7 +1562,7 @@ static WRITE16_HANDLER( input_latch_ack_w ) static READ16_HANDLER( input_latch_r ) { if (dcs.auto_ack) - input_latch_ack_w(machine,0,0,0); + input_latch_ack_w(machine,0,0,0xffff); if (LOG_DCS_IO) logerror("%08X:input_latch_r(%04X)\n", activecpu_get_pc(), dcs.input_data); return dcs.input_data; @@ -2070,7 +2070,7 @@ static TIMER_CALLBACK( s1_ack_callback2 ) timer_set(ATTOTIME_IN_USEC(1), NULL, param, s1_ack_callback2); return; } - output_latch_w(machine, 0, 0x000a, 0); + output_latch_w(machine, 0, 0x000a, 0xffff); } @@ -2082,7 +2082,7 @@ static TIMER_CALLBACK( s1_ack_callback1 ) timer_set(ATTOTIME_IN_USEC(1), NULL, param, s1_ack_callback1); return; } - output_latch_w(machine, 0, param, 0); + output_latch_w(machine, 0, param, 0xffff); /* chain to the next word we need to write back */ timer_set(ATTOTIME_IN_USEC(1), NULL, 0, s1_ack_callback2); @@ -2220,8 +2220,8 @@ static TIMER_CALLBACK( s2_ack_callback ) timer_set(ATTOTIME_IN_USEC(1), NULL, param, s2_ack_callback); return; } - output_latch_w(machine, 0, param, 0); - output_control_w(machine, 0, (dcs.output_control & ~0xff00) | 0x0300, 0); + output_latch_w(machine, 0, param, 0xffff); + output_control_w(machine, 0, (dcs.output_control & ~0xff00) | 0x0300, 0xffff); } diff --git a/src/mame/audio/leland.c b/src/mame/audio/leland.c index e4165f1733b..305202ec49d 100644 --- a/src/mame/audio/leland.c +++ b/src/mame/audio/leland.c @@ -1270,28 +1270,28 @@ static WRITE16_HANDLER( i80186_internal_port_w ) /* handle partials */ if (!ACCESSING_BITS_8_15) - data = (i80186_internal_port_r(machine, offset, 0) & 0xff00) | (data & 0x00ff); + data = (i80186_internal_port_r(machine, offset, 0xff00) & 0xff00) | (data & 0x00ff); else if (!ACCESSING_BITS_0_7) - data = (i80186_internal_port_r(machine, offset, 0) & 0x00ff) | (data & 0xff00); + data = (i80186_internal_port_r(machine, offset, 0x00ff) & 0x00ff) | (data & 0xff00); switch (offset) { case 0x22/2: - if (LOG_PORTS) logerror("%05X:80186 EOI = %04X & %04X\n", activecpu_get_pc(), data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 EOI = %04X & %04X\n", activecpu_get_pc(), data, mem_mask); handle_eoi(0x8000); update_interrupt_state(); break; case 0x24/2: - logerror("%05X:ERROR - write to 80186 interrupt poll = %04X & %04X\n", activecpu_get_pc(), data, mem_mask ^ 0xffff); + logerror("%05X:ERROR - write to 80186 interrupt poll = %04X & %04X\n", activecpu_get_pc(), data, mem_mask); break; case 0x26/2: - logerror("%05X:ERROR - write to 80186 interrupt poll status = %04X & %04X\n", activecpu_get_pc(), data, mem_mask ^ 0xffff); + logerror("%05X:ERROR - write to 80186 interrupt poll status = %04X & %04X\n", activecpu_get_pc(), data, mem_mask); break; case 0x28/2: - if (LOG_PORTS) logerror("%05X:80186 interrupt mask = %04X & %04X\n", activecpu_get_pc(), data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 interrupt mask = %04X & %04X\n", activecpu_get_pc(), data, mem_mask); i80186.intr.timer = (i80186.intr.timer & ~0x08) | ((data << 3) & 0x08); i80186.intr.dma[0] = (i80186.intr.dma[0] & ~0x08) | ((data << 1) & 0x08); i80186.intr.dma[1] = (i80186.intr.dma[1] & ~0x08) | ((data << 0) & 0x08); @@ -1303,69 +1303,69 @@ static WRITE16_HANDLER( i80186_internal_port_w ) break; case 0x2a/2: - if (LOG_PORTS) logerror("%05X:80186 interrupt priority mask = %04X & %04X\n", activecpu_get_pc(), data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 interrupt priority mask = %04X & %04X\n", activecpu_get_pc(), data, mem_mask); i80186.intr.priority_mask = data & 0x0007; update_interrupt_state(); break; case 0x2c/2: - if (LOG_PORTS) logerror("%05X:80186 interrupt in-service = %04X & %04X\n", activecpu_get_pc(), data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 interrupt in-service = %04X & %04X\n", activecpu_get_pc(), data, mem_mask); i80186.intr.in_service = data & 0x00ff; update_interrupt_state(); break; case 0x2e/2: - if (LOG_PORTS) logerror("%05X:80186 interrupt request = %04X & %04X\n", activecpu_get_pc(), data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 interrupt request = %04X & %04X\n", activecpu_get_pc(), data, mem_mask); i80186.intr.request = (i80186.intr.request & ~0x00c0) | (data & 0x00c0); update_interrupt_state(); break; case 0x30/2: - if (LOG_PORTS) logerror("%05X:WARNING - wrote to 80186 interrupt status = %04X & %04X\n", activecpu_get_pc(), data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:WARNING - wrote to 80186 interrupt status = %04X & %04X\n", activecpu_get_pc(), data, mem_mask); i80186.intr.status = (i80186.intr.status & ~0x8000) | (data & 0x8000); i80186.intr.status = (i80186.intr.status & ~0x0007) | (data & 0x0007); update_interrupt_state(); break; case 0x32/2: - if (LOG_PORTS) logerror("%05X:80186 timer interrupt contol = %04X & %04X\n", activecpu_get_pc(), data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 timer interrupt contol = %04X & %04X\n", activecpu_get_pc(), data, mem_mask); i80186.intr.timer = data & 0x000f; break; case 0x34/2: - if (LOG_PORTS) logerror("%05X:80186 DMA 0 interrupt control = %04X & %04X\n", activecpu_get_pc(), data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 DMA 0 interrupt control = %04X & %04X\n", activecpu_get_pc(), data, mem_mask); i80186.intr.dma[0] = data & 0x000f; break; case 0x36/2: - if (LOG_PORTS) logerror("%05X:80186 DMA 1 interrupt control = %04X & %04X\n", activecpu_get_pc(), data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 DMA 1 interrupt control = %04X & %04X\n", activecpu_get_pc(), data, mem_mask); i80186.intr.dma[1] = data & 0x000f; break; case 0x38/2: - if (LOG_PORTS) logerror("%05X:80186 INT 0 interrupt control = %04X & %04X\n", activecpu_get_pc(), data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 INT 0 interrupt control = %04X & %04X\n", activecpu_get_pc(), data, mem_mask); i80186.intr.ext[0] = data & 0x007f; break; case 0x3a/2: - if (LOG_PORTS) logerror("%05X:80186 INT 1 interrupt control = %04X & %04X\n", activecpu_get_pc(), data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 INT 1 interrupt control = %04X & %04X\n", activecpu_get_pc(), data, mem_mask); i80186.intr.ext[1] = data & 0x007f; break; case 0x3c/2: - if (LOG_PORTS) logerror("%05X:80186 INT 2 interrupt control = %04X & %04X\n", activecpu_get_pc(), data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 INT 2 interrupt control = %04X & %04X\n", activecpu_get_pc(), data, mem_mask); i80186.intr.ext[2] = data & 0x001f; break; case 0x3e/2: - if (LOG_PORTS) logerror("%05X:80186 INT 3 interrupt control = %04X & %04X\n", activecpu_get_pc(), data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 INT 3 interrupt control = %04X & %04X\n", activecpu_get_pc(), data, mem_mask); i80186.intr.ext[3] = data & 0x001f; break; case 0x50/2: case 0x58/2: case 0x60/2: - if (LOG_PORTS) logerror("%05X:80186 Timer %d count = %04X & %04X\n", activecpu_get_pc(), (offset - 0x50/2) / 4, data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 Timer %d count = %04X & %04X\n", activecpu_get_pc(), (offset - 0x50/2) / 4, data, mem_mask); which = (offset - 0x50/2) / 4; internal_timer_update(which, data, -1, -1, -1); break; @@ -1373,14 +1373,14 @@ static WRITE16_HANDLER( i80186_internal_port_w ) case 0x52/2: case 0x5a/2: case 0x62/2: - if (LOG_PORTS) logerror("%05X:80186 Timer %d max A = %04X & %04X\n", activecpu_get_pc(), (offset - 0x50/2) / 4, data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 Timer %d max A = %04X & %04X\n", activecpu_get_pc(), (offset - 0x50/2) / 4, data, mem_mask); which = (offset - 0x50/2) / 4; internal_timer_update(which, -1, data, -1, -1); break; case 0x54/2: case 0x5c/2: - if (LOG_PORTS) logerror("%05X:80186 Timer %d max B = %04X & %04X\n", activecpu_get_pc(), (offset - 0x50/2) / 4, data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 Timer %d max B = %04X & %04X\n", activecpu_get_pc(), (offset - 0x50/2) / 4, data, mem_mask); which = (offset - 0x50/2) / 4; internal_timer_update(which, -1, -1, data, -1); break; @@ -1388,33 +1388,33 @@ static WRITE16_HANDLER( i80186_internal_port_w ) case 0x56/2: case 0x5e/2: case 0x66/2: - if (LOG_PORTS) logerror("%05X:80186 Timer %d control = %04X & %04X\n", activecpu_get_pc(), (offset - 0x50/2) / 4, data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 Timer %d control = %04X & %04X\n", activecpu_get_pc(), (offset - 0x50/2) / 4, data, mem_mask); which = (offset - 0x50/2) / 4; internal_timer_update(which, -1, -1, -1, data); break; case 0xa0/2: - if (LOG_PORTS) logerror("%05X:80186 upper chip select = %04X & %04X\n", activecpu_get_pc(), data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 upper chip select = %04X & %04X\n", activecpu_get_pc(), data, mem_mask); i80186.mem.upper = data | 0xc038; break; case 0xa2/2: - if (LOG_PORTS) logerror("%05X:80186 lower chip select = %04X & %04X\n", activecpu_get_pc(), data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 lower chip select = %04X & %04X\n", activecpu_get_pc(), data, mem_mask); i80186.mem.lower = (data & 0x3fff) | 0x0038; break; case 0xa4/2: - if (LOG_PORTS) logerror("%05X:80186 peripheral chip select = %04X & %04X\n", activecpu_get_pc(), data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 peripheral chip select = %04X & %04X\n", activecpu_get_pc(), data, mem_mask); i80186.mem.peripheral = data | 0x0038; break; case 0xa6/2: - if (LOG_PORTS) logerror("%05X:80186 middle chip select = %04X & %04X\n", activecpu_get_pc(), data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 middle chip select = %04X & %04X\n", activecpu_get_pc(), data, mem_mask); i80186.mem.middle = data | 0x01f8; break; case 0xa8/2: - if (LOG_PORTS) logerror("%05X:80186 middle P chip select = %04X & %04X\n", activecpu_get_pc(), data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 middle P chip select = %04X & %04X\n", activecpu_get_pc(), data, mem_mask); i80186.mem.middle_size = data | 0x8038; temp = (i80186.mem.peripheral & 0xffc0) << 4; @@ -1434,7 +1434,7 @@ static WRITE16_HANDLER( i80186_internal_port_w ) case 0xc0/2: case 0xd0/2: - if (LOG_PORTS) logerror("%05X:80186 DMA%d lower source address = %04X & %04X\n", activecpu_get_pc(), (offset - 0xc0/2) / 8, data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 DMA%d lower source address = %04X & %04X\n", activecpu_get_pc(), (offset - 0xc0/2) / 8, data, mem_mask); which = (offset - 0xc0/2) / 8; stream_update(dma_stream); i80186.dma[which].source = (i80186.dma[which].source & ~0x0ffff) | (data & 0x0ffff); @@ -1442,7 +1442,7 @@ static WRITE16_HANDLER( i80186_internal_port_w ) case 0xc2/2: case 0xd2/2: - if (LOG_PORTS) logerror("%05X:80186 DMA%d upper source address = %04X & %04X\n", activecpu_get_pc(), (offset - 0xc0/2) / 8, data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 DMA%d upper source address = %04X & %04X\n", activecpu_get_pc(), (offset - 0xc0/2) / 8, data, mem_mask); which = (offset - 0xc0/2) / 8; stream_update(dma_stream); i80186.dma[which].source = (i80186.dma[which].source & ~0xf0000) | ((data << 16) & 0xf0000); @@ -1450,7 +1450,7 @@ static WRITE16_HANDLER( i80186_internal_port_w ) case 0xc4/2: case 0xd4/2: - if (LOG_PORTS) logerror("%05X:80186 DMA%d lower dest address = %04X & %04X\n", activecpu_get_pc(), (offset - 0xc0/2) / 8, data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 DMA%d lower dest address = %04X & %04X\n", activecpu_get_pc(), (offset - 0xc0/2) / 8, data, mem_mask); which = (offset - 0xc0/2) / 8; stream_update(dma_stream); i80186.dma[which].dest = (i80186.dma[which].dest & ~0x0ffff) | (data & 0x0ffff); @@ -1458,7 +1458,7 @@ static WRITE16_HANDLER( i80186_internal_port_w ) case 0xc6/2: case 0xd6/2: - if (LOG_PORTS) logerror("%05X:80186 DMA%d upper dest address = %04X & %04X\n", activecpu_get_pc(), (offset - 0xc0/2) / 8, data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 DMA%d upper dest address = %04X & %04X\n", activecpu_get_pc(), (offset - 0xc0/2) / 8, data, mem_mask); which = (offset - 0xc0/2) / 8; stream_update(dma_stream); i80186.dma[which].dest = (i80186.dma[which].dest & ~0xf0000) | ((data << 16) & 0xf0000); @@ -1466,7 +1466,7 @@ static WRITE16_HANDLER( i80186_internal_port_w ) case 0xc8/2: case 0xd8/2: - if (LOG_PORTS) logerror("%05X:80186 DMA%d transfer count = %04X & %04X\n", activecpu_get_pc(), (offset - 0xc0/2) / 8, data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 DMA%d transfer count = %04X & %04X\n", activecpu_get_pc(), (offset - 0xc0/2) / 8, data, mem_mask); which = (offset - 0xc0/2) / 8; stream_update(dma_stream); i80186.dma[which].count = data; @@ -1474,14 +1474,14 @@ static WRITE16_HANDLER( i80186_internal_port_w ) case 0xca/2: case 0xda/2: - if (LOG_PORTS) logerror("%05X:80186 DMA%d control = %04X & %04X\n", activecpu_get_pc(), (offset - 0xc0/2) / 8, data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 DMA%d control = %04X & %04X\n", activecpu_get_pc(), (offset - 0xc0/2) / 8, data, mem_mask); which = (offset - 0xc0/2) / 8; stream_update(dma_stream); update_dma_control(which, data); break; case 0xfe/2: - if (LOG_PORTS) logerror("%05X:80186 relocation register = %04X & %04X\n", activecpu_get_pc(), data, mem_mask ^ 0xffff); + if (LOG_PORTS) logerror("%05X:80186 relocation register = %04X & %04X\n", activecpu_get_pc(), data, mem_mask); /* we assume here there that this doesn't happen too often */ /* plus, we can't really remove the old memory range, so we also assume that it's */ @@ -1498,7 +1498,7 @@ static WRITE16_HANDLER( i80186_internal_port_w ) break; default: - logerror("%05X:80186 port %02X = %04X & %04X\n", activecpu_get_pc(), offset*2, data, mem_mask ^ 0xffff); + logerror("%05X:80186 port %02X = %04X & %04X\n", activecpu_get_pc(), offset*2, data, mem_mask); break; } } @@ -1923,13 +1923,13 @@ static WRITE16_HANDLER( ataxx_dac_control ) case 0x01: case 0x02: if (ACCESSING_BITS_0_7) - dac_w(machine, offset, data, 0xff00); + dac_w(machine, offset, data, 0x00ff); return; case 0x03: - dac_w(machine, 0, ((data << 13) & 0xe000) | ((data << 10) & 0x1c00) | ((data << 7) & 0x0300), 0x00ff); - dac_w(machine, 2, ((data << 10) & 0xe000) | ((data << 7) & 0x1c00) | ((data << 4) & 0x0300), 0x00ff); - dac_w(machine, 4, ((data << 8) & 0xc000) | ((data << 6) & 0x3000) | ((data << 4) & 0x0c00) | ((data << 2) & 0x0300), 0x00ff); + dac_w(machine, 0, ((data << 13) & 0xe000) | ((data << 10) & 0x1c00) | ((data << 7) & 0x0300), 0xff00); + dac_w(machine, 2, ((data << 10) & 0xe000) | ((data << 7) & 0x1c00) | ((data << 4) & 0x0300), 0xff00); + dac_w(machine, 4, ((data << 8) & 0xc000) | ((data << 6) & 0x3000) | ((data << 4) & 0x0c00) | ((data << 2) & 0x0300), 0xff00); return; } diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c index f8891d3bf4f..e96859065d8 100644 --- a/src/mame/audio/seibu.c +++ b/src/mame/audio/seibu.c @@ -459,12 +459,12 @@ WRITE16_HANDLER( seibu_main_word_w ) READ8_HANDLER( seibu_main_v30_r ) { - return seibu_main_word_r(machine,offset/2,0) >> (8 * (offset & 1)); + return seibu_main_word_r(machine,offset/2,0xffff) >> (8 * (offset & 1)); } WRITE8_HANDLER( seibu_main_v30_w ) { - seibu_main_word_w(machine,offset/2,data << (8 * (offset & 1)),0xff00 >> (8 * (offset & 1))); + seibu_main_word_w(machine,offset/2,data << (8 * (offset & 1)),0x00ff << (8 * (offset & 1))); } WRITE16_HANDLER( seibu_main_mustb_w ) diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c index 2387eeb3470..67ec7c4b417 100644 --- a/src/mame/drivers/acommand.c +++ b/src/mame/drivers/acommand.c @@ -281,7 +281,7 @@ static READ16_HANDLER(ac_devices_r) ---- ---- ---- --x- (Activate Test) ---- ---- ---- ---x (Advance Thru Tests) */ - return input_port_0_word_r(machine,0,0); + return input_port_read_indexed(machine,0); case 0x0014/2: /* write 0x40,read (~0x08) @@ -315,7 +315,7 @@ static READ16_HANDLER(ac_devices_r) xxxx xxxx ---- ---- DIPSW4 ---- ---- xxxx xxxx DIPSW3 */ - return input_port_1_word_r(machine,0,0); + return input_port_read_indexed(machine,1); } return ac_devram[offset]; } diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c index 8d3bcb91a2c..307796d9392 100644 --- a/src/mame/drivers/aquarium.c +++ b/src/mame/drivers/aquarium.c @@ -87,7 +87,7 @@ static MACHINE_RESET( aquarium ) static READ16_HANDLER( aquarium_coins_r ) { int data; - data = (input_port_2_word_r(machine,0,mem_mask) & 0x7fff); /* IN1 */ + data = (input_port_read_indexed(machine,2) & 0x7fff); /* IN1 */ data |= aquarium_snd_ack; aquarium_snd_ack = 0; return data; diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c index 7f7c745e0b7..0f64832582f 100644 --- a/src/mame/drivers/armedf.c +++ b/src/mame/drivers/armedf.c @@ -226,7 +226,7 @@ static WRITE16_HANDLER( kodure_io_w ) int i; for (i = 0; i < 0x1000; i++) { - armedf_text_videoram_w(machine,i, ' ', 0); + armedf_text_videoram_w(machine,i, ' ', 0xffff); } } } diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c index 737fe206cf3..e31627c78b9 100644 --- a/src/mame/drivers/asterix.c +++ b/src/mame/drivers/asterix.c @@ -68,7 +68,7 @@ static READ16_HANDLER( control1_r ) /* bit 8 is EEPROM data */ /* bit 9 is EEPROM ready */ /* bit 10 is service button */ - res = (EEPROM_read_bit()<<8) | input_port_1_word_r(machine,0,0); + res = (EEPROM_read_bit()<<8) | input_port_read_indexed(machine,1); if (init_eeprom_count) { diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c index 7884c705d8d..502d8049507 100644 --- a/src/mame/drivers/atarigt.c +++ b/src/mame/drivers/atarigt.c @@ -93,7 +93,7 @@ static void cage_irq_callback(int reason) if (reason) atarigen_sound_int_gen(Machine, 0); else - atarigen_sound_int_ack_w(Machine,0,0,0); + atarigen_sound_int_ack_w(Machine,0,0,0xffff); } @@ -231,7 +231,7 @@ static WRITE32_HANDLER( mo_command_w ) static WRITE32_HANDLER( led_w ) { -// logerror("LED = %08X & %08X\n", data, ~mem_mask); +// logerror("LED = %08X & %08X\n", data, mem_mask); } @@ -1078,14 +1078,14 @@ static WRITE32_HANDLER( tmek_pf_w ) /* protected version */ if (pc == 0x2EB3C || pc == 0x2EB48) { - logerror("%06X:PFW@%06X = %08X & %08X (src=%06X)\n", activecpu_get_pc(), 0xd72000 + offset*4, data, ~mem_mask, (UINT32)activecpu_get_reg(M68K_A4) - 2); + logerror("%06X:PFW@%06X = %08X & %08X (src=%06X)\n", activecpu_get_pc(), 0xd72000 + offset*4, data, mem_mask, (UINT32)activecpu_get_reg(M68K_A4) - 2); /* skip these writes to make more stuff visible */ return; } /* unprotected version */ if (pc == 0x25834 || pc == 0x25860) - logerror("%06X:PFW@%06X = %08X & %08X (src=%06X)\n", activecpu_get_pc(), 0xd72000 + offset*4, data, ~mem_mask, (UINT32)activecpu_get_reg(M68K_A3) - 2); + logerror("%06X:PFW@%06X = %08X & %08X (src=%06X)\n", activecpu_get_pc(), 0xd72000 + offset*4, data, mem_mask, (UINT32)activecpu_get_reg(M68K_A3) - 2); atarigen_playfield32_w(machine, offset, data, mem_mask); } diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c index b890804c316..62cb675f5f8 100644 --- a/src/mame/drivers/atarigx2.c +++ b/src/mame/drivers/atarigx2.c @@ -133,7 +133,7 @@ static WRITE32_HANDLER( latch_w ) D0 = CC.R */ - logerror("latch_w(%08X) & %08X\n", data, ~mem_mask); + logerror("latch_w(%08X) & %08X\n", data, mem_mask); /* upper byte */ if (ACCESSING_BITS_24_31) diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c index eeb273c334b..61c362bf705 100644 --- a/src/mame/drivers/atarisy2.c +++ b/src/mame/drivers/atarisy2.c @@ -361,8 +361,8 @@ static WRITE16_HANDLER( bankselect_w ) static STATE_POSTLOAD( bankselect_postload ) { - bankselect_w(Machine, 0, bankselect[0], 0); - bankselect_w(Machine, 1, bankselect[1], 0); + bankselect_w(machine, 0, bankselect[0], 0xffff); + bankselect_w(machine, 1, bankselect[1], 0xffff); } @@ -375,7 +375,7 @@ static STATE_POSTLOAD( bankselect_postload ) static READ16_HANDLER( switch_r ) { - int result = input_port_1_r(machine, offset) | (input_port_2_r(machine, offset) << 8); + int result = input_port_read_indexed(machine, 1) | (input_port_read_indexed(machine, 2) << 8); if (atarigen_cpu_to_sound_ready) result ^= 0x20; if (atarigen_sound_to_cpu_ready) result ^= 0x10; @@ -386,12 +386,12 @@ static READ16_HANDLER( switch_r ) static READ8_HANDLER( switch_6502_r ) { - int result = input_port_0_r(machine, offset); + int result = input_port_read_indexed(machine, 0); if (atarigen_cpu_to_sound_ready) result ^= 0x01; if (atarigen_sound_to_cpu_ready) result ^= 0x02; if (!has_tms5220 || tms5220_ready_r()) result ^= 0x04; - if (!(input_port_2_r(machine, offset) & 0x80)) result ^= 0x10; + if (!(input_port_read_indexed(machine, 2) & 0x80)) result ^= 0x10; return result; } @@ -639,7 +639,7 @@ static READ16_HANDLER( sound_r ) atarigen_update_interrupts(machine); /* handle it normally otherwise */ - return atarigen_sound_r(machine,offset,0); + return atarigen_sound_r(machine,offset,0xffff); } diff --git a/src/mame/drivers/aztarac.c b/src/mame/drivers/aztarac.c index 6adc027b5c7..4388a70618f 100644 --- a/src/mame/drivers/aztarac.c +++ b/src/mame/drivers/aztarac.c @@ -60,8 +60,8 @@ static READ16_HANDLER( nvram_r ) static READ16_HANDLER( joystick_r ) { - return (((input_port_0_r (machine,offset) - 0xf) << 8) | - ((input_port_1_r (machine,offset) - 0xf) & 0xff)); + return (((input_port_read_indexed(machine, 0) - 0xf) << 8) | + ((input_port_read_indexed(machine, 1) - 0xf) & 0xff)); } diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c index 6588c0f6168..d7793662adc 100644 --- a/src/mame/drivers/badlands.c +++ b/src/mame/drivers/badlands.c @@ -166,7 +166,7 @@ static MACHINE_RESET( badlands ) static INTERRUPT_GEN( vblank_int ) { - int pedal_state = input_port_4_r(machine, 0); + int pedal_state = input_port_read_indexed(machine, 4); int i; /* update the pedals once per frame */ diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c index 1b9a5d82110..cdedcec03eb 100644 --- a/src/mame/drivers/bbusters.c +++ b/src/mame/drivers/bbusters.c @@ -709,13 +709,13 @@ static INTERRUPT_GEN( bbuster ) static VIDEO_EOF( bbuster ) { - buffer_spriteram16_w(machine,0,0,0); - buffer_spriteram16_2_w(machine,0,0,0); + buffer_spriteram16_w(machine,0,0,0xffff); + buffer_spriteram16_2_w(machine,0,0,0xffff); } static VIDEO_EOF( mechatt ) { - buffer_spriteram16_w(machine,0,0,0); + buffer_spriteram16_w(machine,0,0,0xffff); } static MACHINE_DRIVER_START( bbusters ) diff --git a/src/mame/drivers/beathead.c b/src/mame/drivers/beathead.c index 0569c574bbe..0ec7e6fb1fe 100644 --- a/src/mame/drivers/beathead.c +++ b/src/mame/drivers/beathead.c @@ -248,7 +248,7 @@ static WRITE32_HANDLER( eeprom_data_w ) { if (eeprom_enabled) { - mem_mask |= 0xffffff00; + mem_mask &= 0x000000ff; COMBINE_DATA(generic_nvram32 + offset); eeprom_enabled = 0; } @@ -304,7 +304,7 @@ static READ32_HANDLER( input_3_r ) static READ32_HANDLER( sound_data_r ) { - return atarigen_sound_r(machine,offset,0); + return atarigen_sound_r(machine,offset,0xffff); } diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c index 0dfdd5f41c6..a0868943c63 100644 --- a/src/mame/drivers/bfm_sc2.c +++ b/src/mame/drivers/bfm_sc2.c @@ -894,7 +894,7 @@ static WRITE8_HANDLER( coininhib_w ) static READ8_HANDLER( coin_input_r ) { - return input_port_0_r(machine, 0); + return input_port_read_indexed(machine, 0); } /////////////////////////////////////////////////////////////////////////// diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c index 39b6f6278c7..96085062bd6 100644 --- a/src/mame/drivers/bigfghtr.c +++ b/src/mame/drivers/bigfghtr.c @@ -272,7 +272,7 @@ static VIDEO_UPDATE( bigfghtr ) static VIDEO_EOF( bigfghtr ) { - buffer_spriteram16_w(machine,0,0,0); + buffer_spriteram16_w(machine,0,0,0xffff); } @@ -317,7 +317,7 @@ static READ16_HANDLER(sharedram_r) break; case 0x46/2: - return (input_port_0_word_r(machine,0,0)&0xffff)^0xffff; + return (input_port_read_indexed(machine,0)&0xffff)^0xffff; } diff --git a/src/mame/drivers/btoads.c b/src/mame/drivers/btoads.c index 81a82e3a06c..6e11e4dea74 100644 --- a/src/mame/drivers/btoads.c +++ b/src/mame/drivers/btoads.c @@ -172,7 +172,7 @@ static WRITE8_HANDLER( bsmt2000_port_w ) { UINT16 reg = offset >> 8; UINT16 val = ((offset & 0xff) << 8) | data; - BSMT2000_data_0_w(machine, reg, val, 0); + BSMT2000_data_0_w(machine, reg, val, 0xffff); } diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c index 8f5fe4e0b6b..b4017947c1f 100644 --- a/src/mame/drivers/capbowl.c +++ b/src/mame/drivers/capbowl.c @@ -163,21 +163,21 @@ static WRITE8_HANDLER( capbowl_rom_select_w ) static READ8_HANDLER( track_0_r ) { - return (input_port_0_r(machine, offset) & 0xf0) | ((input_port_2_r(machine, offset) - last_trackball_val[0]) & 0x0f); + return (input_port_read_indexed(machine, 0) & 0xf0) | ((input_port_read_indexed(machine, 2) - last_trackball_val[0]) & 0x0f); } static READ8_HANDLER( track_1_r ) { - return (input_port_1_r(machine, offset) & 0xf0) | ((input_port_3_r(machine, offset) - last_trackball_val[1]) & 0x0f); + return (input_port_read_indexed(machine, 1) & 0xf0) | ((input_port_read_indexed(machine, 3) - last_trackball_val[1]) & 0x0f); } static WRITE8_HANDLER( track_reset_w ) { /* reset the trackball counters */ - last_trackball_val[0] = input_port_2_r(machine, offset); - last_trackball_val[1] = input_port_3_r(machine, offset); + last_trackball_val[0] = input_port_read_indexed(machine, 2); + last_trackball_val[1] = input_port_read_indexed(machine, 3); watchdog_reset_w(machine, offset, data); } diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c index 103df4b222e..46485488024 100644 --- a/src/mame/drivers/cave.c +++ b/src/mame/drivers/cave.c @@ -230,14 +230,14 @@ static WRITE16_HANDLER( sound_cmd_w ) static READ8_HANDLER( soundlatch_lo_r ) { // sound_flag1 = 0; - return soundlatch_word_r(machine,offset,0) & 0xff; + return soundlatch_word_r(machine,offset,0x00ff) & 0xff; } /* Sound CPU: read the high 8 bits of the 16 bit sound latch */ static READ8_HANDLER( soundlatch_hi_r ) { // sound_flag2 = 0; - return soundlatch_word_r(machine,offset,0) >> 8; + return soundlatch_word_r(machine,offset,0xff00) >> 8; } /* Main CPU: read the latch written by the sound CPU (acknowledge) */ @@ -578,7 +578,7 @@ static READ16_HANDLER( donpachi_videoregs_r ) case 0: case 1: case 2: - case 3: return cave_irq_cause_r(machine,offset,0); + case 3: return cave_irq_cause_r(machine,offset,0xffff); default: return 0x0000; } diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c index bb7a7b8d0c8..21c24ab9cda 100644 --- a/src/mame/drivers/cbuster.c +++ b/src/mame/drivers/cbuster.c @@ -38,7 +38,7 @@ static WRITE16_HANDLER( twocrude_control_w ) { switch (offset<<1) { case 0: /* DMA flag */ - buffer_spriteram16_w(machine,0,0,0); + buffer_spriteram16_w(machine,0,0,0xffff); return; case 6: /* IRQ ack */ diff --git a/src/mame/drivers/cojag.c b/src/mame/drivers/cojag.c index 0e92c11731c..427c11bb1d5 100644 --- a/src/mame/drivers/cojag.c +++ b/src/mame/drivers/cojag.c @@ -247,8 +247,8 @@ static MACHINE_RESET( cojag ) jaguar_dsp_resume(); /* halt the CPUs */ - jaguargpu_ctrl_w(1, G_CTRL, 0, 0); - jaguardsp_ctrl_w(2, D_CTRL, 0, 0); + jaguargpu_ctrl_w(1, G_CTRL, 0, 0xffffffff); + jaguardsp_ctrl_w(2, D_CTRL, 0, 0xffffffff); /* init the sound system */ cojag_sound_reset(); @@ -297,8 +297,8 @@ static WRITE32_HANDLER( misc_control_w ) jaguar_dsp_resume(); /* halt the CPUs */ - jaguargpu_ctrl_w(1, G_CTRL, 0, 0); - jaguardsp_ctrl_w(2, D_CTRL, 0, 0); + jaguargpu_ctrl_w(1, G_CTRL, 0, 0xffffffff); + jaguardsp_ctrl_w(2, D_CTRL, 0, 0xffffffff); } /* adjust banking */ diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c index 1229a722ea9..946096243e0 100644 --- a/src/mame/drivers/crystal.c +++ b/src/mame/drivers/crystal.c @@ -168,7 +168,7 @@ static READ32_HANDLER(FlipCount_r) static WRITE32_HANDLER(FlipCount_w) { - if((~mem_mask)&0x00ff0000) + if(mem_mask&0x00ff0000) { int fc=(data>>16)&0xff; if(fc==1) @@ -200,14 +200,14 @@ static READ32_HANDLER(Input_r) static WRITE32_HANDLER(IntAck_w) { UINT32 IntPend=program_read_dword_32le(0x01800c0c); - if((~mem_mask)&0xff) + if(mem_mask&0xff) { IntPend&=~(1<<(data&0x1f)); program_write_dword_32le(0x01800c0c,IntPend); if(!IntPend) cpunum_set_input_line(machine, 0,SE3208_INT,CLEAR_LINE); } - if((~mem_mask)&0xff00) + if(mem_mask&0xff00) IntHigh=(data>>8)&7; } diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c index 108f0934bb4..b7f79a81117 100644 --- a/src/mame/drivers/cvs.c +++ b/src/mame/drivers/cvs.c @@ -279,12 +279,12 @@ static READ8_HANDLER( cvs_input_r ) /* the lower 4 (or 3?) bits select the port to read */ switch (offset & 0x0f) /* might be 0x07 */ { - case 0x00: ret = input_port_0_r(machine, 0); break; - case 0x02: ret = input_port_1_r(machine, 0); break; - case 0x03: ret = input_port_2_r(machine, 0); break; - case 0x04: ret = input_port_3_r(machine, 0); break; - case 0x06: ret = input_port_4_r(machine, 0); break; - case 0x07: ret = input_port_5_r(machine, 0); break; + case 0x00: ret = input_port_read_indexed(machine, 0); break; + case 0x02: ret = input_port_read_indexed(machine, 1); break; + case 0x03: ret = input_port_read_indexed(machine, 2); break; + case 0x04: ret = input_port_read_indexed(machine, 3); break; + case 0x06: ret = input_port_read_indexed(machine, 4); break; + case 0x07: ret = input_port_read_indexed(machine, 5); break; default: logerror("%04x : CVS: Reading unmapped input port 0x%02x\n", activecpu_get_pc(), offset & 0x0f); break; } diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c index 60260ccf0e9..5706d7ad3eb 100644 --- a/src/mame/drivers/darius.c +++ b/src/mame/drivers/darius.c @@ -189,19 +189,19 @@ static READ16_HANDLER( darius_ioc_r ) return (taitosound_comm_r(machine,0) & 0xff); /* sound interface read */ case 0x04: - return input_port_0_word_r(machine,0,mem_mask); /* IN0 */ + return input_port_read_indexed(machine,0); /* IN0 */ case 0x05: - return input_port_1_word_r(machine,0,mem_mask); /* IN1 */ + return input_port_read_indexed(machine,1); /* IN1 */ case 0x06: - return input_port_2_word_r(machine,0,mem_mask); /* IN2 */ + return input_port_read_indexed(machine,2); /* IN2 */ case 0x07: return coin_word; /* bits 3&4 coin lockouts, must return zero */ case 0x08: - return input_port_3_word_r(machine,0,mem_mask); /* DSW */ + return input_port_read_indexed(machine,3); /* DSW */ } logerror("CPU #0 PC %06x: warning - read unmapped ioc offset %06x\n",activecpu_get_pc(),offset); diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c index f56e2016ccb..c01761f5354 100644 --- a/src/mame/drivers/darkseal.c +++ b/src/mame/drivers/darkseal.c @@ -38,7 +38,7 @@ static WRITE16_HANDLER( darkseal_control_w ) { switch (offset<<1) { case 6: /* DMA flag */ - buffer_spriteram16_w(machine,0,0,0); + buffer_spriteram16_w(machine,0,0,0xffff); return; case 8: /* Sound CPU write */ soundlatch_w(machine,0,data & 0xff); diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c index 51056c82382..29a8c3bf76e 100644 --- a/src/mame/drivers/dcheese.c +++ b/src/mame/drivers/dcheese.c @@ -207,7 +207,7 @@ static WRITE8_HANDLER( bsmt_data_w ) if (offset % 2 == 0) sound_msb_latch = data; else - BSMT2000_data_0_w(machine, offset/2, (sound_msb_latch << 8) | data, 0); + BSMT2000_data_0_w(machine, offset/2, (sound_msb_latch << 8) | data, 0xffff); } diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c index 854477576cd..b0f5f48bd9a 100644 --- a/src/mame/drivers/deco32.c +++ b/src/mame/drivers/deco32.c @@ -492,7 +492,7 @@ static WRITE32_HANDLER( tattass_control_w ) UINT8 *eeprom=EEPROM_get_data_pointer(0); /* Eprom in low byte */ - if (mem_mask==0xffffff00) { /* Byte write to low byte only (different from word writing including low byte) */ + if (mem_mask==0x000000ff) { /* Byte write to low byte only (different from word writing including low byte) */ /* The Tattoo Assassins eprom seems strange... It's 1024 bytes in size, and 8 bit in width, but offers a 'multiple read' mode where a bit stream can be read @@ -597,13 +597,13 @@ static WRITE32_HANDLER( tattass_control_w ) } /* Volume in high byte */ - if (mem_mask==0xffff00ff) { + if (mem_mask==0x0000ff00) { //TODO: volume attenuation == ((data>>8)&0xff); return; } /* Playfield control - Only written in full word memory accesses */ - deco32_pri_w(machine,0,data&0x3,0); /* Bit 0 - layer priority toggle, Bit 1 - BG2/3 Joint mode (8bpp) */ + deco32_pri_w(machine,0,data&0x3,0xffffffff); /* Bit 0 - layer priority toggle, Bit 1 - BG2/3 Joint mode (8bpp) */ /* Sound board reset control */ if (data&0x80) @@ -641,7 +641,7 @@ static WRITE32_HANDLER( nslasher_eeprom_w ) EEPROM_write_bit(data & 0x10); EEPROM_set_cs_line((data & 0x40) ? CLEAR_LINE : ASSERT_LINE); - deco32_pri_w(machine,0,data&0x3,0); /* Bit 0 - layer priority toggle, Bit 1 - BG2/3 Joint mode (8bpp) */ + deco32_pri_w(machine,0,data&0x3,0xffffffff); /* Bit 0 - layer priority toggle, Bit 1 - BG2/3 Joint mode (8bpp) */ } } @@ -1133,7 +1133,7 @@ static WRITE8_HANDLER(deco32_bsmt0_w) static WRITE8_HANDLER(deco32_bsmt1_w) { - BSMT2000_data_0_w(machine, offset^ 0xff, ((bsmt_latch<<8)|data), 0); + BSMT2000_data_0_w(machine, offset^ 0xff, ((bsmt_latch<<8)|data), 0xffff); cpunum_set_input_line(machine, 1, M6809_IRQ_LINE, HOLD_LINE); /* BSMT is ready */ } diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c index 2b428e6f213..1e46063c7aa 100644 --- a/src/mame/drivers/deco_mlc.c +++ b/src/mame/drivers/deco_mlc.c @@ -143,7 +143,7 @@ static READ32_HANDLER(test3_r) static WRITE32_HANDLER( avengrs_eprom_w ) { - if (mem_mask==0xffff00ff) { + if (ACCESSING_BITS_8_15) { UINT8 ebyte=(data>>8)&0xff; // if (ebyte&0x80) { EEPROM_set_clock_line((ebyte & 0x2) ? ASSERT_LINE : CLEAR_LINE); @@ -151,7 +151,7 @@ static WRITE32_HANDLER( avengrs_eprom_w ) EEPROM_set_cs_line((ebyte & 0x4) ? CLEAR_LINE : ASSERT_LINE); // } } - else if (mem_mask==0xffffff00) { + else if (ACCESSING_BITS_0_7) { //volume control todo } else @@ -167,7 +167,7 @@ static WRITE32_HANDLER( avengrs_palette_w ) static READ32_HANDLER( avengrs_sound_r ) { - if (mem_mask==0x00ffffff) { + if (ACCESSING_BITS_24_31) { return YMZ280B_status_0_r(machine,0)<<24; } else { logerror("%08x: non-byte read from sound mask %08x\n",activecpu_get_pc(),mem_mask); @@ -178,7 +178,7 @@ static READ32_HANDLER( avengrs_sound_r ) static WRITE32_HANDLER( avengrs_sound_w ) { - if (mem_mask==0x00ffffff) { + if (ACCESSING_BITS_24_31) { if (offset) YMZ280B_data_0_w(machine,0,data>>24); else diff --git a/src/mame/drivers/dgpix.c b/src/mame/drivers/dgpix.c index 5c2ab89d382..1bcace93ebb 100644 --- a/src/mame/drivers/dgpix.c +++ b/src/mame/drivers/dgpix.c @@ -142,7 +142,7 @@ static WRITE32_HANDLER( vram_w ) { UINT32 *dest = &vram[offset+(0x40000/4)*vbuffer]; - if (mem_mask == 0) + if (mem_mask == 0xffffffff) { if (~data & 0x80000000) *dest = (*dest & 0x0000ffff) | (data & 0xffff0000); @@ -150,8 +150,8 @@ static WRITE32_HANDLER( vram_w ) if (~data & 0x00008000) *dest = (*dest & 0xffff0000) | (data & 0x0000ffff); } - else if (((mem_mask == 0x0000ffff) && (~data & 0x80000000)) || - ((mem_mask == 0xffff0000) && (~data & 0x00008000))) + else if (((mem_mask == 0xffff0000) && (~data & 0x80000000)) || + ((mem_mask == 0x0000ffff) && (~data & 0x00008000))) COMBINE_DATA(dest); } @@ -182,7 +182,7 @@ static READ32_HANDLER( vblank_r ) { /* burn a bunch of cycles because this is polled frequently during busy loops */ activecpu_adjust_icount(-100); - return input_port_0_dword_r(machine, offset, 0); + return input_port_read_indexed(machine, 0); } static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 32 ) diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c index 9a08d55c364..872c7ab5719 100644 --- a/src/mame/drivers/djmain.c +++ b/src/mame/drivers/djmain.c @@ -212,7 +212,7 @@ static READ32_HANDLER( obj_rom_r ) if (ACCESSING_BITS_0_15) offset += 2; - if (~mem_mask & 0xff00ff00) + if (~mem_mask & 0x00ff00ff) offset++; return mem8[offset] * 0x01010101; @@ -310,24 +310,24 @@ static WRITE32_HANDLER( turntable_select_w ) static READ32_DEVICE_HANDLER( ide_std_r ) { if (ACCESSING_BITS_0_7) - return ide_controller16_r(device, IDE_STD_OFFSET + offset, 0x00ff) >> 8; + return ide_controller16_r(device, IDE_STD_OFFSET + offset, 0xff00) >> 8; else - return ide_controller16_r(device, IDE_STD_OFFSET + offset, 0x0000) << 16; + return ide_controller16_r(device, IDE_STD_OFFSET + offset, 0xffff) << 16; } static WRITE32_DEVICE_HANDLER( ide_std_w ) { if (ACCESSING_BITS_0_7) - ide_controller16_w(device, IDE_STD_OFFSET + offset, data << 8, 0x00ff); + ide_controller16_w(device, IDE_STD_OFFSET + offset, data << 8, 0xff00); else - ide_controller16_w(device, IDE_STD_OFFSET + offset, data >> 16, 0x0000); + ide_controller16_w(device, IDE_STD_OFFSET + offset, data >> 16, 0xffff); } static READ32_DEVICE_HANDLER( ide_alt_r ) { if (offset == 0) - return ide_controller16_r(device, IDE_ALT_OFFSET, 0xff00) << 24; + return ide_controller16_r(device, IDE_ALT_OFFSET, 0x00ff) << 24; return 0; } @@ -335,7 +335,7 @@ static READ32_DEVICE_HANDLER( ide_alt_r ) static WRITE32_DEVICE_HANDLER( ide_alt_w ) { if (offset == 0 && ACCESSING_BITS_16_23) - ide_controller16_w(device, IDE_ALT_OFFSET, data >> 24, 0xff00); + ide_controller16_w(device, IDE_ALT_OFFSET, data >> 24, 0x00ff); } @@ -402,17 +402,17 @@ static WRITE32_HANDLER( light_ctrl_2_w ) static WRITE32_HANDLER( unknown590000_w ) { - //logerror("%08X: unknown 590000 write %08X: %08X & %08X\n", activecpu_get_previouspc(), offset, data, ~mem_mask); + //logerror("%08X: unknown 590000 write %08X: %08X & %08X\n", activecpu_get_previouspc(), offset, data, mem_mask); } static WRITE32_HANDLER( unknown802000_w ) { - //logerror("%08X: unknown 802000 write %08X: %08X & %08X\n", activecpu_get_previouspc(), offset, data, ~mem_mask); + //logerror("%08X: unknown 802000 write %08X: %08X & %08X\n", activecpu_get_previouspc(), offset, data, mem_mask); } static WRITE32_HANDLER( unknownc02000_w ) { - //logerror("%08X: unknown c02000 write %08X: %08X & %08X\n", activecpu_get_previouspc(), offset, data, ~mem_mask); + //logerror("%08X: unknown c02000 write %08X: %08X & %08X\n", activecpu_get_previouspc(), offset, data, mem_mask); } diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c index 5c7705cd293..391ed8a955b 100644 --- a/src/mame/drivers/dominob.c +++ b/src/mame/drivers/dominob.c @@ -124,7 +124,7 @@ static WRITE8_HANDLER( dominob_d008_w ) static READ8_HANDLER( dominob_input_2_r ) { - return input_port_2_r(machine, offset); + return input_port_read_indexed(machine, 2); } diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c index 71f39f362fb..792fdee05d1 100644 --- a/src/mame/drivers/exerion.c +++ b/src/mame/drivers/exerion.c @@ -31,7 +31,7 @@ static UINT8 *exerion_ram; static READ8_HANDLER( exerion_port01_r ) { /* the cocktail flip bit muxes between ports 0 and 1 */ - return exerion_cocktail_flip ? input_port_1_r(machine,offset) : input_port_0_r(machine,offset); + return exerion_cocktail_flip ? input_port_read_indexed(machine, 1) : input_port_read_indexed(machine, 0); } diff --git a/src/mame/drivers/exidy440.c b/src/mame/drivers/exidy440.c index 109e12aa3cf..6605bc1f3b1 100644 --- a/src/mame/drivers/exidy440.c +++ b/src/mame/drivers/exidy440.c @@ -434,7 +434,7 @@ static READ8_HANDLER( claypign_protection_r ) static READ8_HANDLER( topsecex_input_port_5_r ) { - return (input_port_5_r(machine, offset) & 1) ? 0x01 : 0x02; + return (input_port_read_indexed(machine, 5) & 1) ? 0x01 : 0x02; } diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c index d25e90ac46b..5793f19db6e 100644 --- a/src/mame/drivers/exterm.c +++ b/src/mame/drivers/exterm.c @@ -156,8 +156,7 @@ static UINT16 exterm_trackball_port_r(running_machine *machine, int which, UINT1 aimpos[which] = (aimpos[which] + trackball_diff) & 0x3f; /* Combine it with the standard input bits */ - port = which ? input_port_1_word_r(machine, 0, mem_mask) : - input_port_0_word_r(machine, 0, mem_mask); + port = which ? input_port_read_indexed(machine,1) : input_port_read_indexed(machine,0); return (port & 0xc0ff) | (aimpos[which] << 8); } diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c index 8ef8d65fade..20ef690f7ad 100644 --- a/src/mame/drivers/f-32.c +++ b/src/mame/drivers/f-32.c @@ -98,7 +98,7 @@ static READ32_HANDLER( f32_input_port_1_r ) if ((activecpu_get_pc() == 0x000379de) || (activecpu_get_pc() == 0x000379cc) ) activecpu_adjust_icount(-100); //else printf("PC %08x\n", activecpu_get_pc() ); - return input_port_1_dword_r(machine, 0, 0); + return input_port_read_indexed(machine, 1); } diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c index 592aacc828f..75abbca4c16 100644 --- a/src/mame/drivers/fcombat.c +++ b/src/mame/drivers/fcombat.c @@ -146,7 +146,7 @@ static READ8_HANDLER( fcombat_protection_r ) static READ8_HANDLER( fcombat_port01_r ) { /* the cocktail flip bit muxes between ports 0 and 1 */ - return fcombat_cocktail_flip ? input_port_1_r(machine,offset) : input_port_0_r(machine,offset); + return fcombat_cocktail_flip ? input_port_read_indexed(machine, 1) : input_port_read_indexed(machine, 0); } diff --git a/src/mame/drivers/findout.c b/src/mame/drivers/findout.c index 21caeeac470..4f24072d539 100644 --- a/src/mame/drivers/findout.c +++ b/src/mame/drivers/findout.c @@ -66,7 +66,7 @@ static READ8_HANDLER( portC_r ) static READ8_HANDLER( port1_r ) { - return input_port_1_r(machine, 0) | (ticket_dispenser_0_r(machine, 0) >> 5); + return input_port_read_indexed(machine, 1) | (ticket_dispenser_0_r(machine, 0) >> 5); } static WRITE8_HANDLER( lamps_w ) diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c index b7c13cf4216..9e55abea4fc 100644 --- a/src/mame/drivers/firebeat.c +++ b/src/mame/drivers/firebeat.c @@ -1159,7 +1159,7 @@ static READ32_HANDLER( atapi_command_r ) { UINT16 r; // printf("atapi_command_r: %08X, %08X\n", offset, mem_mask); - if (mem_mask == 0x0000ffff) + if (ACCESSING_BITS_16_31) { r = atapi_command_reg_r(offset*2); return ATAPI_ENDIAN(r) << 16; @@ -1175,7 +1175,7 @@ static WRITE32_HANDLER( atapi_command_w ) { // printf("atapi_command_w: %08X, %08X, %08X\n", data, offset, mem_mask); - if (mem_mask == 0x0000ffff) + if (ACCESSING_BITS_16_31) { atapi_command_reg_w(offset*2, ATAPI_ENDIAN((data >> 16) & 0xffff)); } @@ -1191,7 +1191,7 @@ static READ32_HANDLER( atapi_control_r ) UINT16 r; // printf("atapi_control_r: %08X, %08X\n", offset, mem_mask); - if (mem_mask == 0x0000ffff) + if (ACCESSING_BITS_16_31) { r = atapi_control_reg_r(offset*2); return ATAPI_ENDIAN(r) << 16; @@ -1205,7 +1205,7 @@ static READ32_HANDLER( atapi_control_r ) static WRITE32_HANDLER( atapi_control_w ) { - if (mem_mask == 0x0000ffff) + if (ACCESSING_BITS_16_31) { atapi_control_reg_w(offset*2, ATAPI_ENDIAN(data >> 16) & 0xff); } diff --git a/src/mame/drivers/foodf.c b/src/mame/drivers/foodf.c index 4fc217a4006..6fa54eb0230 100644 --- a/src/mame/drivers/foodf.c +++ b/src/mame/drivers/foodf.c @@ -180,9 +180,9 @@ static WRITE16_HANDLER( digital_w ) /* bit 1 = UPDATE */ if (!(data & 0x04)) - atarigen_scanline_int_ack_w(machine,0,0,0); + atarigen_scanline_int_ack_w(machine,0,0,0xffff); if (!(data & 0x08)) - atarigen_video_int_ack_w(machine,0,0,0); + atarigen_video_int_ack_w(machine,0,0,0xffff); output_set_led_value(0, (data >> 4) & 1); output_set_led_value(1, (data >> 5) & 1); diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c index e968ee13c47..105041fcb92 100644 --- a/src/mame/drivers/funkybee.c +++ b/src/mame/drivers/funkybee.c @@ -94,7 +94,7 @@ extern VIDEO_UPDATE( funkybee ); static READ8_HANDLER( funkybee_input_port_0_r ) { watchdog_reset_r(machine,0); - return input_port_0_r(machine,offset); + return input_port_read_indexed(machine,0); } static WRITE8_HANDLER( funkybee_coin_counter_w ) diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c index 7a29d9f0744..65a801a10c3 100644 --- a/src/mame/drivers/gaelco3d.c +++ b/src/mame/drivers/gaelco3d.c @@ -309,7 +309,7 @@ static TIMER_CALLBACK( delayed_sound_w ) static WRITE16_HANDLER( sound_data_w ) { - logerror("%06X:sound_data_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask); + logerror("%06X:sound_data_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, mem_mask); if (ACCESSING_BITS_0_7) timer_call_after_resynch(NULL, data & 0xff, delayed_sound_w); } @@ -367,7 +367,7 @@ static WRITE16_HANDLER( analog_port_clock_w ) } } else - logerror("%06X:analog_port_clock_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask); + logerror("%06X:analog_port_clock_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, mem_mask); } @@ -385,7 +385,7 @@ static WRITE16_HANDLER( analog_port_latch_w ) } } else - logerror("%06X:analog_port_latch_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask); + logerror("%06X:analog_port_latch_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, mem_mask); } @@ -427,7 +427,7 @@ static WRITE16_HANDLER( tms_reset_w ) { /* this is set to 0 while data is uploaded, then set to $ffff after it is done */ /* it does not ever appear to be touched after that */ - logerror("%06X:tms_reset_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask); + logerror("%06X:tms_reset_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, mem_mask); cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data == 0xffff) ? CLEAR_LINE : ASSERT_LINE); } @@ -436,7 +436,7 @@ static WRITE16_HANDLER( tms_irq_w ) { /* this is written twice, 0,1, in quick succession */ /* done after uploading, and after modifying the comm area */ - logerror("%06X:tms_irq_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask); + logerror("%06X:tms_irq_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, mem_mask); if (ACCESSING_BITS_0_7) cpunum_set_input_line(machine, 1, 0, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE); } @@ -444,14 +444,14 @@ static WRITE16_HANDLER( tms_irq_w ) static WRITE16_HANDLER( tms_control3_w ) { - logerror("%06X:tms_control3_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask); + logerror("%06X:tms_control3_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, mem_mask); } static WRITE16_HANDLER( tms_comm_w ) { COMBINE_DATA(&tms_comm_base[offset ^ tms_offset_xor]); - logerror("%06X:tms_comm_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset*2, data, ~mem_mask); + logerror("%06X:tms_comm_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset*2, data, mem_mask); } @@ -650,7 +650,7 @@ static WRITE32_HANDLER( unknown_107_w ) if (ACCESSING_BITS_0_7) logerror("%06X:unknown_107_w = %02X\n", activecpu_get_pc(), data & 0xff); else - logerror("%06X:unknown_107_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask); + logerror("%06X:unknown_107_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, mem_mask); } static WRITE32_HANDLER( unknown_127_w ) @@ -659,7 +659,7 @@ static WRITE32_HANDLER( unknown_127_w ) if (ACCESSING_BITS_0_7) logerror("%06X:unknown_127_w = %02X\n", activecpu_get_pc(), data & 0xff); else - logerror("%06X:unknown_127_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask); + logerror("%06X:unknown_127_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, mem_mask); } static WRITE32_HANDLER( unknown_137_w ) @@ -668,7 +668,7 @@ static WRITE32_HANDLER( unknown_137_w ) if (ACCESSING_BITS_0_7) logerror("%06X:unknown_137_w = %02X\n", activecpu_get_pc(), data & 0xff); else - logerror("%06X:unknown_137_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask); + logerror("%06X:unknown_137_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, mem_mask); } static WRITE32_HANDLER( unknown_13a_w ) @@ -677,7 +677,7 @@ static WRITE32_HANDLER( unknown_13a_w ) if (ACCESSING_BITS_0_15) logerror("%06X:unknown_13a_w = %04X\n", activecpu_get_pc(), data & 0xffff); else - logerror("%06X:unknown_13a_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask); + logerror("%06X:unknown_13a_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, mem_mask); } diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c index 8d757db535b..a4be04724f6 100644 --- a/src/mame/drivers/gcpinbal.c +++ b/src/mame/drivers/gcpinbal.c @@ -81,13 +81,13 @@ static READ16_HANDLER( ioc_r ) switch (offset) { case 0x80/2: - return input_port_0_word_r(machine,0,mem_mask); /* DSW */ + return input_port_read_indexed(machine,0); /* DSW */ case 0x84/2: - return input_port_1_word_r(machine,0,mem_mask); /* IN0 */ + return input_port_read_indexed(machine,1); /* IN0 */ case 0x86/2: - return input_port_2_word_r(machine,0,mem_mask); /* IN1 */ + return input_port_read_indexed(machine,2); /* IN1 */ case 0x50: case 0x51: diff --git a/src/mame/drivers/genesis.c b/src/mame/drivers/genesis.c index 3dadf7db5b7..5523398ced7 100644 --- a/src/mame/drivers/genesis.c +++ b/src/mame/drivers/genesis.c @@ -204,7 +204,7 @@ READ16_HANDLER(genesis_ctrl_r) /* from MESS */ WRITE16_HANDLER(genesis_ctrl_w) { - data &= ~mem_mask; + data &= mem_mask; /* logerror("genesis_ctrl_w %x, %x\n", offset, data); */ diff --git a/src/mame/drivers/getrivia.c b/src/mame/drivers/getrivia.c index c3dc8a55ef3..bcf1212bdcc 100644 --- a/src/mame/drivers/getrivia.c +++ b/src/mame/drivers/getrivia.c @@ -121,7 +121,7 @@ static WRITE8_HANDLER( getrivia_bitmap_w ) static READ8_HANDLER( port1_r ) { - return input_port_1_r(machine, 0) | (ticket_dispenser_0_r(machine, 0) >> 5); + return input_port_read_indexed(machine, 1) | (ticket_dispenser_0_r(machine, 0) >> 5); } static WRITE8_HANDLER( lamps_w ) diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c index e46b4fb1c2a..0e2cca11201 100644 --- a/src/mame/drivers/gijoe.c +++ b/src/mame/drivers/gijoe.c @@ -97,7 +97,7 @@ static READ16_HANDLER( control1_r ) /* bit 8 is EEPROM data */ /* bit 9 is EEPROM ready */ /* bit 11 is service button */ - res = (EEPROM_read_bit()<<8) | input_port_0_word_r(machine,0,0); + res = (EEPROM_read_bit()<<8) | input_port_read_indexed(machine,0); if (init_eeprom_count) { diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c index fb69d84cb85..6b7603de818 100644 --- a/src/mame/drivers/gottlieb.c +++ b/src/mame/drivers/gottlieb.c @@ -197,19 +197,19 @@ static int track[2]; static READ8_HANDLER( gottlieb_track_0_r ) { - return input_port_2_r(machine, offset) - track[0]; + return input_port_read_indexed(machine, 2) - track[0]; } static READ8_HANDLER( gottlieb_track_1_r ) { - return input_port_3_r(machine, offset) - track[1]; + return input_port_read_indexed(machine, 3) - track[1]; } static WRITE8_HANDLER( gottlieb_track_reset_w ) { /* reset the trackball counters */ - track[0] = input_port_2_r(machine, offset); - track[1] = input_port_3_r(machine, offset); + track[0] = input_port_read_indexed(machine, 2); + track[1] = input_port_read_indexed(machine, 3); } static int joympx; diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c index 1a46d856165..6adca623886 100644 --- a/src/mame/drivers/groundfx.c +++ b/src/mame/drivers/groundfx.c @@ -164,13 +164,13 @@ static READ32_HANDLER( groundfx_input_r ) { case 0x00: { - return (input_port_0_word_r(machine,0,0) << 16) | input_port_1_word_r(machine,0,0) | + return (input_port_read_indexed(machine,0) << 16) | input_port_read_indexed(machine,1) | (EEPROM_read_bit() << 7) | frame_counter; } case 0x01: { - return input_port_2_word_r(machine,0,0) | (coin_word << 16); + return input_port_read_indexed(machine,2) | (coin_word << 16); } } @@ -215,7 +215,7 @@ static WRITE32_HANDLER( groundfx_input_w ) static READ32_HANDLER( groundfx_adc_r ) { - return (input_port_3_word_r(machine,0,0) << 8) | input_port_4_word_r(machine,0,0); + return (input_port_read_indexed(machine,3) << 8) | input_port_read_indexed(machine,4); } static WRITE32_HANDLER( groundfx_adc_w ) diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c index cbc722c1263..9c4df96449b 100644 --- a/src/mame/drivers/gunbustr.c +++ b/src/mame/drivers/gunbustr.c @@ -92,13 +92,13 @@ static READ32_HANDLER( gunbustr_input_r ) { case 0x00: { - return (input_port_0_word_r(machine,0,0) << 16) | input_port_1_word_r(machine,0,0) | + return (input_port_read_indexed(machine,0) << 16) | input_port_read_indexed(machine,1) | (EEPROM_read_bit() << 7); } case 0x01: { - return input_port_2_word_r(machine,0,0) | (coin_word << 16); + return input_port_read_indexed(machine,2) | (coin_word << 16); } } logerror("CPU #0 PC %06x: read input %06x\n",activecpu_get_pc(),offset); @@ -175,8 +175,8 @@ static WRITE32_HANDLER( motor_control_w ) static READ32_HANDLER( gunbustr_gun_r ) { - return ( input_port_3_word_r(machine,0,0) << 24) | (input_port_4_word_r(machine,0,0) << 16) | - ( input_port_5_word_r(machine,0,0) << 8) | input_port_6_word_r(machine,0,0); + return ( input_port_read_indexed(machine,3) << 24) | (input_port_read_indexed(machine,4) << 16) | + ( input_port_read_indexed(machine,5) << 8) | input_port_read_indexed(machine,6); } static WRITE32_HANDLER( gunbustr_gun_w ) diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c index 72c6c0909ad..b4d6d8c491a 100644 --- a/src/mame/drivers/hng64.c +++ b/src/mame/drivers/hng64.c @@ -571,14 +571,14 @@ static READ32_HANDLER( hng64_random_read ) static READ32_HANDLER( hng64_com_r ) { - logerror("com read (PC=%08x): %08x %08x = %08x\n", activecpu_get_pc(), (offset*4)+0xc0000000, ~mem_mask, hng64_com_ram[offset]); + logerror("com read (PC=%08x): %08x %08x = %08x\n", activecpu_get_pc(), (offset*4)+0xc0000000, mem_mask, hng64_com_ram[offset]); return hng64_com_ram[offset] ; } static WRITE32_HANDLER( hng64_com_w ) { - logerror("com write (PC=%08x): %08x %08x = %08x\n", activecpu_get_pc(), (offset*4)+0xc0000000, ~mem_mask, data); + logerror("com write (PC=%08x): %08x %08x = %08x\n", activecpu_get_pc(), (offset*4)+0xc0000000, mem_mask, data); COMBINE_DATA(&hng64_com_ram[offset]); } @@ -588,7 +588,7 @@ static UINT32 hng64_com_shared_b; static WRITE32_HANDLER( hng64_com_share_w ) { - logerror("commw (PC=%08x): %08x %08x %08x\n", activecpu_get_pc(), data, (offset*4)+0xc0001000, ~mem_mask); + logerror("commw (PC=%08x): %08x %08x %08x\n", activecpu_get_pc(), data, (offset*4)+0xc0001000, mem_mask); if (offset==0x0) COMBINE_DATA(&hng64_com_shared_a); if (offset==0x1) COMBINE_DATA(&hng64_com_shared_b); @@ -596,7 +596,7 @@ static WRITE32_HANDLER( hng64_com_share_w ) static READ32_HANDLER( hng64_com_share_r ) { - logerror("commr (PC=%08x): %08x %08x\n", activecpu_get_pc(), (offset*4)+0xc0001000, ~mem_mask); + logerror("commr (PC=%08x): %08x %08x\n", activecpu_get_pc(), (offset*4)+0xc0001000, mem_mask); // if(offset==0x0) return hng64_com_shared_a; // if(offset==0x1) return hng64_com_shared_b; @@ -709,7 +709,7 @@ static READ32_HANDLER( hng64_sram_r ) static WRITE32_HANDLER( hng64_sram_w ) { - logerror("HNG64 writing to SRAM 0x%08x == 0x%08x & 0x%08x. (PC=%08x)\n", offset*4, data, ~mem_mask, activecpu_get_pc()); + logerror("HNG64 writing to SRAM 0x%08x == 0x%08x & 0x%08x. (PC=%08x)\n", offset*4, data, mem_mask, activecpu_get_pc()); COMBINE_DATA (&hng64_sram[offset]); } diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c index cbd193f7aef..e847b7bd214 100644 --- a/src/mame/drivers/itech32.c +++ b/src/mame/drivers/itech32.c @@ -757,31 +757,6 @@ static READ32_HANDLER( drivedge_tms2_speedup_r ) * *************************************/ -static READ32_HANDLER( input_port_0_msw_r ) -{ - return input_port_0_word_r(machine,offset,0) << 16; -} - -static READ32_HANDLER( input_port_1_msw_r ) -{ - return input_port_1_word_r(machine,offset,0) << 16; -} - -static READ32_HANDLER( input_port_2_msw_r ) -{ - return input_port_2_word_r(machine,offset,0) << 16; -} - -static READ32_HANDLER( input_port_3_msw_r ) -{ - return input_port_3_word_r(machine,offset,0) << 16; -} - -static READ32_HANDLER( input_port_4_msw_r ) -{ - return special_port4_r(machine,offset,0) << 16; -} - static WRITE32_HANDLER( int1_ack32_w ) { int1_ack_w(machine, offset, data, mem_mask); @@ -931,14 +906,14 @@ AM_RANGE(0x000100, 0x0003ff) AM_MIRROR(0x40000) AM_READWRITE(test1_r, test1_w) AM_RANGE(0x000c00, 0x007fff) AM_MIRROR(0x40000) AM_READWRITE(test2_r, test2_w) #endif AM_RANGE(0x000000, 0x03ffff) AM_MIRROR(0x40000) AM_RAM AM_BASE((UINT32 **)&main_ram) AM_SIZE(&main_ram_size) - AM_RANGE(0x080000, 0x080003) AM_READ(input_port_3_msw_r) - AM_RANGE(0x082000, 0x082003) AM_READ(input_port_4_msw_r) + AM_RANGE(0x080000, 0x080003) AM_READ16(input_port_3_word_r, 0xffff0000) + AM_RANGE(0x082000, 0x082003) AM_READ16(special_port4_r, 0xffff0000) AM_RANGE(0x084000, 0x084003) AM_READWRITE(sound_data32_r, sound_data32_w) // AM_RANGE(0x086000, 0x08623f) AM_RAM -- networking -- first 0x40 bytes = our data, next 0x40*8 bytes = their data, r/w on IRQ2 AM_RANGE(0x088000, 0x088003) AM_READ(drivedge_steering_r) AM_RANGE(0x08a000, 0x08a003) AM_READWRITE(drivedge_gas_r, SMH_NOP) - AM_RANGE(0x08c000, 0x08c003) AM_READWRITE(input_port_0_msw_r, SMH_NOP) - AM_RANGE(0x08e000, 0x08e003) AM_READWRITE(input_port_1_msw_r, SMH_NOP) + AM_RANGE(0x08c000, 0x08c003) AM_READWRITE16(input_port_0_word_r, SMH_NOP, 0xffff0000) + AM_RANGE(0x08e000, 0x08e003) AM_READWRITE16(input_port_1_word_r, SMH_NOP, 0xffff0000) AM_RANGE(0x100000, 0x10000f) AM_WRITE(drivedge_zbuf_control_w) AM_BASE(&drivedge_zbuf_control) AM_RANGE(0x180000, 0x180003) AM_WRITE(drivedge_color0_w) AM_RANGE(0x1a0000, 0x1bffff) AM_RAM_WRITE(drivedge_paletteram_w) AM_BASE(&paletteram32) @@ -946,7 +921,7 @@ AM_RANGE(0x000c00, 0x007fff) AM_MIRROR(0x40000) AM_READWRITE(test2_r, test2_w) AM_RANGE(0x1e0000, 0x1e0113) AM_READWRITE(itech020_video_r, itech020_video_w) AM_BASE((UINT32 **)&itech32_video) AM_RANGE(0x1e4000, 0x1e4003) AM_WRITE(tms_reset_assert_w) AM_RANGE(0x1ec000, 0x1ec003) AM_WRITE(tms_reset_clear_w) - AM_RANGE(0x200000, 0x200003) AM_READ(input_port_2_msw_r) + AM_RANGE(0x200000, 0x200003) AM_READ16(input_port_2_word_r, 0xffff0000) AM_RANGE(0x280000, 0x280fff) AM_RAM_WRITE(tms1_68k_ram_w) AM_SHARE(1) AM_RANGE(0x300000, 0x300fff) AM_RAM_WRITE(tms2_68k_ram_w) AM_SHARE(2) AM_RANGE(0x380000, 0x380003) AM_WRITENOP // AM_WRITE(watchdog_reset16_w) @@ -968,11 +943,11 @@ ADDRESS_MAP_END /*------ 68EC020-based memory layout ------*/ static ADDRESS_MAP_START( itech020_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000000, 0x007fff) AM_RAM AM_BASE((UINT32 **)&main_ram) AM_SIZE(&main_ram_size) - AM_RANGE(0x080000, 0x080003) AM_READWRITE(input_port_0_msw_r, int1_ack32_w) - AM_RANGE(0x100000, 0x100003) AM_READ(input_port_1_msw_r) - AM_RANGE(0x180000, 0x180003) AM_READ(input_port_2_msw_r) - AM_RANGE(0x200000, 0x200003) AM_READ(input_port_3_msw_r) - AM_RANGE(0x280000, 0x280003) AM_READ(input_port_4_msw_r) + AM_RANGE(0x080000, 0x080003) AM_READ16(input_port_0_word_r, 0xffff0000) AM_WRITE(int1_ack32_w) + AM_RANGE(0x100000, 0x100003) AM_READ16(input_port_1_word_r, 0xffff0000) + AM_RANGE(0x180000, 0x180003) AM_READ16(input_port_2_word_r, 0xffff0000) + AM_RANGE(0x200000, 0x200003) AM_READ16(input_port_3_word_r, 0xffff0000) + AM_RANGE(0x280000, 0x280003) AM_READ16(special_port4_r, 0xffff0000) AM_RANGE(0x300000, 0x300003) AM_WRITE(itech020_color1_w) AM_RANGE(0x380000, 0x380003) AM_WRITE(itech020_color2_w) AM_RANGE(0x400000, 0x400003) AM_WRITE(watchdog_reset32_w) diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c index 440546c9a5b..5887a483343 100644 --- a/src/mame/drivers/jalmah.c +++ b/src/mame/drivers/jalmah.c @@ -202,14 +202,14 @@ static void daireika_mcu_run(running_machine *machine) { static UINT16 prg_prot; - if((0xffff - input_port_0_word_r(machine,0,0)) & 0x0008)//service_mode + if((0xffff - input_port_read_indexed(machine,0)) & 0x0008)//service_mode { - jm_regs[0x000/2] = input_port_2_word_r(machine,0,0); - jm_regs[0x002/2] = input_port_3_word_r(machine,0,0); - jm_regs[0x004/2] = input_port_4_word_r(machine,0,0); - jm_regs[0x006/2] = input_port_5_word_r(machine,0,0); - jm_regs[0x008/2] = input_port_6_word_r(machine,0,0); - jm_regs[0x00a/2] = input_port_7_word_r(machine,0,0); + jm_regs[0x000/2] = input_port_read_indexed(machine,2); + jm_regs[0x002/2] = input_port_read_indexed(machine,3); + jm_regs[0x004/2] = input_port_read_indexed(machine,4); + jm_regs[0x006/2] = input_port_read_indexed(machine,5); + jm_regs[0x008/2] = input_port_read_indexed(machine,6); + jm_regs[0x00a/2] = input_port_read_indexed(machine,7); } else { @@ -247,14 +247,14 @@ static void urashima_mcu_run(running_machine *machine) { static UINT16 prg_prot; - if((0xffff - input_port_0_word_r(machine,0,0)) & 0x0008)//service_mode + if((0xffff - input_port_read_indexed(machine,0)) & 0x0008)//service_mode { - jm_regs[0x300/2] = input_port_2_word_r(machine,0,0); - jm_regs[0x302/2] = input_port_3_word_r(machine,0,0); - jm_regs[0x304/2] = input_port_4_word_r(machine,0,0); - jm_regs[0x306/2] = input_port_5_word_r(machine,0,0); - jm_regs[0x308/2] = input_port_6_word_r(machine,0,0); - jm_regs[0x30a/2] = input_port_7_word_r(machine,0,0); + jm_regs[0x300/2] = input_port_read_indexed(machine,2); + jm_regs[0x302/2] = input_port_read_indexed(machine,3); + jm_regs[0x304/2] = input_port_read_indexed(machine,4); + jm_regs[0x306/2] = input_port_read_indexed(machine,5); + jm_regs[0x308/2] = input_port_read_indexed(machine,6); + jm_regs[0x30a/2] = input_port_read_indexed(machine,7); } else { @@ -289,11 +289,11 @@ static void urashima_mcu_run(running_machine *machine) static void second_mcu_run(running_machine *machine) { - if((0xffff - input_port_1_word_r(machine,0,0)) & 0x0004)//service_mode + if((0xffff - input_port_read_indexed(machine,1)) & 0x0004)//service_mode { - jm_regs[0x200/2] = input_port_2_word_r(machine,0,0); - jm_regs[0x202/2] = input_port_3_word_r(machine,0,0); - jm_regs[0x204/2] = input_port_4_word_r(machine,0,0); + jm_regs[0x200/2] = input_port_read_indexed(machine,2); + jm_regs[0x202/2] = input_port_read_indexed(machine,3); + jm_regs[0x204/2] = input_port_read_indexed(machine,4); } else { diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c index ec70c43e4e3..9fd778ad615 100644 --- a/src/mame/drivers/karnov.c +++ b/src/mame/drivers/karnov.c @@ -288,7 +288,7 @@ static WRITE16_HANDLER( karnov_control_w ) break; case 4: /* DM (DMA to buffer spriteram) */ - buffer_spriteram16_w(machine,0,0,0); + buffer_spriteram16_w(machine,0,0,0xffff); break; case 6: /* SECREQ (Interrupt & Data to i8751) */ diff --git a/src/mame/drivers/kinst.c b/src/mame/drivers/kinst.c index 06c800e71a0..a85743baa4f 100644 --- a/src/mame/drivers/kinst.c +++ b/src/mame/drivers/kinst.c @@ -311,13 +311,13 @@ static WRITE32_DEVICE_HANDLER( kinst_ide_w ) static READ32_DEVICE_HANDLER( kinst_ide_extra_r ) { - return ide_controller32_r(device, 0x3f6/4, 0xff00ffff) >> 16; + return ide_controller32_r(device, 0x3f6/4, 0x00ff0000) >> 16; } static WRITE32_DEVICE_HANDLER( kinst_ide_extra_w ) { - ide_controller32_w(device, 0x3f6/4, data << 16, 0xff00ffff); + ide_controller32_w(device, 0x3f6/4, data << 16, 0x00ff0000); } diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c index 55b576b8eaf..7177b7f6eb2 100644 --- a/src/mame/drivers/koikoi.c +++ b/src/mame/drivers/koikoi.c @@ -73,7 +73,7 @@ static READ8_HANDLER(input_r) if(inputcnt<0){ return 0; } if(!inputcnt) { - int key=input_port_2_word_r(machine,0,0); + int key=input_port_read_indexed(machine,2); int keyval=0; //we must return 0 (0x2 in 2nd read) to clear 4 bit at $6600 and allow next read if(key) diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c index 13511d99e70..e6e6266d319 100644 --- a/src/mame/drivers/konamigv.c +++ b/src/mame/drivers/konamigv.c @@ -456,7 +456,7 @@ static READ32_HANDLER( flash_r ) int reg = offset*2; int shift = 0; - if (mem_mask == 0x0000ffff) + if (mem_mask == 0xffff0000) { reg++; shift = 16; @@ -486,7 +486,7 @@ static WRITE32_HANDLER( flash_w ) int reg = offset*2; int chip; - if (mem_mask == 0x0000ffff) + if (mem_mask == 0xffff0000) { reg++; data>>= 16; @@ -517,7 +517,7 @@ static WRITE32_HANDLER( flash_w ) static READ32_HANDLER( trackball_r ) { - if( offset == 0 && mem_mask == 0xffff0000 ) + if( offset == 0 && mem_mask == 0x0000ffff ) { int axis; UINT16 diff; @@ -573,11 +573,11 @@ INPUT_PORTS_END static READ32_HANDLER( btcflash_r ) { - if (mem_mask == 0xffff0000) + if (mem_mask == 0x0000ffff) { return intelflash_read(0, offset*2); } - else if (mem_mask == 0x0000ffff) + else if (mem_mask == 0xffff0000) { return intelflash_read(0, (offset*2)+1)<<16; } @@ -587,11 +587,11 @@ static READ32_HANDLER( btcflash_r ) static WRITE32_HANDLER( btcflash_w ) { - if (mem_mask == 0xffff0000) + if (mem_mask == 0x0000ffff) { intelflash_write(0, offset*2, data&0xffff); } - else if (mem_mask == 0x0000ffff) + else if (mem_mask == 0xffff0000) { intelflash_write(0, (offset*2)+1, (data>>16)&0xffff); } @@ -601,7 +601,7 @@ static READ32_HANDLER( btc_trackball_r ) { // mame_printf_debug( "r %08x %08x %08x\n", activecpu_get_pc(), offset, mem_mask ); - if( offset == 1 && mem_mask == 0x0000ffff ) + if( offset == 1 && mem_mask == 0xffff0000 ) { int axis; UINT16 diff; @@ -674,7 +674,7 @@ static READ32_HANDLER( tokimeki_serial_r ) static WRITE32_HANDLER( tokimeki_serial_w ) { /* - serial EEPROM-like device here: when mem_mask == 0xffffff00 only, + serial EEPROM-like device here: when mem_mask == 0x000000ff only, 0x40 = chip enable 0x20 = clock diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c index 24842b448a5..87fa62f7e50 100644 --- a/src/mame/drivers/konamigx.c +++ b/src/mame/drivers/konamigx.c @@ -594,7 +594,6 @@ static struct { UINT32 offs, pc, mask, data; } waitskip; static READ32_HANDLER(waitskip_r) { UINT32 data = gx_workram[waitskip.offs+offset]; - mem_mask = ~mem_mask; if (activecpu_get_pc() == waitskip.pc && (data & mem_mask) == (waitskip.data & mem_mask)) { diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c index fc4a9a7f593..4c34482b950 100644 --- a/src/mame/drivers/ksys573.c +++ b/src/mame/drivers/ksys573.c @@ -527,7 +527,7 @@ static READ32_HANDLER( atapi_r ) { int reg, data; - if (mem_mask == 0xffff0000) // word-wide command read + if (mem_mask == 0x0000ffff) // word-wide command read { // mame_printf_debug("ATAPI: packet read = %04x\n", atapi_data[atapi_data_ptr]); @@ -599,7 +599,7 @@ static READ32_HANDLER( atapi_r ) int shift; reg = offset<<1; shift = 0; - if (mem_mask == 0xff00ffff) + if (mem_mask == 0x00ff0000) { reg += 1; shift = 16; @@ -650,7 +650,7 @@ static WRITE32_HANDLER( atapi_w ) verboselog( 2, "atapi_w( %08x, %08x, %08x )\n", offset, mem_mask, data ); - if (mem_mask == 0xffff0000) // word-wide command write + if (mem_mask == 0x0000ffff) // word-wide command write { verboselog( 2, "atapi_w: data=%04x\n", data ); @@ -756,7 +756,7 @@ static WRITE32_HANDLER( atapi_w ) else { reg = offset<<1; - if (mem_mask == 0xff00ffff) + if (mem_mask == 0x00ff0000) { reg += 1; data >>= 16; diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c index 320bad86b9d..8271bc50639 100644 --- a/src/mame/drivers/macrossp.c +++ b/src/mame/drivers/macrossp.c @@ -278,7 +278,7 @@ static WRITE32_HANDLER( macrossp_soundcmd_w ) if (ACCESSING_BITS_16_31) { //logerror("%08x write soundcmd %08x (%08x)\n",activecpu_get_pc(),data,mem_mask); - soundlatch_word_w(machine,0,data >> 16,0); + soundlatch_word_w(machine,0,data >> 16,0xffff); sndpending = 1; cpunum_set_input_line(Machine, 1,2,HOLD_LINE); /* spin for a while to let the sound CPU read the command */ diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c index 344d75faea5..9d309cfc490 100644 --- a/src/mame/drivers/mainsnk.c +++ b/src/mame/drivers/mainsnk.c @@ -117,7 +117,7 @@ static READ8_HANDLER( sound_ack_r ) static READ8_HANDLER( mainsnk_port_0_r ) { - int result = input_port_0_r( machine, 0 ); + int result = input_port_read_indexed( machine, 0 ); if( !sound_cpu_ready ) result |= 0x20; return result; } diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c index 0a323b89790..3443e819e07 100644 --- a/src/mame/drivers/mcr68.c +++ b/src/mame/drivers/mcr68.c @@ -92,7 +92,7 @@ static READ16_HANDLER( zwackery_6840_r ) /* make this happen, we must assume that reads from the */ /* 6840 take 14 additional cycles */ activecpu_adjust_icount(-14); - return mcr68_6840_upper_r(machine,offset,0); + return mcr68_6840_upper_r(machine,offset,0xffff); } diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c index db0b51aa75f..ed413fb8a92 100644 --- a/src/mame/drivers/megasys1.c +++ b/src/mame/drivers/megasys1.c @@ -274,11 +274,11 @@ static READ16_HANDLER( ip_select_r ) switch (i) { - case 0 : return coins_r(machine,0,0); break; - case 1 : return player1_r(machine,0,0); break; - case 2 : return player2_r(machine,0,0); break; - case 3 : return dsw1_r(machine,0,0); break; - case 4 : return dsw2_r(machine,0,0); break; + case 0 : return coins_r(machine,0,0xffff); break; + case 1 : return player1_r(machine,0,0xffff); break; + case 2 : return player2_r(machine,0,0xffff); break; + case 3 : return dsw1_r(machine,0,0xffff); break; + case 4 : return dsw2_r(machine,0,0xffff); break; default : return 0x0006; } } @@ -2931,8 +2931,8 @@ static READ16_HANDLER( protection_peekaboo_r ) switch (protection_val) { case 0x02: return 0x03; - case 0x51: return player1_r(machine,0,0); - case 0x52: return player2_r(machine,0,0); + case 0x51: return player1_r(machine,0,0xffff); + case 0x52: return player2_r(machine,0,0xffff); default: return protection_val; } } diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index d78d7c77fb2..f7bc570e853 100644 --- a/src/mame/drivers/metro.c +++ b/src/mame/drivers/metro.c @@ -157,7 +157,7 @@ static void update_irq_state(void) { /* Get the pending IRQs (only the enabled ones, e.g. where irq_enable is *0*) */ - UINT16 irq = metro_irq_cause_r(Machine,0,0) & ~*metro_irq_enable; + UINT16 irq = metro_irq_cause_r(Machine,0,0xffff) & ~*metro_irq_enable; if (irq_line == -1) /* mouja, gakusai, gakusai2, dokyusei, dokyusp */ { @@ -2151,12 +2151,12 @@ ADDRESS_MAP_END static READ8_HANDLER( puzzlet_port7_r ) { - return input_port_2_word_r(machine,0,0); + return input_port_read_indexed(machine,2); } static READ8_HANDLER( puzzlet_serB_r ) { - return input_port_0_word_r(machine,0,0); // coin + return input_port_read_indexed(machine,0); // coin } static WRITE8_HANDLER( puzzlet_portb_w ) diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c index bc360a607f1..d7f4b20ee85 100644 --- a/src/mame/drivers/model2.c +++ b/src/mame/drivers/model2.c @@ -924,7 +924,7 @@ static void snd_latch_to_68k_w(int data) static READ32_HANDLER( model2_serial_r ) { - if ((offset == 0) && (mem_mask == 0x0000ffff)) + if ((offset == 0) && (mem_mask == 0xffff0000)) { return 0x00070000; // TxRdy RxRdy (zeroguna also needs bit 4 set) } @@ -934,7 +934,7 @@ static READ32_HANDLER( model2_serial_r ) static WRITE32_HANDLER( model2o_serial_w ) { - if (mem_mask == 0xffff0000) + if (mem_mask == 0x0000ffff) { snd_latch_to_68k_w(data&0xff); } @@ -1007,7 +1007,7 @@ static READ32_HANDLER( model2_prot_r ) static WRITE32_HANDLER( model2_prot_w ) { - if (mem_mask == 0xffff) + if (mem_mask == 0xffff0000) { data >>= 16; } @@ -1085,7 +1085,7 @@ static READ32_HANDLER( maxx_r ) if (offset <= 0x1f/4) { // special - if (mem_mask == 0x0000ffff) + if (mem_mask == 0xffff0000) { // 16-bit protection reads model2_maxxstate++; @@ -1106,7 +1106,7 @@ static READ32_HANDLER( maxx_r ) } } } - else if (mem_mask == 0) + else if (mem_mask == 0xffffffff) { // 32-bit read if (offset == 0x22/4) @@ -1127,7 +1127,7 @@ static int zflagi, zflag, sysres; static READ32_HANDLER( network_r ) { - if ((mem_mask == 0) || (mem_mask == 0xffff0000) || (mem_mask == 0x0000ffff)) + if ((mem_mask == 0xffffffff) || (mem_mask == 0x0000ffff) || (mem_mask == 0xffff0000)) { return 0xffffffff; } @@ -1137,11 +1137,11 @@ static READ32_HANDLER( network_r ) return model2_netram[offset]; } - if (mem_mask == 0xff00ffff) + if (mem_mask == 0x00ff0000) { return sysres<<16; } - else if (mem_mask == 0xffffff00) + else if (mem_mask == 0x000000ff) { return zflagi; } @@ -1151,7 +1151,7 @@ static READ32_HANDLER( network_r ) static WRITE32_HANDLER( network_w ) { - if ((mem_mask == 0) || (mem_mask == 0xffff0000) || (mem_mask == 0x0000ffff)) + if ((mem_mask == 0xffffffff) || (mem_mask == 0x0000ffff) || (mem_mask == 0xffff0000)) { COMBINE_DATA(&model2_netram[offset+0x4000/4]); return; @@ -1163,11 +1163,11 @@ static WRITE32_HANDLER( network_w ) return; } - if (mem_mask == 0xff00ffff) + if (mem_mask == 0x00ff0000) { sysres = data>>16; } - else if (mem_mask == 0xffffff00) + else if (mem_mask == 0x000000ff) { zflagi = data; zflag = 0; diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c index 7b5cccf38da..236072a42be 100644 --- a/src/mame/drivers/model3.c +++ b/src/mame/drivers/model3.c @@ -1323,7 +1323,7 @@ static WRITE64_HANDLER(model3_sound_w) model3_irq_state &= ~0x40; // serial configuration writes - if ((mem_mask == U64(0x00ffffffffffffff)) && (offset == 0)) + if ((mem_mask == U64(0xff00000000000000)) && (offset == 0)) { SCSP_MidiIn(machine, 0, (data>>56)&0xff, 0); diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c index f7349801eaf..b4ac228d52b 100644 --- a/src/mame/drivers/mquake.c +++ b/src/mame/drivers/mquake.c @@ -126,13 +126,13 @@ static READ16_HANDLER( coin_chip_r ) { if (offset == 1) return input_port_read(machine, "COINCHIP"); - logerror("%06x:coin_chip_r(%02x) & %04x\n", activecpu_get_pc(), offset, mem_mask ^ 0xffff); + logerror("%06x:coin_chip_r(%02x) & %04x\n", activecpu_get_pc(), offset, mem_mask); return 0xffff; } static WRITE16_HANDLER( coin_chip_w ) { - logerror("%06x:coin_chip_w(%02x) = %04x & %04x\n", activecpu_get_pc(), offset, data, mem_mask ^ 0xffff); + logerror("%06x:coin_chip_w(%02x) = %04x & %04x\n", activecpu_get_pc(), offset, data, mem_mask); } // inputs at 282000, 282002 (full word) diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c index 42a9f29b0ba..5274431aa2a 100644 --- a/src/mame/drivers/namcona1.c +++ b/src/mame/drivers/namcona1.c @@ -835,15 +835,15 @@ transfer_dword( running_machine *machine, UINT32 dest, UINT32 source ) } if( dest>=0xf00000 && dest<=0xf02000 ) { - namcona1_paletteram_w( machine, (dest-0xf00000)/2, data, 0x0000 ); + namcona1_paletteram_w( machine, (dest-0xf00000)/2, data, 0xffff ); } else if( dest>=0xf40000 && dest<=0xf80000 ) { - namcona1_gfxram_w( machine, (dest-0xf40000)/2, data, 0x0000 ); + namcona1_gfxram_w( machine, (dest-0xf40000)/2, data, 0xffff ); } else if( dest>=0xff0000 && dest<0xff8000 ) { - namcona1_videoram_w( machine, (dest-0xff0000)/2, data, 0x0000 ); + namcona1_videoram_w( machine, (dest-0xff0000)/2, data, 0xffff ); } else if( dest>=0xff8000 && dest<=0xffdfff ) { @@ -1111,8 +1111,8 @@ static READ16_HANDLER( na1mcu_shared_r ) static WRITE16_HANDLER( na1mcu_shared_w ) { - mem_mask = ((mem_mask>>8)&0xff) | ((mem_mask<<8)&0xff00); - data = ((data>>8)&0xff) | ((data<<8)&0xff00); + mem_mask = FLIPENDIAN_INT16(mem_mask); + data = FLIPENDIAN_INT16(data); COMBINE_DATA(&namcona1_workram[offset]); } diff --git a/src/mame/drivers/namconb1.c b/src/mame/drivers/namconb1.c index 31dcd29ea11..88ee0c02b74 100644 --- a/src/mame/drivers/namconb1.c +++ b/src/mame/drivers/namconb1.c @@ -691,11 +691,11 @@ static WRITE32_HANDLER( sharedram_w ) { if (offset < 0xb0) { - if (mem_mask == 0x0000ffff) + if (mem_mask == 0xffff0000) { namcoc7x_sound_write16((data>>16), offset*2); } - else if (mem_mask == 0xffff0000) + else if (mem_mask == 0x0000ffff) { namcoc7x_sound_write16((data&0xffff), (offset*2)+1); } diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c index 81549369b79..c0369c594d4 100644 --- a/src/mame/drivers/namcos12.c +++ b/src/mame/drivers/namcos12.c @@ -1207,7 +1207,7 @@ static READ32_HANDLER( tektagt_protection_2_r ) static MACHINE_RESET( namcos12 ) { psx_machine_init(); - bankoffset_w(machine,0,0,0); + bankoffset_w(machine,0,0,0xffffffff); if( strcmp( machine->gamedrv->name, "tektagt" ) == 0 || strcmp( machine->gamedrv->name, "tektagta" ) == 0 || diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c index 2f4c3711549..2b56dae64e4 100644 --- a/src/mame/drivers/namcos22.c +++ b/src/mame/drivers/namcos22.c @@ -1148,7 +1148,7 @@ static WRITE32_HANDLER( namcos22_system_controller_w ) int i; for( i=0; i<4; i++ ) { - if( (mask&0xff000000)==0 ) + if( (mask&0xff000000)!=0 ) { int offs = offset*4+i; if(offs<4 || offs>=8) @@ -1166,7 +1166,7 @@ static WRITE32_HANDLER( namcos22_system_controller_w ) if( mbSuperSystem22 ) { - if (offset == 0x14/4 && mem_mask == 0xffff00ff) + if (offset == 0x14/4 && mem_mask == 0x0000ff00) { /* SUBCPU enable for Super System 22 */ if (data) { @@ -1180,7 +1180,7 @@ static WRITE32_HANDLER( namcos22_system_controller_w ) } else { - if (offset == 0x18/4 && mem_mask == 0xffff00ff) + if (offset == 0x18/4 && mem_mask == 0x0000ff00) { /* SUBCPU enable on System 22 (guessed, but too early crashes Rave Racer so it's a good test) */ if (data == 0xff00) { diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index f3fa1aa1e90..27366518461 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -603,7 +603,7 @@ static READ32_HANDLER(sysctl_stat_r) static WRITE32_HANDLER( s23_mcuen_w ) { mame_printf_debug("mcuen_w: mask %08x, data %08x\n", mem_mask, data); - if (mem_mask == 0xffff0000) + if (mem_mask == 0x0000ffff) { if (data) { diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c index bab656dce84..105cb8b24b3 100644 --- a/src/mame/drivers/nemesis.c +++ b/src/mame/drivers/nemesis.c @@ -245,10 +245,10 @@ static READ16_HANDLER( selected_ip_r ) { switch (hcrash_selected_ip & 0xf) { // From WEC Le Mans Schems: - case 0xc: return input_port_8_r(machine,offset); // Accel - Schems: Accelevr - case 0: return input_port_8_r(machine,offset); - case 0xd: return input_port_9_r(machine,offset); // Wheel - Schems: Handlevr - case 1: return input_port_9_r(machine,offset); + case 0xc: return input_port_read_indexed(machine,8); // Accel - Schems: Accelevr + case 0: return input_port_read_indexed(machine,8); + case 0xd: return input_port_read_indexed(machine,9); // Wheel - Schems: Handlevr + case 1: return input_port_read_indexed(machine,9); default: return ~0; } diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c index 926b6dbbcb9..026166b5bb9 100644 --- a/src/mame/drivers/neogeo.c +++ b/src/mame/drivers/neogeo.c @@ -562,7 +562,7 @@ static MEMCARD_HANDLER( neogeo ) static WRITE16_HANDLER( audio_command_w ) { /* accessing the LSB only is not mapped */ - if (mem_mask != 0xff00) + if (mem_mask != 0x00ff) { soundlatch_w(machine, 0, data >> 8); @@ -1013,7 +1013,7 @@ static MACHINE_RESET( neogeo ) /* reset system control registers */ for (offs = 0; offs < 8; offs++) - system_control_w(machine, offs, 0, 0xff00); + system_control_w(machine, offs, 0, 0x00ff); neogeo_reset_rng(); diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c index 7a394160d1e..8c64a7039c3 100644 --- a/src/mame/drivers/nmk16.c +++ b/src/mame/drivers/nmk16.c @@ -335,7 +335,7 @@ static READ16_HANDLER( tharrier_mcu_r ) return res << 8; } else - return ~input_port_1_word_r(machine,0,0); + return ~input_port_read_indexed(machine,1); } static WRITE16_HANDLER( macross2_sound_command_w ) diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c index 939e2558e73..65059ee2a4c 100644 --- a/src/mame/drivers/nyny.c +++ b/src/mame/drivers/nyny.c @@ -138,13 +138,13 @@ static INTERRUPT_GEN( update_pia_1 ) /* update the different PIA pins from the input ports */ /* CA1 - copy of PA0 (COIN1) */ - pia_1_ca1_w(machine, 0, input_port_0_r(machine, 0) & 0x01); + pia_1_ca1_w(machine, 0, input_port_read_indexed(machine, 0) & 0x01); /* CA2 - copy of PA1 (SERVICE1) */ - pia_1_ca2_w(machine, 0, input_port_0_r(machine, 0) & 0x02); + pia_1_ca2_w(machine, 0, input_port_read_indexed(machine, 0) & 0x02); /* CB1 - (crosshatch) */ - pia_1_cb1_w(machine, 0, input_port_5_r(machine, 0)); + pia_1_cb1_w(machine, 0, input_port_read_indexed(machine, 5)); /* CB2 - NOT CONNECTED */ } diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c index 1335f145357..b0ca85fe9d4 100644 --- a/src/mame/drivers/overdriv.c +++ b/src/mame/drivers/overdriv.c @@ -129,7 +129,7 @@ static READ16_HANDLER( eeprom_r ) //logerror("%06x eeprom_r\n",activecpu_get_pc()); /* bit 6 is EEPROM data */ - res = (EEPROM_read_bit() << 6) | input_port_0_word_r(machine,0,0); + res = (EEPROM_read_bit() << 6) | input_port_read_indexed(machine,0); return res; } diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c index 349845ead70..8dad4fa2e3a 100644 --- a/src/mame/drivers/pacman.c +++ b/src/mame/drivers/pacman.c @@ -557,7 +557,7 @@ static READ8_HANDLER( alibaba_mystery_2_r ) static READ8_HANDLER( maketrax_special_port2_r ) { - int data = input_port_2_r(machine,offset); + int data = input_port_read_indexed(machine, 2); int pc = activecpu_get_previouspc(); if ((pc == 0x1973) || (pc == 0x2389)) return data | 0x40; @@ -600,7 +600,7 @@ static READ8_HANDLER( maketrax_special_port3_r ) static READ8_HANDLER( korosuke_special_port2_r ) { - int data = input_port_2_r(machine,offset); + int data = input_port_read_indexed(machine,2); int pc = activecpu_get_previouspc(); if ((pc == 0x196e) || (pc == 0x2387)) return data | 0x40; diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c index a0eaf3fed2e..4ff081d2080 100644 --- a/src/mame/drivers/pasha2.c +++ b/src/mame/drivers/pasha2.c @@ -140,17 +140,17 @@ static WRITE16_HANDLER( bitmap_1_w ) // handle overlapping pixels without writing them switch(mem_mask) { - case 0: - bitmap_1_w(machine,offset,data,0x00ff); + case 0xffff: bitmap_1_w(machine,offset,data,0xff00); + bitmap_1_w(machine,offset,data,0x00ff); return; - case 0x00ff: + case 0xff00: if((data & 0xff00) == 0xff00) return; break; - case 0xff00: + case 0x00ff: if((data & 0x00ff) == 0x00ff) return; break; diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c index bb4c6532537..c2a7ff09ffd 100644 --- a/src/mame/drivers/peplus.c +++ b/src/mame/drivers/peplus.c @@ -484,7 +484,7 @@ static READ8_HANDLER( peplus_sf000_r ) /* External RAM Callback for I8052 */ static READ32_HANDLER( peplus_external_ram_iaddr ) { - if (mem_mask == 0xff) { + if (mem_mask == 0xffffff00) { return (io_port[2] << 8) | offset; } else { return offset; diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c index 180307d5d62..917444b68c3 100644 --- a/src/mame/drivers/pirates.c +++ b/src/mame/drivers/pirates.c @@ -170,7 +170,7 @@ static READ16_HANDLER( pirates_in1_r ) bit = 1; /* bit 4 is EEPROM data, bit 7 is protection */ - return input_port_1_word_r(machine,0,0) | (EEPROM_read_bit() << 4) | (bit << 7); + return input_port_read_indexed(machine,1) | (EEPROM_read_bit() << 4) | (bit << 7); } diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c index 8e99f2f2bef..3f8b66084a8 100644 --- a/src/mame/drivers/plygonet.c +++ b/src/mame/drivers/plygonet.c @@ -216,18 +216,18 @@ static WRITE32_HANDLER( dsp_shared_ram_write ) return; } - if (mem_mask == (0x00000000)) + if (mem_mask == (0xffffffff)) { /* write the data to the dsp56k as well */ dsp56k_shared_ram_16[(offset<<1)] = (dsp_shared_ram[offset] & 0xffff0000) >> 16 ; dsp56k_shared_ram_16[(offset<<1)+1] = (dsp_shared_ram[offset] & 0x0000ffff) ; } - else if (mem_mask == (0x0000ffff)) + else if (mem_mask == (0xffff0000)) { /* write to the 'current' dsp56k byte */ dsp56k_shared_ram_16[(offset<<1)] = (dsp_shared_ram[offset] & 0xffff0000) >> 16 ; } - else if (mem_mask == (0xffff0000)) + else if (mem_mask == (0x0000ffff)) { /* write to the 'next' dsp56k byte */ dsp56k_shared_ram_16[(offset<<1)+1] = (dsp_shared_ram[offset] & 0x0000ffff) ; @@ -267,12 +267,12 @@ static READ32_HANDLER( dsp_host_interface_r ) { UINT8 hi_addr = offset<<1; - if (mem_mask == (~0x0000ff00)) + if (mem_mask == 0x0000ff00) hi_addr++; logerror("CALLING dsp_host_interface_read %x = %x [%x] (@%x)\n", hi_addr, dsp56k_host_interface_read(hi_addr), mem_mask, activecpu_get_pc()); - if (mem_mask == (~0x0000ff00)) + if (mem_mask == 0x0000ff00) return dsp56k_host_interface_read(hi_addr) << 8; else return dsp56k_host_interface_read(hi_addr) << 24; @@ -284,7 +284,7 @@ static WRITE32_HANDLER( dsp_host_interface_w ) UINT8 dsp_data; UINT8 hi_addr = offset<<1; - if (mem_mask == (~0x0000ff00)) /* The second byte */ + if (mem_mask == 0x0000ff00) /* The second byte */ { hi_addr++; dsp_data = data >> 8; diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c index 530ced616f7..94b4a7b2017 100644 --- a/src/mame/drivers/policetr.c +++ b/src/mame/drivers/policetr.c @@ -188,13 +188,13 @@ static WRITE32_HANDLER( control_w ) /* toggling BSMT off then on causes a reset */ if (!(old & 0x80000000) && (control_data & 0x80000000)) { - BSMT2000_data_0_w(machine, bsmt_data_bank, 0, 0); + BSMT2000_data_0_w(machine, bsmt_data_bank, 0, 0xffff); sndti_reset(SOUND_BSMT2000, 0); } /* log any unknown bits */ if (data & 0x4f1fffff) - logerror("%08X: control_w = %08X & %08X\n", activecpu_get_previouspc(), data, ~mem_mask); + logerror("%08X: control_w = %08X & %08X\n", activecpu_get_previouspc(), data, mem_mask); } @@ -208,7 +208,7 @@ static WRITE32_HANDLER( control_w ) static WRITE32_HANDLER( bsmt2000_reg_w ) { if (control_data & 0x80000000) - BSMT2000_data_0_w(machine, bsmt_reg, data & 0xffff, mem_mask | 0xffff0000); + BSMT2000_data_0_w(machine, bsmt_reg, data & 0xffff, mem_mask & 0xffff); else COMBINE_DATA(&bsmt_data_offset); } diff --git a/src/mame/drivers/popeye.c b/src/mame/drivers/popeye.c index 7249c3007c9..25cef78d6c4 100644 --- a/src/mame/drivers/popeye.c +++ b/src/mame/drivers/popeye.c @@ -463,8 +463,8 @@ static READ8_HANDLER( popeye_portA_r ) int res; - res = input_port_3_r(machine,offset); - res |= (input_port_4_r(machine,offset) << (7-dswbit)) & 0x80; + res = input_port_read_indexed(machine,3); + res |= (input_port_read_indexed(machine,4) << (7-dswbit)) & 0x80; return res; } diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c index 58495ba4870..ad20d2aebd5 100644 --- a/src/mame/drivers/psikyo.c +++ b/src/mame/drivers/psikyo.c @@ -226,7 +226,7 @@ static WRITE32_HANDLER( s1945_mcu_w ) // Accesses are always bytes, so resolve it int suboff; for(suboff=0; suboff < 3; suboff++) - if(!((0xff << (8*suboff)) & mem_mask)) + if((0xff << (8*suboff)) & mem_mask) break; data >>= 8*suboff; offset = offset*4+4+(3-suboff); diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c index 4b5dcb45049..9781dbe3c39 100644 --- a/src/mame/drivers/psikyo4.c +++ b/src/mame/drivers/psikyo4.c @@ -305,7 +305,7 @@ static WRITE32_HANDLER( ps4_screen1_brt_w ) } } else { /* I believe this to be seperate rgb brightness due to strings in hotdebut, unused in 4 dumped games */ - if((data & ~mem_mask) != 0) + if((data & mem_mask) != 0) logerror("Unk Scr 1 rgb? brt write %08x mask %08x\n", data, mem_mask); } } @@ -332,7 +332,7 @@ static WRITE32_HANDLER( ps4_screen2_brt_w ) } } else { /* I believe this to be seperate rgb brightness due to strings in hotdebut, unused in 4 dumped games */ - if((data & ~mem_mask) != 0) + if((data & mem_mask) != 0) logerror("Unk Scr 2 rgb? brt write %08x mask %08x\n", data, mem_mask); } } diff --git a/src/mame/drivers/punchout.c b/src/mame/drivers/punchout.c index 783a0281747..d6f5eaafd51 100644 --- a/src/mame/drivers/punchout.c +++ b/src/mame/drivers/punchout.c @@ -142,7 +142,7 @@ DRIVER_INIT( armwrest ); static READ8_HANDLER( punchout_input_3_r ) { - int data = input_port_3_r(machine, offset); + int data = input_port_read_indexed(machine,3); /* bit 4 is busy pin level */ if( VLM5030_BSY() ) data &= ~0x10; else data |= 0x10; diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c index fd7e5e18381..6cc8be8fa42 100644 --- a/src/mame/drivers/qdrmfgp.c +++ b/src/mame/drivers/qdrmfgp.c @@ -47,15 +47,15 @@ static INT32 gp2_irq_control; static READ16_HANDLER( i_port1_r ) { if (control & 0x0080) - return input_port_0_word_r(machine,0,0); + return input_port_read_indexed(machine,0); else - return input_port_1_word_r(machine,0,0); + return input_port_read_indexed(machine,1); } static READ16_HANDLER( i_port2_r ) { /* bit 0-1 battery power sensor: 3=good, 2=low, other=bad */ - return (input_port_2_word_r(machine,0,0) & 0xfffc) | 0x0003; + return (input_port_read_indexed(machine,2) & 0xfffc) | 0x0003; } @@ -214,23 +214,23 @@ static WRITE16_HANDLER( k054539_word_w ) static READ16_DEVICE_HANDLER( ide_std_r ) { if (offset & 0x01) - return ide_controller16_r(device, IDE_STD_OFFSET + offset/2, 0x00ff) >> 8; + return ide_controller16_r(device, IDE_STD_OFFSET + offset/2, 0xff00) >> 8; else - return ide_controller16_r(device, IDE_STD_OFFSET + offset/2, 0x0000); + return ide_controller16_r(device, IDE_STD_OFFSET + offset/2, 0xffff); } static WRITE16_DEVICE_HANDLER( ide_std_w ) { if (offset & 0x01) - ide_controller16_w(device, IDE_STD_OFFSET + offset/2, data << 8, 0x00ff); + ide_controller16_w(device, IDE_STD_OFFSET + offset/2, data << 8, 0xff00); else - ide_controller16_w(device, IDE_STD_OFFSET + offset/2, data, 0x0000); + ide_controller16_w(device, IDE_STD_OFFSET + offset/2, data, 0xffff); } static READ16_DEVICE_HANDLER( ide_alt_r ) { if (offset == 0) - return ide_controller16_r(device, IDE_ALT_OFFSET, 0xff00); + return ide_controller16_r(device, IDE_ALT_OFFSET, 0x00ff); return 0; } @@ -238,7 +238,7 @@ static READ16_DEVICE_HANDLER( ide_alt_r ) static WRITE16_DEVICE_HANDLER( ide_alt_w ) { if (offset == 0) - ide_controller16_w(device, IDE_ALT_OFFSET, data, 0xff00); + ide_controller16_w(device, IDE_ALT_OFFSET, data, 0x00ff); } @@ -260,9 +260,9 @@ static READ16_DEVICE_HANDLER( gp2_ide_std_r ) break; } } - return ide_controller16_r(device, IDE_STD_OFFSET + offset/2, 0x00ff) >> 8; + return ide_controller16_r(device, IDE_STD_OFFSET + offset/2, 0xff00) >> 8; } else { - return ide_controller16_r(device, IDE_STD_OFFSET + offset/2, 0x0000); + return ide_controller16_r(device, IDE_STD_OFFSET + offset/2, 0xffff); } } diff --git a/src/mame/drivers/quasar.c b/src/mame/drivers/quasar.c index ff99869895c..1115910f2bd 100644 --- a/src/mame/drivers/quasar.c +++ b/src/mame/drivers/quasar.c @@ -112,10 +112,10 @@ static READ8_HANDLER( quasar_IO_r ) { UINT8 ans = 0; - if (IOpage == 0) ans = input_port_0_r(machine, 0); - if (IOpage == 1) ans = input_port_1_r(machine, 0); - if (IOpage == 2) ans = input_port_2_r(machine, 0); - if (IOpage == 3) ans = input_port_3_r(machine, 0); + if (IOpage == 0) ans = input_port_read_indexed(machine,0); + if (IOpage == 1) ans = input_port_read_indexed(machine,1); + if (IOpage == 2) ans = input_port_read_indexed(machine,2); + if (IOpage == 3) ans = input_port_read_indexed(machine,3); return ans; } @@ -147,10 +147,10 @@ static READ8_HANDLER( quasar_sh_command_r ) Quasar_T1 = 0; // Testing ... - // return input_port_5_r(0); + // return input_port_read_indexed(machine,5); // Add in sound DIP switch - return (Quasar_Command) + (input_port_5_r(machine, 0) & 0x30); + return (Quasar_Command) + (input_port_read_indexed(machine, 5) & 0x30); } static READ8_HANDLER( Quasar_T1_r ) diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c index 6a398e46fe9..093f2b1c1f2 100644 --- a/src/mame/drivers/rabbit.c +++ b/src/mame/drivers/rabbit.c @@ -553,12 +553,12 @@ static WRITE32_HANDLER( rabbit_audio_w ) #if VERBOSE_AUDIO_LOG int reg, voice, base, i; - if (mem_mask == 0x0000ffff) + if (mem_mask == 0xffff0000) { reg = offset*2; data >>= 16; } - else if (mem_mask == 0xffff0000) + else if (mem_mask == 0x0000ffff) { reg = (offset*2)+1; data &= 0xffff; @@ -722,7 +722,7 @@ static WRITE32_HANDLER( rabbit_eeprom_write ) { // don't disturb the EEPROM if we're not actually writing to it // (in particular, data & 0x100 here with mask = ffff00ff looks to be the watchdog) - if (mem_mask == 0x00ffffff) + if (mem_mask == 0xff000000) { // latch the bit EEPROM_write_bit(data & 0x01000000); diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c index fa97569a639..47c15defc9a 100644 --- a/src/mame/drivers/raiden.c +++ b/src/mame/drivers/raiden.c @@ -228,7 +228,7 @@ static INTERRUPT_GEN( raiden_interrupt ) static VIDEO_EOF( raiden ) { - buffer_spriteram16_w(machine,0,0,0); /* Could be a memory location instead */ + buffer_spriteram16_w(machine,0,0,0xffff); /* Could be a memory location instead */ } static MACHINE_DRIVER_START( raiden ) diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index 7129db1c493..37e698945dc 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -619,7 +619,7 @@ static void handle_io_w(int offset, UINT16 data, UINT16 mem_mask) COMBINE_DATA(&mainram[offset]); switch(offset) { default: - logerror("io_w %04x, %04x & %04x (%x)\n", offset*2, data, mem_mask ^ 0xffff, activecpu_get_pc()); + logerror("io_w %04x, %04x & %04x (%x)\n", offset*2, data, mem_mask, activecpu_get_pc()); } } @@ -647,12 +647,12 @@ static WRITE16_HANDLER(any_w) offset != 0x444/2 && offset != 0x6de/2 && offset != 0x47e/2 && offset != 0x4a0/2 && offset != 0x620/2 && offset != 0x6c6/2 && offset != 0x628/2 && offset != 0x62a/2) - logerror("mainram_w %04x, %04x & %04x (%x)\n", offset*2, data, mem_mask ^ 0xffff, activecpu_get_pc()); + logerror("mainram_w %04x, %04x & %04x (%x)\n", offset*2, data, mem_mask, activecpu_get_pc()); } if(0 && c_w[offset]>1000 && !c_r[offset]) { if(offset != 0x4c0/2 && (offset<0x500/2 || offset > 0x503/2)) - logerror("mainram_w %04x, %04x & %04x [%d.%d] (%x)\n", offset*2, data, mem_mask ^ 0xffff, c_w[offset], c_r[offset], activecpu_get_pc()); + logerror("mainram_w %04x, %04x & %04x [%d.%d] (%x)\n", offset*2, data, mem_mask, c_w[offset], c_r[offset], activecpu_get_pc()); } // if(offset == 0x471 || (offset >= 0xb146 && offset < 0xb156)) @@ -663,7 +663,7 @@ static WRITE16_HANDLER(any_w) // show = offset == 0x704 || offset == 0x710 || offset == 0x71c; if(show) - logerror("mainram_w %04x, %04x & %04x (%x)\n", offset*2, data, mem_mask ^ 0xffff, activecpu_get_pc()); + logerror("mainram_w %04x, %04x & %04x (%x)\n", offset*2, data, mem_mask, activecpu_get_pc()); // if(offset == 0x700) // cpu_setbank(2, memory_region(REGION_USER1)+0x20000*data); @@ -675,7 +675,7 @@ static WRITE16_HANDLER(w1x) { COMBINE_DATA(&w1ram[offset]); if(0 && offset < 0x800/2) - logerror("w1x %05x, %04x & %04x (%05x)\n", offset*2+0x10000, data, mem_mask ^ 0xffff, activecpu_get_pc()); + logerror("w1x %05x, %04x & %04x (%05x)\n", offset*2+0x10000, data, mem_mask, activecpu_get_pc()); } #ifdef UNUSED_FUNCTION diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c index 539ca740e77..803d96957c5 100644 --- a/src/mame/drivers/rbmk.c +++ b/src/mame/drivers/rbmk.c @@ -88,7 +88,7 @@ static WRITE16_HANDLER( gms_write3 ) static READ16_HANDLER( eeprom_r ) { - return (EEPROM_read_bit() << 15)|(input_port_3_word_r(machine,0,0)&0x7fff); + return (EEPROM_read_bit() << 15)|(input_port_read_indexed(machine,3)&0x7fff); } static WRITE16_HANDLER( eeprom_w ) diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c index d1131108115..e351d4af40f 100644 --- a/src/mame/drivers/realbrk.c +++ b/src/mame/drivers/realbrk.c @@ -73,14 +73,14 @@ static READ16_HANDLER( pkgnsh_input_r ) { case 0x00/2: return 0xffff; case 0x02/2: return 0xffff; - case 0x04/2: return input_port_0_word_r(machine,0,0);/*Service buttons*/ - case 0x06/2: return input_port_1_word_r(machine,0,0);/*DIP 2*/ - case 0x08/2: return input_port_2_word_r(machine,0,0);/*DIP 1*/ - case 0x0a/2: return input_port_3_word_r(machine,0,0);/*DIP 1+2 Hi-Bits*/ - case 0x0c/2: return input_port_4_word_r(machine,0,0);/*Handle 1p*/ - case 0x0e/2: return input_port_5_word_r(machine,0,0);/*Buttons 1p*/ - case 0x10/2: return input_port_6_word_r(machine,0,0);/*Handle 2p*/ - case 0x12/2: return input_port_7_word_r(machine,0,0);/*Buttons 2p*/ + case 0x04/2: return input_port_read_indexed(machine,0);/*Service buttons*/ + case 0x06/2: return input_port_read_indexed(machine,1);/*DIP 2*/ + case 0x08/2: return input_port_read_indexed(machine,2);/*DIP 1*/ + case 0x0a/2: return input_port_read_indexed(machine,3);/*DIP 1+2 Hi-Bits*/ + case 0x0c/2: return input_port_read_indexed(machine,4);/*Handle 1p*/ + case 0x0e/2: return input_port_read_indexed(machine,5);/*Buttons 1p*/ + case 0x10/2: return input_port_read_indexed(machine,6);/*Handle 2p*/ + case 0x12/2: return input_port_read_indexed(machine,7);/*Buttons 2p*/ } return 0xffff; } @@ -92,22 +92,22 @@ static READ16_HANDLER( pkgnshdx_input_r ) switch(offset) { case 0x00/2: return 0xffff; - case 0x02/2: return input_port_0_word_r(machine,0,0);/*Service buttons*/ + case 0x02/2: return input_port_read_indexed(machine,0);/*Service buttons*/ /*DSW,same handling as realbrk*/ case 0x04/2: - if (sel & 0x01) return (input_port_1_word_r(machine,0,0) & 0x00ff) << 8; // DSW1 low bits - if (sel & 0x02) return (input_port_2_word_r(machine,0,0) & 0x00ff) << 8; // DSW2 low bits - if (sel & 0x04) return (input_port_3_word_r(machine,0,0) & 0x00ff) << 8; // DSW3 low bits - if (sel & 0x08) return (input_port_4_word_r(machine,0,0) & 0x00ff) << 8; // DSW4 low bits + if (sel & 0x01) return (input_port_read_indexed(machine,1) & 0x00ff) << 8; // DSW1 low bits + if (sel & 0x02) return (input_port_read_indexed(machine,2) & 0x00ff) << 8; // DSW2 low bits + if (sel & 0x04) return (input_port_read_indexed(machine,3) & 0x00ff) << 8; // DSW3 low bits + if (sel & 0x08) return (input_port_read_indexed(machine,4) & 0x00ff) << 8; // DSW4 low bits - if (sel & 0x10) return ((input_port_1_word_r(machine,0,0) & 0x0300) << 0) | // DSWs high 2 bits - ((input_port_2_word_r(machine,0,0) & 0x0300) << 2) | - ((input_port_3_word_r(machine,0,0) & 0x0300) << 4) | - ((input_port_4_word_r(machine,0,0) & 0x0300) << 6) ; + if (sel & 0x10) return ((input_port_read_indexed(machine,1) & 0x0300) << 0) | // DSWs high 2 bits + ((input_port_read_indexed(machine,2) & 0x0300) << 2) | + ((input_port_read_indexed(machine,3) & 0x0300) << 4) | + ((input_port_read_indexed(machine,4) & 0x0300) << 6) ; return 0xffff; - case 0x06/2: return input_port_6_word_r(machine,0,0);/*Buttons+Handle 2p*/ - case 0x08/2: return input_port_5_word_r(machine,0,0);/*Buttons+Handle 1p*/ + case 0x06/2: return input_port_read_indexed(machine,6);/*Buttons+Handle 2p*/ + case 0x08/2: return input_port_read_indexed(machine,5);/*Buttons+Handle 1p*/ case 0x0a/2: return 0xffff; case 0x0c/2: return 0xffff; case 0x0e/2: return 0xffff; diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c index 0ec6af34326..533c7c98c4b 100644 --- a/src/mame/drivers/royalmah.c +++ b/src/mame/drivers/royalmah.c @@ -221,26 +221,26 @@ static WRITE8_HANDLER( input_port_select_w ) static READ8_HANDLER( royalmah_player_1_port_r ) { - int ret = (input_port_0_r(machine,offset) & 0xc0) | 0x3f; + int ret = (input_port_read_indexed(machine,0) & 0xc0) | 0x3f; - if ((input_port_select & 0x01) == 0) ret &= input_port_0_r(machine,offset); - if ((input_port_select & 0x02) == 0) ret &= input_port_1_r(machine,offset); - if ((input_port_select & 0x04) == 0) ret &= input_port_2_r(machine,offset); - if ((input_port_select & 0x08) == 0) ret &= input_port_3_r(machine,offset); - if ((input_port_select & 0x10) == 0) ret &= input_port_4_r(machine,offset); + if ((input_port_select & 0x01) == 0) ret &= input_port_read_indexed(machine,0); + if ((input_port_select & 0x02) == 0) ret &= input_port_read_indexed(machine,1); + if ((input_port_select & 0x04) == 0) ret &= input_port_read_indexed(machine,2); + if ((input_port_select & 0x08) == 0) ret &= input_port_read_indexed(machine,3); + if ((input_port_select & 0x10) == 0) ret &= input_port_read_indexed(machine,4); return ret; } static READ8_HANDLER( royalmah_player_2_port_r ) { - int ret = (input_port_5_r(machine,offset) & 0xc0) | 0x3f; + int ret = (input_port_read_indexed(machine,5) & 0xc0) | 0x3f; - if ((input_port_select & 0x01) == 0) ret &= input_port_5_r(machine,offset); - if ((input_port_select & 0x02) == 0) ret &= input_port_6_r(machine,offset); - if ((input_port_select & 0x04) == 0) ret &= input_port_7_r(machine,offset); - if ((input_port_select & 0x08) == 0) ret &= input_port_8_r(machine,offset); - if ((input_port_select & 0x10) == 0) ret &= input_port_9_r(machine,offset); + if ((input_port_select & 0x01) == 0) ret &= input_port_read_indexed(machine,5); + if ((input_port_select & 0x02) == 0) ret &= input_port_read_indexed(machine,6); + if ((input_port_select & 0x04) == 0) ret &= input_port_read_indexed(machine,7); + if ((input_port_select & 0x08) == 0) ret &= input_port_read_indexed(machine,8); + if ((input_port_select & 0x10) == 0) ret &= input_port_read_indexed(machine,9); return ret; } diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c index 737e2ae310a..7257f93a061 100644 --- a/src/mame/drivers/rungun.c +++ b/src/mame/drivers/rungun.c @@ -119,7 +119,7 @@ static READ16_HANDLER( rng_sysregs_r ) bit8 : freeze bit9 : joysticks layout(auto detect???) */ - return(input_port_0_word_r(machine, 0, 0)); + return input_port_read_indexed(machine, 0); break; case 0x06/2: diff --git a/src/mame/drivers/seattle.c b/src/mame/drivers/seattle.c index 8a19da73f10..2881e910089 100644 --- a/src/mame/drivers/seattle.c +++ b/src/mame/drivers/seattle.c @@ -1018,7 +1018,7 @@ static void galileo_perform_dma(running_machine *machine, int which) } /* write the data and advance */ - voodoo_0_w(machine, (dstaddr & 0xffffff) / 4, program_read_dword(srcaddr), 0); + voodoo_0_w(machine, (dstaddr & 0xffffff) / 4, program_read_dword(srcaddr), 0xffffffff); srcaddr += srcinc; dstaddr += dstinc; bytesleft -= 4; @@ -1169,7 +1169,7 @@ static WRITE32_HANDLER( galileo_w ) int which = offset % 4; if (LOG_DMA) - logerror("%08X:Galileo write to offset %03X = %08X & %08X\n", activecpu_get_pc(), offset*4, data, ~mem_mask); + logerror("%08X:Galileo write to offset %03X = %08X & %08X\n", activecpu_get_pc(), offset*4, data, mem_mask); /* keep the read only activity bit */ galileo.reg[offset] &= ~0x4000; @@ -1240,7 +1240,7 @@ static WRITE32_HANDLER( galileo_w ) case GREG_INT_STATE: if (LOG_GALILEO) - logerror("%08X:Galileo write to IRQ clear = %08X & %08X\n", offset*4, data, ~mem_mask); + logerror("%08X:Galileo write to IRQ clear = %08X & %08X\n", offset*4, data, mem_mask); galileo.reg[offset] = oldata & data; update_galileo_irqs(); break; @@ -1278,11 +1278,11 @@ static WRITE32_HANDLER( galileo_w ) case GREG_CONFIG_ADDRESS: case GREG_INT_MASK: if (LOG_GALILEO) - logerror("%08X:Galileo write to offset %03X = %08X & %08X\n", activecpu_get_pc(), offset*4, data, ~mem_mask); + logerror("%08X:Galileo write to offset %03X = %08X & %08X\n", activecpu_get_pc(), offset*4, data, mem_mask); break; default: - logerror("%08X:Galileo write to offset %03X = %08X & %08X\n", activecpu_get_pc(), offset*4, data, ~mem_mask); + logerror("%08X:Galileo write to offset %03X = %08X & %08X\n", activecpu_get_pc(), offset*4, data, mem_mask); break; } } @@ -1467,18 +1467,18 @@ static WRITE32_HANDLER( carnevil_gun_w ) static READ32_HANDLER( ethernet_r ) { if (!(offset & 8)) - return smc91c94_r(machine, offset & 7, mem_mask | 0x0000); + return smc91c94_r(machine, offset & 7, mem_mask & 0xffff); else - return smc91c94_r(machine, offset & 7, mem_mask | 0xff00); + return smc91c94_r(machine, offset & 7, mem_mask & 0x00ff); } static WRITE32_HANDLER( ethernet_w ) { if (!(offset & 8)) - smc91c94_w(machine, offset & 7, data & 0xffff, mem_mask | 0x0000); + smc91c94_w(machine, offset & 7, data & 0xffff, mem_mask | 0xffff); else - smc91c94_w(machine, offset & 7, data & 0x00ff, mem_mask | 0xff00); + smc91c94_w(machine, offset & 7, data & 0x00ff, mem_mask | 0x00ff); } @@ -1535,7 +1535,7 @@ static READ32_HANDLER( widget_r ) } if (LOG_WIDGET) - logerror("Widget read (%02X) = %08X & %08X\n", offset*4, result, ~mem_mask); + logerror("Widget read (%02X) = %08X & %08X\n", offset*4, result, mem_mask); return result; } @@ -1543,7 +1543,7 @@ static READ32_HANDLER( widget_r ) static WRITE32_HANDLER( widget_w ) { if (LOG_WIDGET) - logerror("Widget write (%02X) = %08X & %08X\n", offset*4, data, ~mem_mask); + logerror("Widget write (%02X) = %08X & %08X\n", offset*4, data, mem_mask); switch (offset) { diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c index 158169cca7b..131e3b28130 100644 --- a/src/mame/drivers/segahang.c +++ b/src/mame/drivers/segahang.c @@ -166,7 +166,7 @@ static READ16_HANDLER( hangon_io_r ) } logerror("%06X:hangon_io_r - unknown read access to address %04X\n", activecpu_get_pc(), offset * 2); - return segaic16_open_bus_r(machine,0,0); + return segaic16_open_bus_r(machine,0,mem_mask); } @@ -189,7 +189,7 @@ static WRITE16_HANDLER( hangon_io_w ) return; } - logerror("%06X:hangon_io_w - unknown write access to address %04X = %04X & %04X\n", activecpu_get_pc(), offset * 2, data, mem_mask ^ 0xffff); + logerror("%06X:hangon_io_w - unknown write access to address %04X = %04X & %04X\n", activecpu_get_pc(), offset * 2, data, mem_mask); } @@ -212,7 +212,7 @@ static READ16_HANDLER( sharrier_io_r ) } logerror("%06X:sharrier_io_r - unknown read access to address %04X\n", activecpu_get_pc(), offset * 2); - return segaic16_open_bus_r(machine,0,0); + return segaic16_open_bus_r(machine,0,mem_mask); } @@ -235,7 +235,7 @@ static WRITE16_HANDLER( sharrier_io_w ) return; } - logerror("%06X:sharrier_io_w - unknown write access to address %04X = %04X & %04X\n", activecpu_get_pc(), offset * 2, data, mem_mask ^ 0xffff); + logerror("%06X:sharrier_io_w - unknown write access to address %04X = %04X & %04X\n", activecpu_get_pc(), offset * 2, data, mem_mask); } diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c index 92c5c487761..410388d5a71 100644 --- a/src/mame/drivers/segaorun.c +++ b/src/mame/drivers/segaorun.c @@ -360,7 +360,7 @@ static READ16_HANDLER( misc_io_r ) if (custom_io_r) return custom_io_r(machine, offset, mem_mask); logerror("%06X:misc_io_r - unknown read access to address %04X\n", activecpu_get_pc(), offset * 2); - return segaic16_open_bus_r(machine,0,0); + return segaic16_open_bus_r(machine,0,mem_mask); } @@ -371,7 +371,7 @@ static WRITE16_HANDLER( misc_io_w ) custom_io_w(machine, offset, data, mem_mask); return; } - logerror("%06X:misc_io_w - unknown write access to address %04X = %04X & %04X\n", activecpu_get_pc(), offset * 2, data, mem_mask ^ 0xffff); + logerror("%06X:misc_io_w - unknown write access to address %04X = %04X & %04X\n", activecpu_get_pc(), offset * 2, data, mem_mask); } @@ -397,7 +397,7 @@ static READ16_HANDLER( outrun_custom_io_r ) } logerror("%06X:outrun_custom_io_r - unknown read access to address %04X\n", activecpu_get_pc(), offset * 2); - return segaic16_open_bus_r(machine,0,0); + return segaic16_open_bus_r(machine,0,mem_mask); } @@ -434,7 +434,7 @@ static WRITE16_HANDLER( outrun_custom_io_w ) segaic16_sprites_draw_0_w(machine, offset, data, mem_mask); return; } - logerror("%06X:misc_io_w - unknown write access to address %04X = %04X & %04X\n", activecpu_get_pc(), offset * 2, data, mem_mask ^ 0xffff); + logerror("%06X:misc_io_w - unknown write access to address %04X = %04X & %04X\n", activecpu_get_pc(), offset * 2, data, mem_mask); } @@ -456,7 +456,7 @@ static READ16_HANDLER( shangon_custom_io_r ) } } logerror("%06X:misc_io_r - unknown read access to address %04X\n", activecpu_get_pc(), offset * 2); - return segaic16_open_bus_r(machine,0,0); + return segaic16_open_bus_r(machine,0,mem_mask); } @@ -489,7 +489,7 @@ static WRITE16_HANDLER( shangon_custom_io_w ) /* ADC trigger */ return; } - logerror("%06X:misc_io_w - unknown write access to address %04X = %04X & %04X\n", activecpu_get_pc(), offset * 2, data, mem_mask ^ 0xffff); + logerror("%06X:misc_io_w - unknown write access to address %04X = %04X & %04X\n", activecpu_get_pc(), offset * 2, data, mem_mask); } diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c index ee19aa63bd8..1887921a4c2 100644 --- a/src/mame/drivers/segas16a.c +++ b/src/mame/drivers/segas16a.c @@ -297,7 +297,7 @@ static WRITE16_HANDLER( standard_io_w ) timer_call_after_resynch(NULL, ((offset & 3) << 8) | (data & 0xff), delayed_ppi8255_w); return; } - logerror("%06X:standard_io_w - unknown write access to address %04X = %04X & %04X\n", activecpu_get_pc(), offset * 2, data, mem_mask ^ 0xffff); + logerror("%06X:standard_io_w - unknown write access to address %04X = %04X & %04X\n", activecpu_get_pc(), offset * 2, data, mem_mask); } @@ -549,12 +549,12 @@ static void quartet_i8751_sim(running_machine *machine) cpunum_set_input_line(machine, 0, 4, HOLD_LINE); /* X scroll values */ - segaic16_textram_0_w(machine, 0xff8/2, workram[0x0d14/2], 0); - segaic16_textram_0_w(machine, 0xffa/2, workram[0x0d18/2], 0); + segaic16_textram_0_w(machine, 0xff8/2, workram[0x0d14/2], 0xffff); + segaic16_textram_0_w(machine, 0xffa/2, workram[0x0d18/2], 0xffff); /* page values */ - segaic16_textram_0_w(machine, 0xe9e/2, workram[0x0d1c/2], 0); - segaic16_textram_0_w(machine, 0xe9c/2, workram[0x0d1e/2], 0); + segaic16_textram_0_w(machine, 0xe9e/2, workram[0x0d1c/2], 0xffff); + segaic16_textram_0_w(machine, 0xe9c/2, workram[0x0d1e/2], 0xffff); } diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c index d847c94e5d1..1a850f252e3 100644 --- a/src/mame/drivers/segas16b.c +++ b/src/mame/drivers/segas16b.c @@ -1126,7 +1126,7 @@ static READ16_HANDLER( standard_io_r ) return input_port_read_indexed(machine, 4 + (offset & 1)); } logerror("%06X:standard_io_r - unknown read access to address %04X\n", activecpu_get_pc(), offset * 2); - return segaic16_open_bus_r(machine,0,0); + return segaic16_open_bus_r(machine,0,mem_mask); } @@ -1156,7 +1156,7 @@ static WRITE16_HANDLER( standard_io_w ) coin_counter_w(0, data & 0x01); return; } - logerror("%06X:standard_io_w - unknown write access to address %04X = %04X & %04X\n", activecpu_get_pc(), offset * 2, data, mem_mask ^ 0xffff); + logerror("%06X:standard_io_w - unknown write access to address %04X = %04X & %04X\n", activecpu_get_pc(), offset * 2, data, mem_mask); } @@ -1205,7 +1205,7 @@ static READ16_HANDLER( rom_5797_bank_math_r ) /* compare registers */ return segaic16_compare_timer_0_r(machine, offset & 7, mem_mask); } - return segaic16_open_bus_r(machine,0,0); + return segaic16_open_bus_r(machine,0,mem_mask); } @@ -1241,7 +1241,7 @@ static READ16_HANDLER( unknown_rgn2_r ) static WRITE16_HANDLER( unknown_rgn2_w ) { - logerror("Region 2: write to %04X = %04X & %04X\n", offset * 2, data, mem_mask ^ 0xffff); + logerror("Region 2: write to %04X = %04X & %04X\n", offset * 2, data, mem_mask); segaic16_compare_timer_1_w(machine, offset & 7, data, mem_mask); } @@ -1368,7 +1368,7 @@ static void altbeast_common_i8751_sim(running_machine *machine, offs_t soundoffs cpunum_set_input_line(machine, 0, 4, HOLD_LINE); /* set tile banks */ - rom_5704_bank_w(machine, 1, workram[0x3094/2] & 0x00ff, 0xff00); + rom_5704_bank_w(machine, 1, workram[0x3094/2] & 0x00ff, 0x00ff); /* process any new sound data */ temp = workram[soundoffs]; diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c index b82226364ed..452dd52cc7d 100644 --- a/src/mame/drivers/segas18.c +++ b/src/mame/drivers/segas18.c @@ -335,7 +335,7 @@ static READ16_HANDLER( misc_io_r ) if (custom_io_r) return custom_io_r(machine, offset, mem_mask); logerror("%06X:misc_io_r - unknown read access to address %04X\n", activecpu_get_pc(), offset * 2); - return segaic16_open_bus_r(machine,0,0); + return segaic16_open_bus_r(machine,0,mem_mask); } @@ -368,7 +368,7 @@ static WRITE16_HANDLER( misc_io_w ) custom_io_w(machine, offset, data, mem_mask); return; } - logerror("%06X:misc_io_w - unknown write access to address %04X = %04X & %04X\n", activecpu_get_pc(), offset * 2, data, mem_mask ^ 0xffff); + logerror("%06X:misc_io_w - unknown write access to address %04X = %04X & %04X\n", activecpu_get_pc(), offset * 2, data, mem_mask); } @@ -427,7 +427,7 @@ static READ16_HANDLER( ddcrew_custom_io_r ) case 0x3024/2: return input_port_read(machine, "P34START"); } - return segaic16_open_bus_r(machine,0,0); + return segaic16_open_bus_r(machine,0,mem_mask); } @@ -451,7 +451,7 @@ static READ16_HANDLER( lghost_custom_io_r ) lghost_value <<= 1; return result; } - return segaic16_open_bus_r(machine,0,0); + return segaic16_open_bus_r(machine,0,mem_mask); } @@ -511,7 +511,7 @@ static READ16_HANDLER( wwally_custom_io_r ) case 0x3014/2: return (input_port_read(machine, "TRACKY3") - wwally_last_y[2]) & 0xff; } - return segaic16_open_bus_r(machine,0,0); + return segaic16_open_bus_r(machine,0,mem_mask); } diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c index 4af02405476..afb62139d4d 100644 --- a/src/mame/drivers/segas32.c +++ b/src/mame/drivers/segas32.c @@ -854,7 +854,7 @@ static READ16_HANDLER( analog_custom_io_r ) analog_value[offset & 3] <<= 1; return result; } - logerror("%06X:unknown analog_custom_io_r(%X) & %04X\n", activecpu_get_pc(), offset*2, mem_mask ^ 0xffff); + logerror("%06X:unknown analog_custom_io_r(%X) & %04X\n", activecpu_get_pc(), offset*2, mem_mask); return 0xffff; } @@ -871,7 +871,7 @@ static WRITE16_HANDLER( analog_custom_io_w ) analog_value[offset & 3] = input_port_read_safe(machine, names[offset & 3], 0); return; } - logerror("%06X:unknown analog_custom_io_w(%X) = %04X & %04X\n", activecpu_get_pc(), offset*2, data, mem_mask ^ 0xffff); + logerror("%06X:unknown analog_custom_io_w(%X) = %04X & %04X\n", activecpu_get_pc(), offset*2, data, mem_mask); } @@ -887,7 +887,7 @@ static READ16_HANDLER( extra_custom_io_r ) return input_port_read_safe(machine, names[offset & 3], 0xffff); } - logerror("%06X:unknown extra_custom_io_r(%X) & %04X\n", activecpu_get_pc(), offset*2, mem_mask ^ 0xffff); + logerror("%06X:unknown extra_custom_io_r(%X) & %04X\n", activecpu_get_pc(), offset*2, mem_mask); return 0xffff; } @@ -908,7 +908,7 @@ static WRITE16_HANDLER( orunners_custom_io_w ) analog_bank = data & 1; return; } - logerror("%06X:unknown orunners_custom_io_w(%X) = %04X & %04X\n", activecpu_get_pc(), offset*2, data, mem_mask ^ 0xffff); + logerror("%06X:unknown orunners_custom_io_w(%X) = %04X & %04X\n", activecpu_get_pc(), offset*2, data, mem_mask); } @@ -927,7 +927,7 @@ static READ16_HANDLER( sonic_custom_io_r ) return (UINT8)(input_port_read(machine, names[offset/2]) - sonic_last[offset/2]); } - logerror("%06X:unknown sonic_custom_io_r(%X) & %04X\n", activecpu_get_pc(), offset*2, mem_mask ^ 0xffff); + logerror("%06X:unknown sonic_custom_io_r(%X) & %04X\n", activecpu_get_pc(), offset*2, mem_mask); return 0xffff; } @@ -946,7 +946,7 @@ static WRITE16_HANDLER( sonic_custom_io_w ) return; } - logerror("%06X:unknown sonic_custom_io_w(%X) = %04X & %04X\n", activecpu_get_pc(), offset*2, data, mem_mask ^ 0xffff); + logerror("%06X:unknown sonic_custom_io_w(%X) = %04X & %04X\n", activecpu_get_pc(), offset*2, data, mem_mask); } @@ -959,7 +959,7 @@ static WRITE16_HANDLER( sonic_custom_io_w ) static WRITE16_HANDLER( random_number_16_w ) { -// mame_printf_debug("%06X:random_seed_w(%04X) = %04X & %04X\n", activecpu_get_pc(), offset*2, data, mem_mask ^ 0xffff); +// mame_printf_debug("%06X:random_seed_w(%04X) = %04X & %04X\n", activecpu_get_pc(), offset*2, data, mem_mask); } static READ16_HANDLER( random_number_16_r ) @@ -969,7 +969,7 @@ static READ16_HANDLER( random_number_16_r ) static WRITE32_HANDLER( random_number_32_w ) { -// mame_printf_debug("%06X:random_seed_w(%04X) = %04X & %04X\n", activecpu_get_pc(), offset*2, data, mem_mask ^ 0xffff); +// mame_printf_debug("%06X:random_seed_w(%04X) = %04X & %04X\n", activecpu_get_pc(), offset*2, data, mem_mask); } static READ32_HANDLER( random_number_32_r ) diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c index cb36c303c12..a9264ad3c3f 100644 --- a/src/mame/drivers/segaxbd.c +++ b/src/mame/drivers/segaxbd.c @@ -482,7 +482,7 @@ static READ16_HANDLER( smgp_excs_r ) static WRITE16_HANDLER( smgp_excs_w ) { - logerror("%06X:smgp_excs_w(%04X) = %04X & %04X\n", activecpu_get_pc(), offset*2, data, mem_mask ^ 0xffff); + logerror("%06X:smgp_excs_w(%04X) = %04X & %04X\n", activecpu_get_pc(), offset*2, data, mem_mask); } diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c index 6e967171d32..58f1d9b7fd7 100644 --- a/src/mame/drivers/seibuspi.c +++ b/src/mame/drivers/seibuspi.c @@ -1008,11 +1008,11 @@ static READ32_HANDLER( soundrom_r ) UINT8 *sound = (UINT8*)memory_region(REGION_USER2); UINT16 *sound16 = (UINT16*)memory_region(REGION_USER2); - if (mem_mask == 0xffffff00) + if (mem_mask == 0x000000ff) { return sound[offset]; } - else if (mem_mask == 0x00000000) + else if (mem_mask == 0xffffffff) { if (offset < 0x100000) { diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index 6b9d8d7aa5d..d438e27ff40 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -2594,7 +2594,7 @@ static WRITE16_HANDLER( kiwame_nvram_w ) static READ16_HANDLER( kiwame_input_r ) { - int row_select = kiwame_nvram_r( machine,0x10a/2,0 ) & 0x1f; + int row_select = kiwame_nvram_r( machine,0x10a/2,0x00ff ) & 0x1f; int i; for(i = 0; i < 5; i++) diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c index ce1a2265b86..d0d72f0827f 100644 --- a/src/mame/drivers/sf.c +++ b/src/mame/drivers/sf.c @@ -123,8 +123,8 @@ static WRITE16_HANDLER( protection_w ) program_write_word(0xffc00c, 0xc0); program_write_word(0xffc00e, 0); - sf_fg_scroll_w(machine, 0, d1, 0); - sf_bg_scroll_w(machine, 0, d2, 0); + sf_fg_scroll_w(machine, 0, d1, 0xffff); + sf_bg_scroll_w(machine, 0, d2, 0xffff); break; } case 4: @@ -144,7 +144,7 @@ static WRITE16_HANDLER( protection_w ) } program_write_word(0xffc682, d1); program_write_word(0xffc00e, off); - sf_bg_scroll_w(machine, 0, d1, 0); + sf_bg_scroll_w(machine, 0, d1, 0xffff); } break; } diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c index d0361f5ead2..bb3cac3b85b 100644 --- a/src/mame/drivers/shisen.c +++ b/src/mame/drivers/shisen.c @@ -20,18 +20,18 @@ extern VIDEO_UPDATE( sichuan2 ); static READ8_HANDLER( sichuan2_dsw1_r ) { - int ret = input_port_3_r(machine, 0); + int ret = input_port_read_indexed(machine,3); /* Based on the coin mode fill in the upper bits */ - if (input_port_4_r(machine, 0) & 0x04) + if (input_port_read_indexed(machine,4) & 0x04) { /* Mode 1 */ - ret |= (input_port_5_r(machine, 0) << 4); + ret |= (input_port_read_indexed(machine,5) << 4); } else { /* Mode 2 */ - ret |= (input_port_5_r(machine, 0) & 0xf0); + ret |= (input_port_read_indexed(machine,5) & 0xf0); } return ret; diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c index 757924f9589..6c24a652dc2 100644 --- a/src/mame/drivers/slapshot.c +++ b/src/mame/drivers/slapshot.c @@ -202,8 +202,8 @@ static READ16_HANDLER( slapshot_service_input_r ) switch (offset) { case 0x03: - return ((input_port_3_word_r(machine,0,0) & 0xef) | - (input_port_5_word_r(machine,0,0) & 0x10)) << 8; /* IN3 + service switch */ + return ((input_port_read_indexed(machine,3) & 0xef) | + (input_port_read_indexed(machine,5) & 0x10)) << 8; /* IN3 + service switch */ default: return TC0640FIO_r(machine,offset) << 8; diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c index 7b64ce2d401..7f1dc92123b 100644 --- a/src/mame/drivers/snk.c +++ b/src/mame/drivers/snk.c @@ -320,7 +320,7 @@ static int snk_input_port_r( running_machine *machine, int which ){ switch( snk_io[which] ){ case SNK_INP0: { - int value = input_port_0_r( machine,0 ); + int value = input_port_read_indexed( machine,0 ); if( (snk_sound_register & 0x04) == 0 ) value &= ~snk_sound_busy_bit; return value; } diff --git a/src/mame/drivers/spiders.c b/src/mame/drivers/spiders.c index 042571e9252..c04e5ff9ad6 100644 --- a/src/mame/drivers/spiders.c +++ b/src/mame/drivers/spiders.c @@ -272,13 +272,13 @@ static INTERRUPT_GEN( update_pia_1 ) /* update the different PIA pins from the input ports */ /* CA1 - copy of PA1 (COIN1) */ - pia_1_ca1_w(machine, 0, input_port_0_r(machine, 0) & 0x02); + pia_1_ca1_w(machine, 0, input_port_read_indexed(machine,0) & 0x02); /* CA2 - copy of PA0 (SERVICE1) */ - pia_1_ca2_w(machine, 0, input_port_0_r(machine, 0) & 0x01); + pia_1_ca2_w(machine, 0, input_port_read_indexed(machine,0) & 0x01); /* CB1 - (crosshatch) */ - pia_1_cb1_w(machine, 0, input_port_5_r(machine, 0)); + pia_1_cb1_w(machine, 0, input_port_read_indexed(machine,5)); /* CB2 - NOT CONNECTED */ } diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c index eb911651f9e..1b3347bb3ef 100644 --- a/src/mame/drivers/sshangha.c +++ b/src/mame/drivers/sshangha.c @@ -142,7 +142,7 @@ static MACHINE_RESET( sshangha ) orientation when entering the "test mode" (check the game code from 0x0006b8 to 0x0006f0). I can't tell however if this is accurate or not. */ - sshangha_control_0_w(machine, 0, 0x10, 0xff00); + sshangha_control_0_w(machine, 0, 0x10, 0x00ff); } /******************************************************************************/ diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c index 78c220a2945..17c0de44ded 100644 --- a/src/mame/drivers/stv.c +++ b/src/mame/drivers/stv.c @@ -2473,7 +2473,7 @@ static WRITE32_HANDLER ( w60ffc44_write ) { COMBINE_DATA(&stv_workram_h[0xffc44/4]); - logerror("cpu #%d (PC=%08X): 60ffc44_write write = %08X & %08X\n", cpu_getactivecpu(), activecpu_get_pc(), data, mem_mask ^ 0xffffffff); + logerror("cpu #%d (PC=%08X): 60ffc44_write write = %08X & %08X\n", cpu_getactivecpu(), activecpu_get_pc(), data, mem_mask); //sinit_w(offset,data,mem_mask); } @@ -2481,7 +2481,7 @@ static WRITE32_HANDLER ( w60ffc48_write ) { COMBINE_DATA(&stv_workram_h[0xffc48/4]); - logerror("cpu #%d (PC=%08X): 60ffc48_write write = %08X & %08X\n", cpu_getactivecpu(), activecpu_get_pc(), data, mem_mask ^ 0xffffffff); + logerror("cpu #%d (PC=%08X): 60ffc48_write write = %08X & %08X\n", cpu_getactivecpu(), activecpu_get_pc(), data, mem_mask); //minit_w(offset,data,mem_mask); } diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c index da75806a43e..9c41759e9a7 100644 --- a/src/mame/drivers/superchs.c +++ b/src/mame/drivers/superchs.c @@ -116,7 +116,7 @@ static READ32_HANDLER( superchs_input_r ) switch (offset) { case 0x00: - return (input_port_0_word_r(machine,0,0) << 16) | input_port_1_word_r(machine,0,0) | + return (input_port_read_indexed(machine,0) << 16) | input_port_read_indexed(machine,1) | (EEPROM_read_bit() << 7); case 0x01: @@ -177,12 +177,12 @@ static WRITE32_HANDLER( superchs_input_w ) static READ32_HANDLER( superchs_stick_r ) { - int fake = input_port_6_word_r(machine,0,0); + int fake = input_port_read_indexed(machine,6); int accel; if (!(fake &0x10)) /* Analogue steer (the real control method) */ { - steer = input_port_2_word_r(machine,0,0); + steer = input_port_read_indexed(machine,2); } else /* Digital steer, with smoothing - speed depends on how often stick_r is called */ { @@ -207,13 +207,13 @@ static READ32_HANDLER( superchs_stick_r ) } /* Accelerator is an analogue input but the game treats it as digital (on/off) */ - if (input_port_6_word_r(machine,0,0) & 0x1) /* pressing B1 */ + if (input_port_read_indexed(machine,6) & 0x1) /* pressing B1 */ accel = 0x0; else accel = 0xff; /* Todo: Verify brake - and figure out other input */ - return (steer << 24) | (accel << 16) | (input_port_4_word_r(machine,0,0) << 8) | input_port_5_word_r(machine,0,0); + return (steer << 24) | (accel << 16) | (input_port_read_indexed(machine,4) << 8) | input_port_read_indexed(machine,5); } static WRITE32_HANDLER( superchs_stick_w ) @@ -221,7 +221,7 @@ static WRITE32_HANDLER( superchs_stick_w ) /* This is guess work - the interrupts are in groups of 4, with each writing to a different byte in this long word before the RTE. I assume all but the last (top) byte cause an IRQ with the final one being an ACK. (Total guess but it works). */ - if (mem_mask!=0x00ffffff) + if (mem_mask!=0xff000000) cpunum_set_input_line(Machine, 0,3,HOLD_LINE); } diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c index b5082cca308..a83ff94ef05 100644 --- a/src/mame/drivers/system16.c +++ b/src/mame/drivers/system16.c @@ -1205,7 +1205,7 @@ static READ16_HANDLER( ga_io_players_r ) { } static READ16_HANDLER( ga_io_service_r ) { - return (input_port_2_word_r(machine,0,0) << 8) | (sys16_workingram[0x2c96/2] & 0x00ff); + return (input_port_read_indexed(machine,2) << 8) | (sys16_workingram[0x2c96/2] & 0x00ff); } static ADDRESS_MAP_START( goldnaxe_readmem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -1400,7 +1400,7 @@ static int passht4b_io3_val; static READ16_HANDLER( passht4b_service_r ) { - UINT16 val=input_port_2_word_r(machine,offset,0); + UINT16 val=input_port_read_indexed(machine,2); if(!(input_port_read_indexed(machine, 0) & 0x40)) val&=0xef; if(!(input_port_read_indexed(machine, 1) & 0x40)) val&=0xdf; if(!(input_port_read_indexed(machine, 5) & 0x40)) val&=0xbf; @@ -1908,11 +1908,11 @@ MACHINE_DRIVER_END /***************************************************************************/ static READ16_HANDLER( tt_io_player1_r ) -{ return input_port_0_r( machine, offset ) << 8; } +{ return input_port_read_indexed(machine,0) << 8; } static READ16_HANDLER( tt_io_player2_r ) -{ return input_port_1_r( machine, offset ) << 8; } +{ return input_port_read_indexed(machine,1) << 8; } static READ16_HANDLER( tt_io_service_r ) -{ return input_port_2_r( machine, offset ) << 8; } +{ return input_port_read_indexed(machine,2) << 8; } diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c index f6ae7ed5c39..3f86228d8ba 100644 --- a/src/mame/drivers/taito_b.c +++ b/src/mame/drivers/taito_b.c @@ -328,35 +328,35 @@ static INTERRUPT_GEN( sbm_interrupt )//5 static READ16_HANDLER( tracky1_hi_r ) { - return input_port_5_word_r(machine,0,0); + return input_port_read_indexed(machine,5); } static READ16_HANDLER( tracky1_lo_r ) { - return (input_port_5_word_r(machine,0,0) & 0xff) <<8; + return (input_port_read_indexed(machine,5) & 0xff) <<8; } static READ16_HANDLER( trackx1_hi_r ) { - return input_port_6_word_r(machine,0,0); + return input_port_read_indexed(machine,6); } static READ16_HANDLER( trackx1_lo_r ) { - return (input_port_6_word_r(machine,0,0) & 0xff) <<8; + return (input_port_read_indexed(machine,6) & 0xff) <<8; } static READ16_HANDLER( tracky2_hi_r ) { - return input_port_7_word_r(machine,0,0); + return input_port_read_indexed(machine,7); } static READ16_HANDLER( tracky2_lo_r ) { - return (input_port_7_word_r(machine,0,0) & 0xff) <<8; + return (input_port_read_indexed(machine,7) & 0xff) <<8; } static READ16_HANDLER( trackx2_hi_r ) { - return input_port_8_word_r(machine,0,0); + return input_port_read_indexed(machine,8); } static READ16_HANDLER( trackx2_lo_r ) { - return (input_port_8_word_r(machine,0,0) & 0xff) <<8; + return (input_port_read_indexed(machine,8) & 0xff) <<8; } @@ -413,7 +413,7 @@ static READ16_HANDLER( eeprom_r ) int res; res = (EEPROM_read_bit() & 0x01); - res |= input_port_1_word_r(machine,0,0) & 0xfe; /* coin inputs */ + res |= input_port_read_indexed(machine,1) & 0xfe; /* coin inputs */ return res; } diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c index dd77e243a94..2f8537354a0 100644 --- a/src/mame/drivers/taito_f2.c +++ b/src/mame/drivers/taito_f2.c @@ -359,10 +359,10 @@ static READ16_HANDLER( growl_dsw_r ) switch (offset) { case 0x00: - return input_port_3_word_r(machine,0,mem_mask); /* DSW A */ + return input_port_read_indexed(machine,3); /* DSW A */ case 0x01: - return input_port_4_word_r(machine,0,mem_mask); /* DSW B */ + return input_port_read_indexed(machine,4); /* DSW B */ } logerror("CPU #0 PC %06x: warning - read unmapped dsw_r offset %06x\n",activecpu_get_pc(),offset); @@ -375,13 +375,13 @@ static READ16_HANDLER( growl_input_r ) switch (offset) { case 0x00: - return input_port_0_word_r(machine,0,mem_mask); /* IN0 */ + return input_port_read_indexed(machine,0); /* IN0 */ case 0x01: - return input_port_1_word_r(machine,0,mem_mask); /* IN1 */ + return input_port_read_indexed(machine,1); /* IN1 */ case 0x02: - return input_port_2_word_r(machine,0,mem_mask); /* IN2 */ + return input_port_read_indexed(machine,2); /* IN2 */ } @@ -395,28 +395,28 @@ static READ16_HANDLER( footchmp_input_r ) switch (offset) { case 0x00: - return input_port_3_word_r(machine,0,mem_mask); /* DSW A */ + return input_port_read_indexed(machine,3); /* DSW A */ case 0x01: - return input_port_4_word_r(machine,0,mem_mask); /* DSW B */ + return input_port_read_indexed(machine,4); /* DSW B */ case 0x02: - return input_port_2_word_r(machine,0,mem_mask); /* IN2 */ + return input_port_read_indexed(machine,2); /* IN2 */ // case 0x03: -// return (coin_word & ~mem_mask); +// return (coin_word & mem_mask); case 0x05: - return input_port_0_word_r(machine,0,mem_mask); /* IN0 */ + return input_port_read_indexed(machine,0); /* IN0 */ case 0x06: - return input_port_1_word_r(machine,0,mem_mask); /* IN1 */ + return input_port_read_indexed(machine,1); /* IN1 */ case 0x07: - return input_port_5_word_r(machine,0,mem_mask); /* IN3 */ + return input_port_read_indexed(machine,5); /* IN3 */ case 0x08: - return input_port_6_word_r(machine,0,mem_mask); /* IN4 */ + return input_port_read_indexed(machine,6); /* IN4 */ } logerror("CPU #0 PC %06x: warning - read unmapped input offset %06x\n",activecpu_get_pc(),offset); @@ -429,28 +429,28 @@ static READ16_HANDLER( ninjak_input_r ) switch (offset) { case 0x00: - return (input_port_3_word_r(machine,0,0) << 8); /* DSW A */ + return (input_port_read_indexed(machine,3) << 8); /* DSW A */ case 0x01: - return (input_port_4_word_r(machine,0,0) << 8); /* DSW B */ + return (input_port_read_indexed(machine,4) << 8); /* DSW B */ case 0x02: - return (input_port_0_word_r(machine,0,0) << 8); /* IN 0 */ + return (input_port_read_indexed(machine,0) << 8); /* IN 0 */ case 0x03: - return (input_port_1_word_r(machine,0,0) << 8); /* IN 1 */ + return (input_port_read_indexed(machine,1) << 8); /* IN 1 */ case 0x04: - return (input_port_5_word_r(machine,0,0) << 8); /* IN 3 */ + return (input_port_read_indexed(machine,5) << 8); /* IN 3 */ case 0x05: - return (input_port_6_word_r(machine,0,0) << 8); /* IN 4 */ + return (input_port_read_indexed(machine,6) << 8); /* IN 4 */ case 0x06: - return (input_port_2_word_r(machine,0,0) << 8); /* IN 2 */ + return (input_port_read_indexed(machine,2) << 8); /* IN 2 */ // case 0x07: -// return (coin_word & ~mem_mask); +// return (coin_word & mem_mask); } logerror("CPU #0 PC %06x: warning - read unmapped input offset %06x\n",activecpu_get_pc(),offset); @@ -466,13 +466,13 @@ static READ16_HANDLER( cameltry_paddle_r ) switch (offset) { case 0x00: - curr = input_port_5_word_r(machine,0,0); /* Paddle A */ + curr = input_port_read_indexed(machine,5); /* Paddle A */ res = curr - last[0]; last[0] = curr; return res; case 0x02: - curr = input_port_6_word_r(machine,0,0); /* Paddle B */ + curr = input_port_read_indexed(machine,6); /* Paddle B */ res = curr - last[1]; last[1] = curr; return res; @@ -488,10 +488,10 @@ static READ16_HANDLER( driftout_paddle_r ) switch (offset) { case 0x00: - return input_port_5_word_r(machine,0,mem_mask); /* Paddle A */ + return input_port_read_indexed(machine,5); /* Paddle A */ case 0x01: - return input_port_6_word_r(machine,0,mem_mask); /* Paddle B */ + return input_port_read_indexed(machine,6); /* Paddle B */ } logerror("CPU #0 PC %06x: warning - read unmapped paddle offset %06x\n",activecpu_get_pc(),offset); @@ -504,22 +504,22 @@ static READ16_HANDLER( deadconx_input_r ) switch (offset) { case 0x00: - return input_port_3_word_r(machine,0,mem_mask); /* DSW A */ + return input_port_read_indexed(machine,3); /* DSW A */ case 0x01: - return input_port_4_word_r(machine,0,mem_mask); /* DSW B */ + return input_port_read_indexed(machine,4); /* DSW B */ case 0x02: - return input_port_2_word_r(machine,0,mem_mask); /* IN2 */ + return input_port_read_indexed(machine,2); /* IN2 */ // case 0x03: -// return (coin_word & ~mem_mask); +// return (coin_word & mem_mask); case 0x05: - return input_port_0_word_r(machine,0,mem_mask); /* IN0 */ + return input_port_read_indexed(machine,0); /* IN0 */ case 0x06: - return input_port_1_word_r(machine,0,mem_mask); /* IN1 */ + return input_port_read_indexed(machine,1); /* IN1 */ } logerror("CPU #0 PC %06x: warning - read unmapped input offset %06x\n",activecpu_get_pc(),offset); @@ -533,12 +533,12 @@ static READ16_HANDLER( mjnquest_dsw_r ) { case 0x00: { - return (input_port_5_word_r(machine,0,0) << 8) + input_port_7_word_r(machine,0,0); /* DSW A + coin */ + return (input_port_read_indexed(machine,5) << 8) + input_port_read_indexed(machine,7); /* DSW A + coin */ } case 0x01: { - return (input_port_6_word_r(machine,0,0) << 8) + input_port_8_word_r(machine,0,0); /* DSW B + coin */ + return (input_port_read_indexed(machine,6) << 8) + input_port_read_indexed(machine,8); /* DSW B + coin */ } } @@ -552,19 +552,19 @@ static READ16_HANDLER( mjnquest_input_r ) switch (mjnquest_input) { case 0x01: - return input_port_0_word_r(machine,0,mem_mask); /* IN0 */ + return input_port_read_indexed(machine,0); /* IN0 */ case 0x02: - return input_port_1_word_r(machine,0,mem_mask); /* IN1 */ + return input_port_read_indexed(machine,1); /* IN1 */ case 0x04: - return input_port_2_word_r(machine,0,mem_mask); /* IN2 */ + return input_port_read_indexed(machine,2); /* IN2 */ case 0x08: - return input_port_3_word_r(machine,0,mem_mask); /* IN3 */ + return input_port_read_indexed(machine,3); /* IN3 */ case 0x10: - return input_port_4_word_r(machine,0,mem_mask); /* IN4 */ + return input_port_read_indexed(machine,4); /* IN4 */ } @@ -583,10 +583,10 @@ static READ16_HANDLER( quizhq_input1_r ) switch (offset) { case 0x00: - return input_port_4_word_r(machine,0,mem_mask); /* DSW B */ + return input_port_read_indexed(machine,4); /* DSW B */ case 0x01: - return input_port_0_word_r(machine,0,mem_mask); /* IN0 */ + return input_port_read_indexed(machine,0); /* IN0 */ } logerror("CPU #0 PC %06x: warning - read unmapped input_r offset %06x\n",activecpu_get_pc(),offset); @@ -599,13 +599,13 @@ static READ16_HANDLER( quizhq_input2_r ) switch (offset) { case 0x00: - return input_port_3_word_r(machine,0,mem_mask); /* DSW A */ + return input_port_read_indexed(machine,3); /* DSW A */ case 0x01: - return input_port_1_word_r(machine,0,mem_mask); /* IN1 */ + return input_port_read_indexed(machine,1); /* IN1 */ case 0x02: - return input_port_2_word_r(machine,0,mem_mask); /* IN2 */ + return input_port_read_indexed(machine,2); /* IN2 */ } logerror("CPU #0 PC %06x: warning - read unmapped input_r offset %06x\n",activecpu_get_pc(),offset); @@ -618,13 +618,13 @@ static READ16_HANDLER( yesnoj_input_r ) switch (offset) { case 0x00: - return input_port_0_word_r(machine,0,mem_mask); /* IN0 */ + return input_port_read_indexed(machine,0); /* IN0 */ /* case 0x01 only used if "printer" DSW is on, and appears to be printer status byte */ case 0x02: - return input_port_1_word_r(machine,0,mem_mask); /* IN1 */ + return input_port_read_indexed(machine,1); /* IN1 */ } logerror("CPU #0 PC %06x: warning - read unmapped input_r offset %06x\n",activecpu_get_pc(),offset); @@ -642,11 +642,11 @@ static READ16_HANDLER( yesnoj_dsw_r ) if (yesnoj_dsw) { - return input_port_2_word_r(machine,0,mem_mask); + return input_port_read_indexed(machine,2); } else { - return input_port_3_word_r(machine,0,mem_mask); + return input_port_read_indexed(machine,3); } } diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c index a683c49b6ce..1e4ed3e153f 100644 --- a/src/mame/drivers/taito_z.c +++ b/src/mame/drivers/taito_z.c @@ -1029,12 +1029,12 @@ static READ16_HANDLER( contcirc_input_bypass_r ) UINT8 port = TC0220IOC_port_r(machine,0); /* read port number */ int steer = 0; - int fake = input_port_6_word_r(machine,0,0); + int fake = input_port_read_indexed(machine,6); if (!(fake &0x10)) /* Analogue steer (the real control method) */ { /* center around zero and reduce span to 0xc0 */ - steer = ((input_port_5_word_r(machine,0,0) - 0x80) * 0xc0) / 0x100; + steer = ((input_port_read_indexed(machine,5) - 0x80) * 0xc0) / 0x100; } else /* Digital steer */ @@ -1069,12 +1069,12 @@ static READ16_HANDLER( chasehq_input_bypass_r ) UINT8 port = TC0220IOC_port_r(machine,0); /* read port number */ int steer = 0; - int fake = input_port_10_word_r(machine,0,0); + int fake = input_port_read_indexed(machine,10); if (!(fake &0x10)) /* Analogue steer (the real control method) */ { /* center around zero */ - steer = input_port_9_word_r(machine,0,0) - 0x80; + steer = input_port_read_indexed(machine,9) - 0x80; } else /* Digital steer */ { @@ -1091,16 +1091,16 @@ static READ16_HANDLER( chasehq_input_bypass_r ) switch (port) { case 0x08: - return input_port_5_word_r(machine,0,mem_mask); + return input_port_read_indexed(machine,5); case 0x09: - return input_port_6_word_r(machine,0,mem_mask); + return input_port_read_indexed(machine,6); case 0x0a: - return input_port_7_word_r(machine,0,mem_mask); + return input_port_read_indexed(machine,7); case 0x0b: - return input_port_8_word_r(machine,0,mem_mask); + return input_port_read_indexed(machine,8); case 0x0c: return steer &0xff; @@ -1119,16 +1119,16 @@ static READ16_HANDLER( bshark_stick_r ) switch (offset) { case 0x00: - return input_port_5_word_r(machine,0,mem_mask); + return input_port_read_indexed(machine,5); case 0x01: - return input_port_6_word_r(machine,0,mem_mask); + return input_port_read_indexed(machine,6); case 0x02: - return input_port_7_word_r(machine,0,mem_mask); + return input_port_read_indexed(machine,7); case 0x03: - return input_port_8_word_r(machine,0,mem_mask); + return input_port_read_indexed(machine,8); } logerror("CPU #0 PC %06x: warning - read unmapped stick offset %06x\n",activecpu_get_pc(),offset); @@ -1152,16 +1152,16 @@ static READ16_HANDLER( nightstr_stick_r ) switch (offset) { case 0x00: - return nightstr_stick[(input_port_5_word_r(machine,0,mem_mask) * 0x64) / 0x100]; + return nightstr_stick[(input_port_read_indexed(machine,5) * 0x64) / 0x100]; case 0x01: - return nightstr_stick[(input_port_6_word_r(machine,0,mem_mask) * 0x64) / 0x100]; + return nightstr_stick[(input_port_read_indexed(machine,6) * 0x64) / 0x100]; case 0x02: - return input_port_7_word_r(machine,0,mem_mask); + return input_port_read_indexed(machine,7); case 0x03: - return input_port_8_word_r(machine,0,mem_mask); + return input_port_read_indexed(machine,8); } logerror("CPU #0 PC %06x: warning - read unmapped stick offset %06x\n",activecpu_get_pc(),offset); @@ -1184,12 +1184,12 @@ static WRITE16_HANDLER( bshark_stick_w ) static READ16_HANDLER( sci_steer_input_r ) { int steer = 0; - int fake = input_port_6_word_r(machine,0,0); + int fake = input_port_read_indexed(machine,6); if (!(fake &0x10)) /* Analogue steer (the real control method) */ { /* center around zero and reduce span to 0xc0 */ - steer = ((input_port_5_word_r(machine,0,0) - 0x80) * 0xc0) / 0x100; + steer = ((input_port_read_indexed(machine,5) - 0x80) * 0xc0) / 0x100; } else /* Digital steer */ { @@ -1235,16 +1235,16 @@ static READ16_HANDLER( spacegun_lightgun_r ) switch (offset) { case 0x00: - return input_port_5_word_r(machine,0,mem_mask); /* P1X */ + return input_port_read_indexed(machine,5); /* P1X */ case 0x01: - return input_port_6_word_r(machine,0,mem_mask); /* P1Y */ + return input_port_read_indexed(machine,6); /* P1Y */ case 0x02: - return input_port_7_word_r(machine,0,mem_mask); /* P2X */ + return input_port_read_indexed(machine,7); /* P2X */ case 0x03: - return input_port_8_word_r(machine,0,mem_mask); /* P2Y */ + return input_port_read_indexed(machine,8); /* P2Y */ } return 0x0; @@ -1267,12 +1267,12 @@ static WRITE16_HANDLER( spacegun_lightgun_w ) static READ16_HANDLER( dblaxle_steer_input_r ) { int steer = 0; - int fake = input_port_6_word_r(machine,0,0); + int fake = input_port_read_indexed(machine,6); if (!(fake &0x10)) /* Analogue steer (the real control method) */ { /* center around zero and reduce span to 0x80 */ - steer = ((input_port_5_word_r(machine,0,0) - 0x80) * 0x80) / 0x100; + steer = ((input_port_read_indexed(machine,5) - 0x80) * 0x80) / 0x100; } else /* Digital steer */ { diff --git a/src/mame/drivers/thunderj.c b/src/mame/drivers/thunderj.c index 7cec1f8f98e..117eef0de3d 100644 --- a/src/mame/drivers/thunderj.c +++ b/src/mame/drivers/thunderj.c @@ -129,7 +129,7 @@ static READ16_HANDLER( shared_ram_r ) UINT16 result = shared_ram[offset]; /* look for a byte access, and then check for the high bit and a TAS opcode */ - if (mem_mask != 0 && (result & ~mem_mask & 0x8080)) + if (mem_mask != 0xffff && (result & mem_mask & 0x8080)) { offs_t ppc = activecpu_get_previouspc(); if (ppc < 0xa0000) diff --git a/src/mame/drivers/tickee.c b/src/mame/drivers/tickee.c index 053d276613c..d3b70b19e94 100644 --- a/src/mame/drivers/tickee.c +++ b/src/mame/drivers/tickee.c @@ -161,12 +161,12 @@ static MACHINE_RESET( tickee ) static READ8_HANDLER( port1_r ) { - return input_port_1_r(machine, offset) | (ticket_dispenser_0_r(machine, 0) >> 5) | (ticket_dispenser_1_r(machine, 0) >> 6); + return input_port_read_indexed(machine,1) | (ticket_dispenser_0_r(machine, 0) >> 5) | (ticket_dispenser_1_r(machine, 0) >> 6); } static READ8_HANDLER( port2_r ) { - return input_port_3_r(machine, offset) | (ticket_dispenser_0_r(machine, 0) >> 5) | (ticket_dispenser_1_r(machine, 0) >> 6); + return input_port_read_indexed(machine,3) | (ticket_dispenser_0_r(machine, 0) >> 5) | (ticket_dispenser_1_r(machine, 0) >> 6); } diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c index c8de55a36fb..2201c0fbe1d 100644 --- a/src/mame/drivers/tmnt.c +++ b/src/mame/drivers/tmnt.c @@ -436,7 +436,7 @@ static WRITE16_HANDLER( ssriders_protection_w ) { if ((program_read_word(0x180006 + 128*i) >> 8) == logical_pri) { - K053245_word_w(machine,8*i,hardware_pri,0xff00); + K053245_word_w(machine,8*i,hardware_pri,0x00ff); hardware_pri++; } } @@ -491,7 +491,7 @@ static READ16_HANDLER( blswhstl_coin_r ) /* bit 3 is service button */ /* bit 6 is ??? VBLANK? OBJMPX? */ - res = input_port_2_word_r(machine,0,0); + res = input_port_read_indexed(machine,2); if (init_eeprom_count) { init_eeprom_count--; @@ -507,7 +507,7 @@ static READ16_HANDLER( blswhstl_eeprom_r ) /* bit 0 is EEPROM data */ /* bit 1 is EEPROM ready */ - res = EEPROM_read_bit() | input_port_3_word_r(machine,0,0); + res = EEPROM_read_bit() | input_port_read_indexed(machine,3); return res; } @@ -520,7 +520,7 @@ static READ16_HANDLER( ssriders_eeprom_r ) /* bit 1 is EEPROM ready */ /* bit 2 is VBLANK (???) */ /* bit 7 is service button */ - res = EEPROM_read_bit() | input_port_3_word_r(machine,0,0); + res = EEPROM_read_bit() | input_port_read_indexed(machine,3); if (init_eeprom_count) { init_eeprom_count--; @@ -539,7 +539,7 @@ static READ16_HANDLER( sunsetbl_eeprom_r ) /* bit 1 is EEPROM ready */ /* bit 2 is VBLANK (???) */ /* bit 3 is service button */ - res = EEPROM_read_bit() | input_port_3_word_r(machine,0,0); + res = EEPROM_read_bit() | input_port_read_indexed(machine,3); if (init_eeprom_count) { init_eeprom_count--; @@ -598,7 +598,7 @@ static READ16_HANDLER( thndrx2_in0_r ) { int res; - res = input_port_0_word_r(machine,0,0); + res = input_port_read_indexed(machine,0); if (init_eeprom_count) { init_eeprom_count--; @@ -616,7 +616,7 @@ static READ16_HANDLER( thndrx2_eeprom_r ) /* bit 1 is EEPROM ready */ /* bit 3 is VBLANK (???) */ /* bit 7 is service button */ - res = (EEPROM_read_bit() << 8) | input_port_1_word_r(machine,0,0); + res = (EEPROM_read_bit() << 8) | input_port_read_indexed(machine,1); toggle ^= 0x0800; return (res ^ toggle); } @@ -650,7 +650,7 @@ static READ16_HANDLER( prmrsocr_IN0_r ) /* bit 9 is service button */ int res; - res = input_port_0_word_r(machine,0,0); + res = input_port_read_indexed(machine,0); if (init_eeprom_count) { init_eeprom_count--; @@ -663,7 +663,7 @@ static READ16_HANDLER( prmrsocr_eeprom_r ) { /* bit 8 is EEPROM data */ /* bit 9 is EEPROM ready */ - return (EEPROM_read_bit() << 8) | input_port_1_word_r(machine,0,0); + return (EEPROM_read_bit() << 8) | input_port_read_indexed(machine,1); } static WRITE16_HANDLER( prmrsocr_eeprom_w ) @@ -916,7 +916,7 @@ static void tmnt2_put_word(running_machine *machine, UINT32 addr, UINT16 data) if (!(offs & 0x0031)) { offs = ((offs & 0x000e) >> 1) | ((offs & 0x1fc0) >> 3); - K053245_word_w(machine, offs, data, 0); + K053245_word_w(machine, offs, data, 0xffff); } } else if (addr >= 0x104000/2 && addr <= 0x107fff/2) sunset_104000[addr-0x104000/2] = data; diff --git a/src/mame/drivers/toratora.c b/src/mame/drivers/toratora.c index d420de4f558..b265653093a 100644 --- a/src/mame/drivers/toratora.c +++ b/src/mame/drivers/toratora.c @@ -140,16 +140,16 @@ static UINT8 last = 0; if (timer & 0x100) popmessage("watchdog!"); - if (last != (input_port_0_r(machine, 0) & 0x0f)) + if (last != (input_port_read_indexed(machine, 0) & 0x0f)) { - last = input_port_0_r(machine, 0) & 0x0f; + last = input_port_read_indexed(machine, 0) & 0x0f; cpunum_set_input_line(machine, 0, 0, PULSE_LINE); } - pia_set_input_a(0, input_port_0_r(machine, 0) & 0x0f, 0); + pia_set_input_a(0, input_port_read_indexed(machine, 0) & 0x0f, 0); - pia_set_input_ca1(0, input_port_0_r(machine, 0) & 0x10); + pia_set_input_ca1(0, input_port_read_indexed(machine, 0) & 0x10); - pia_set_input_ca2(0, input_port_0_r(machine, 0) & 0x20); + pia_set_input_ca2(0, input_port_read_indexed(machine, 0) & 0x20); } static READ8_HANDLER( timer_r ) diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c index 72aad5e0c57..e3b8c756cb3 100644 --- a/src/mame/drivers/tumbleb.c +++ b/src/mame/drivers/tumbleb.c @@ -316,7 +316,7 @@ UINT16* suprtrio_control; static WRITE16_HANDLER( tumblepb_oki_w ) { - if (mem_mask==0x0000) + if (mem_mask==0xffff) { OKIM6295_data_0_w(machine,0,data&0xff); //printf("tumbleb_oki_w %04x %04x\n",data,mem_mask); diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c index d6a6d6f6a26..998f24f0fb4 100644 --- a/src/mame/drivers/ultrsprt.c +++ b/src/mame/drivers/ultrsprt.c @@ -143,10 +143,10 @@ static READ16_HANDLER( K056800_68k_r ) static WRITE16_HANDLER( K056800_68k_w ) { if (ACCESSING_BITS_8_15) - K056800_sound_w(machine, (offset*2)+0, (data >> 8) & 0xff, 0xffff); + K056800_sound_w(machine, (offset*2)+0, (data >> 8) & 0xff, 0x00ff); if (ACCESSING_BITS_0_7) - K056800_sound_w(machine, (offset*2)+1, (data >> 0) & 0xff, 0xffff); + K056800_sound_w(machine, (offset*2)+1, (data >> 0) & 0xff, 0x00ff); } static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 16 ) diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c index aaa96fa2f04..3c9b04b797b 100644 --- a/src/mame/drivers/undrfire.c +++ b/src/mame/drivers/undrfire.c @@ -292,13 +292,13 @@ static READ32_HANDLER( undrfire_input_r ) { case 0x00: { - return (input_port_0_word_r(machine,0,0) << 16) | input_port_1_word_r(machine,0,0) | + return (input_port_read_indexed(machine,0) << 16) | input_port_read_indexed(machine,1) | (EEPROM_read_bit() << 7) | frame_counter; } case 0x01: { - return input_port_2_word_r(machine,0,0) | (coin_word << 16); + return input_port_read_indexed(machine,2) | (coin_word << 16); } } @@ -406,8 +406,8 @@ static READ32_HANDLER( undrfire_lightgun_r ) case 0x00: /* P1 */ { - x = input_port_3_word_r(machine,0,0) << 6; - y = input_port_4_word_r(machine,0,0) << 6; + x = input_port_read_indexed(machine,3) << 6; + y = input_port_read_indexed(machine,4) << 6; return ((x << 24) &0xff000000) | ((x << 8) &0xff0000) | ((y << 8) &0xff00) | ((y >> 8) &0xff) ; @@ -415,8 +415,8 @@ static READ32_HANDLER( undrfire_lightgun_r ) case 0x01: /* P2 */ { - x = input_port_5_word_r(machine,0,0) << 6; - y = input_port_6_word_r(machine,0,0) << 6; + x = input_port_read_indexed(machine,5) << 6; + y = input_port_read_indexed(machine,6) << 6; return ((x << 24) &0xff000000) | ((x << 8) &0xff0000) | ((y << 8) &0xff00) | ((y >> 8) &0xff) ; diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c index fa0b08c0d21..f196c9d7bfd 100644 --- a/src/mame/drivers/unico.c +++ b/src/mame/drivers/unico.c @@ -219,10 +219,10 @@ static READ32_HANDLER( zeropnt2_dsw1_r ) { return (input_port_read(machine, "D static READ32_HANDLER( zeropnt2_dsw2_r ) { return (input_port_read(machine, "DSW2") << 16) | 0xffff; } static READ32_HANDLER( zeropnt2_buttons_r ) { return ((input_port_read(machine, "IN7") | ((EEPROM_read_bit() & 0x01) << 7)) << 16) | 0xffff; } -static READ32_HANDLER( zeropnt2_gunx_0_msb_r ) { return (unico_gunx_0_msb_r(machine,0,0)-0x0800) << 16; } -static READ32_HANDLER( zeropnt2_guny_0_msb_r ) { return (unico_guny_0_msb_r(machine,0,0)+0x0800) << 16; } -static READ32_HANDLER( zeropnt2_gunx_1_msb_r ) { return (unico_gunx_1_msb_r(machine,0,0)-0x0800) << 16; } -static READ32_HANDLER( zeropnt2_guny_1_msb_r ) { return (unico_guny_1_msb_r(machine,0,0)+0x0800) << 16; } +static READ32_HANDLER( zeropnt2_gunx_0_msb_r ) { return (unico_gunx_0_msb_r(machine,0,0xffff)-0x0800) << 16; } +static READ32_HANDLER( zeropnt2_guny_0_msb_r ) { return (unico_guny_0_msb_r(machine,0,0xffff)+0x0800) << 16; } +static READ32_HANDLER( zeropnt2_gunx_1_msb_r ) { return (unico_gunx_1_msb_r(machine,0,0xffff)-0x0800) << 16; } +static READ32_HANDLER( zeropnt2_guny_1_msb_r ) { return (unico_guny_1_msb_r(machine,0,0xffff)+0x0800) << 16; } static READ32_HANDLER ( zeropnt2_oki0_r ) { return OKIM6295_status_0_r(machine,0) << 16; } static READ32_HANDLER ( zeropnt2_oki1_r ) { return OKIM6295_status_1_r(machine,0) << 16; } diff --git a/src/mame/drivers/vegaeo.c b/src/mame/drivers/vegaeo.c index 0266a75acb3..0ea2c6c6910 100644 --- a/src/mame/drivers/vegaeo.c +++ b/src/mame/drivers/vegaeo.c @@ -25,26 +25,26 @@ static WRITE32_HANDLER( vega_vram_w ) { switch(mem_mask) { - case 0: - vega_vram_w(machine,offset,data,0x00ffffff); - vega_vram_w(machine,offset,data,0xff00ffff); - vega_vram_w(machine,offset,data,0xffff00ff); - vega_vram_w(machine,offset,data,0xffffff00); - return; - - case 0x0000ffff: - vega_vram_w(machine,offset,data,0x00ffffff); - vega_vram_w(machine,offset,data,0xff00ffff); + case 0xffffffff: + vega_vram_w(machine,offset,data,0xff000000); + vega_vram_w(machine,offset,data,0x00ff0000); + vega_vram_w(machine,offset,data,0x0000ff00); + vega_vram_w(machine,offset,data,0x000000ff); return; case 0xffff0000: - vega_vram_w(machine,offset,data,0xffff00ff); - vega_vram_w(machine,offset,data,0xffffff00); + vega_vram_w(machine,offset,data,0xff000000); + vega_vram_w(machine,offset,data,0x00ff0000); + return; + + case 0x0000ffff: + vega_vram_w(machine,offset,data,0x0000ff00); + vega_vram_w(machine,offset,data,0x000000ff); return; default: // don't write transparent pen - if((data & ~mem_mask) == ~mem_mask) + if((data & mem_mask) == mem_mask) return; } diff --git a/src/mame/drivers/vegas.c b/src/mame/drivers/vegas.c index 5c0d12b536f..4e315b31237 100644 --- a/src/mame/drivers/vegas.c +++ b/src/mame/drivers/vegas.c @@ -637,11 +637,11 @@ static WRITE32_HANDLER( timekeeper_w ) { COMBINE_DATA(&timekeeper_nvram[offset]); if (offset*4 >= 0x7ff0) - if (LOG_TIMEKEEPER) logerror("timekeeper_w(%04X & %08X) = %08X\n", offset*4, ~mem_mask, data); + if (LOG_TIMEKEEPER) logerror("timekeeper_w(%04X & %08X) = %08X\n", offset*4, mem_mask, data); cmos_unlocked = 0; } else - logerror("%08X:timekeeper_w(%04X,%08X & %08X) without CMOS unlocked\n", activecpu_get_pc(), offset, data, ~mem_mask); + logerror("%08X:timekeeper_w(%04X,%08X & %08X) without CMOS unlocked\n", activecpu_get_pc(), offset, data, mem_mask); } @@ -1111,34 +1111,34 @@ static WRITE32_HANDLER( nile_w ) { case NREG_CPUSTAT+0: /* CPU status */ case NREG_CPUSTAT+1: /* CPU status */ - if (LOG_NILE) logerror("%08X:NILE WRITE: CPU status(%03X) = %08X & %08X\n", activecpu_get_pc(), offset*4, data, ~mem_mask); + if (LOG_NILE) logerror("%08X:NILE WRITE: CPU status(%03X) = %08X & %08X\n", activecpu_get_pc(), offset*4, data, mem_mask); logit = 0; break; case NREG_INTCTRL+0: /* Interrupt control */ case NREG_INTCTRL+1: /* Interrupt control */ - if (LOG_NILE) logerror("%08X:NILE WRITE: interrupt control(%03X) = %08X & %08X\n", activecpu_get_pc(), offset*4, data, ~mem_mask); + if (LOG_NILE) logerror("%08X:NILE WRITE: interrupt control(%03X) = %08X & %08X\n", activecpu_get_pc(), offset*4, data, mem_mask); logit = 0; update_nile_irqs(); break; case NREG_INTSTAT0+0: /* Interrupt status 0 */ case NREG_INTSTAT0+1: /* Interrupt status 0 */ - if (LOG_NILE) logerror("%08X:NILE WRITE: interrupt status 0(%03X) = %08X & %08X\n", activecpu_get_pc(), offset*4, data, ~mem_mask); + if (LOG_NILE) logerror("%08X:NILE WRITE: interrupt status 0(%03X) = %08X & %08X\n", activecpu_get_pc(), offset*4, data, mem_mask); logit = 0; update_nile_irqs(); break; case NREG_INTSTAT1+0: /* Interrupt status 1 */ case NREG_INTSTAT1+1: /* Interrupt status 1 */ - if (LOG_NILE) logerror("%08X:NILE WRITE: interrupt status 1/enable(%03X) = %08X & %08X\n", activecpu_get_pc(), offset*4, data, ~mem_mask); + if (LOG_NILE) logerror("%08X:NILE WRITE: interrupt status 1/enable(%03X) = %08X & %08X\n", activecpu_get_pc(), offset*4, data, mem_mask); logit = 0; update_nile_irqs(); break; case NREG_INTCLR+0: /* Interrupt clear */ case NREG_INTCLR+1: /* Interrupt clear */ - if (LOG_NILE) logerror("%08X:NILE WRITE: interrupt clear(%03X) = %08X & %08X\n", activecpu_get_pc(), offset*4, data, ~mem_mask); + if (LOG_NILE) logerror("%08X:NILE WRITE: interrupt clear(%03X) = %08X & %08X\n", activecpu_get_pc(), offset*4, data, mem_mask); logit = 0; nile_irq_state &= ~(nile_regs[offset] & ~0xf00); update_nile_irqs(); @@ -1146,7 +1146,7 @@ static WRITE32_HANDLER( nile_w ) case NREG_INTPPES+0: /* PCI Interrupt control */ case NREG_INTPPES+1: /* PCI Interrupt control */ - if (LOG_NILE) logerror("%08X:NILE WRITE: PCI interrupt control(%03X) = %08X & %08X\n", activecpu_get_pc(), offset*4, data, ~mem_mask); + if (LOG_NILE) logerror("%08X:NILE WRITE: PCI interrupt control(%03X) = %08X & %08X\n", activecpu_get_pc(), offset*4, data, mem_mask); logit = 0; break; @@ -1171,7 +1171,7 @@ static WRITE32_HANDLER( nile_w ) case NREG_T2CTRL+1: /* general purpose timer control (control bits) */ case NREG_T3CTRL+1: /* watchdog timer control (control bits) */ which = (offset - NREG_T0CTRL) / 4; - if (LOG_NILE) logerror("%08X:NILE WRITE: timer %d control(%03X) = %08X & %08X\n", activecpu_get_pc(), which, offset*4, data, ~mem_mask); + if (LOG_NILE) logerror("%08X:NILE WRITE: timer %d control(%03X) = %08X & %08X\n", activecpu_get_pc(), which, offset*4, data, mem_mask); logit = 0; /* timer just enabled? */ @@ -1200,7 +1200,7 @@ static WRITE32_HANDLER( nile_w ) case NREG_T2CNTR: /* general purpose timer control (counter) */ case NREG_T3CNTR: /* watchdog timer control (counter) */ which = (offset - NREG_T0CTRL) / 4; - if (LOG_TIMERS) logerror("%08X:NILE WRITE: timer %d counter(%03X) = %08X & %08X\n", activecpu_get_pc(), which, offset*4, data, ~mem_mask); + if (LOG_TIMERS) logerror("%08X:NILE WRITE: timer %d counter(%03X) = %08X & %08X\n", activecpu_get_pc(), which, offset*4, data, mem_mask); logit = 0; if (nile_regs[offset - 1] & 1) @@ -1255,7 +1255,7 @@ static WRITE32_HANDLER( nile_w ) } if (LOG_NILE && logit) - logerror("%06X:nile write to offset %03X = %08X & %08X\n", activecpu_get_pc(), offset*4, data, ~mem_mask); + logerror("%06X:nile write to offset %03X = %08X & %08X\n", activecpu_get_pc(), offset*4, data, mem_mask); } diff --git a/src/mame/drivers/vicdual.c b/src/mame/drivers/vicdual.c index 3785219aed9..c6ae035e31a 100644 --- a/src/mame/drivers/vicdual.c +++ b/src/mame/drivers/vicdual.c @@ -270,8 +270,8 @@ static READ8_HANDLER( depthch_io_r ) { UINT8 ret = 0; - if (offset & 0x01) ret = input_port_0_r(machine, 0); - if (offset & 0x08) ret = input_port_1_r(machine, 0); + if (offset & 0x01) ret = input_port_read_indexed(machine, 0); + if (offset & 0x08) ret = input_port_read_indexed(machine, 1); return ret; } @@ -555,9 +555,9 @@ static READ8_HANDLER( sspaceat_io_r ) { UINT8 ret = 0; - if (offset & 0x01) ret = input_port_0_r(machine, 0); - if (offset & 0x04) ret = input_port_1_r(machine, 0); - if (offset & 0x08) ret = input_port_2_r(machine, 0); + if (offset & 0x01) ret = input_port_read_indexed(machine,0); + if (offset & 0x04) ret = input_port_read_indexed(machine,1); + if (offset & 0x08) ret = input_port_read_indexed(machine,2); return ret; } @@ -744,10 +744,10 @@ static READ8_HANDLER( headon2_io_r ) { UINT8 ret = 0; - if (offset & 0x01) ret = input_port_0_r(machine, 0); + if (offset & 0x01) ret = input_port_read_indexed(machine,0); if (offset & 0x02) /* schematics show this as in input port, but never read from */ - if (offset & 0x04) ret = input_port_1_r(machine, 0); - if (offset & 0x08) ret = input_port_2_r(machine, 0); + if (offset & 0x04) ret = input_port_read_indexed(machine,1); + if (offset & 0x08) ret = input_port_read_indexed(machine,2); if (offset & 0x12) logerror("********* Read from port %x\n", offset); return ret; diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c index d0df8d4eea4..b55d53eea35 100644 --- a/src/mame/drivers/wecleman.c +++ b/src/mame/drivers/wecleman.c @@ -408,9 +408,9 @@ static READ16_HANDLER( selected_ip_r ) { switch ( (wecleman_selected_ip >> 5) & 3 ) { // From WEC Le Mans Schems: - case 0: return input_port_4_r(machine, offset); // Accel - Schems: Accelevr + case 0: return input_port_read_indexed(machine,4); // Accel - Schems: Accelevr case 1: return ~0; // ????? - Schems: Not Used - case 2: return input_port_5_r(machine, offset); // Wheel - Schems: Handlevr + case 2: return input_port_read_indexed(machine,5); // Wheel - Schems: Handlevr case 3: return ~0; // Table - Schems: Turnvr default: return ~0; diff --git a/src/mame/drivers/wwfwfest.c b/src/mame/drivers/wwfwfest.c index eaa6829b30a..9bf190854b5 100644 --- a/src/mame/drivers/wwfwfest.c +++ b/src/mame/drivers/wwfwfest.c @@ -376,7 +376,7 @@ static const struct YM2151interface ym2151_interface = static VIDEO_EOF( wwfwfest ) { - buffer_spriteram16_w(machine,0,0,0); + buffer_spriteram16_w(machine,0,0,0xffff); } /******************************************************************************* diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c index 1183357a945..cadb55e26a5 100644 --- a/src/mame/drivers/xexex.c +++ b/src/mame/drivers/xexex.c @@ -207,7 +207,7 @@ static READ16_HANDLER( control1_r ) /* bit 0 is EEPROM data */ /* bit 1 is EEPROM ready */ /* bit 3 is service button */ - res = EEPROM_read_bit() | input_port_1_r(machine, 0); + res = EEPROM_read_bit() | input_port_read_indexed(machine,1); if (init_eeprom_count) { diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c index 8a56d13285c..3c13552bf07 100644 --- a/src/mame/drivers/xmen.c +++ b/src/mame/drivers/xmen.c @@ -76,7 +76,7 @@ logerror("%06x eeprom_r\n",activecpu_get_pc()); /* bit 6 is EEPROM data */ /* bit 7 is EEPROM ready */ /* bit 14 is service button */ - res = (EEPROM_read_bit() << 6) | input_port_2_word_r(machine,0,0); + res = (EEPROM_read_bit() << 6) | input_port_read_indexed(machine,2); if (init_eeprom_count) { init_eeprom_count--; @@ -93,7 +93,7 @@ logerror("%06x xmen6p_eeprom_r\n",activecpu_get_pc()); /* bit 6 is EEPROM data */ /* bit 7 is EEPROM ready */ /* bit 14 is service button */ - res = (EEPROM_read_bit() << 6) | input_port_2_word_r(machine,0,0); + res = (EEPROM_read_bit() << 6) | input_port_read_indexed(machine,2); if (init_eeprom_count) { init_eeprom_count--; diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c index de6578557dc..88649358bb2 100644 --- a/src/mame/drivers/zn.c +++ b/src/mame/drivers/zn.c @@ -1194,7 +1194,7 @@ static READ32_HANDLER( taitofx1a_ymsound_r ) static WRITE32_HANDLER( taitofx1a_ymsound_w ) { - if (mem_mask == 0xffff0000) + if (mem_mask == 0x0000ffff) { taitosound_port_w(machine, 0, data&0xff); } @@ -1678,7 +1678,7 @@ static void atpsx_dma_read( UINT32 n_address, INT32 n_size ) n_size <<= 2; while( n_size > 0 ) { - psxwritebyte( n_address, ide_controller32_r( ide, 0x1f0 / 4, 0xffffff00 ) ); + psxwritebyte( n_address, ide_controller32_r( ide, 0x1f0 / 4, 0x000000ff ) ); n_address++; n_size--; } @@ -2132,12 +2132,12 @@ static READ32_DEVICE_HANDLER( jdredd_ide_r ) int shift = 0; int ret; - if (mem_mask == 0xff00ffff) + if (mem_mask == 0x00ff0000) { shift = 16; reg++; } - else if (mem_mask == 0xffff0000) // code sometimes reads shorts from the DATA register + else if (mem_mask == 0x0000ffff) // code sometimes reads shorts from the DATA register { if (reg != 0) { @@ -2156,7 +2156,7 @@ static WRITE32_DEVICE_HANDLER( jdredd_ide_w ) { int reg = offset*2; - if (mem_mask == 0xff00ffff) + if (mem_mask == 0x00ff0000) { data >>= 16; reg++; diff --git a/src/mame/machine/amiga.c b/src/mame/machine/amiga.c index f53179b523a..1f08008c6fd 100644 --- a/src/mame/machine/amiga.c +++ b/src/mame/machine/amiga.c @@ -320,7 +320,7 @@ static void amiga_m68k_reset(void) } else { - amiga_cia_w(Machine, 0x1001/2, 1, 0); + amiga_cia_w(Machine, 0x1001/2, 1, 0xffff); } if (activecpu_get_pc() < 0x80000) @@ -345,7 +345,7 @@ MACHINE_RESET( amiga ) } else { - amiga_cia_w(machine, 0x1001/2, 1, 0); + amiga_cia_w(machine, 0x1001/2, 1, 0xffff); } /* call the system-specific callback */ @@ -372,7 +372,7 @@ static TIMER_CALLBACK( scanline_callback ) if (scanline == 0) { /* signal VBLANK IRQ */ - amiga_custom_w(machine, REG_INTREQ, 0x8000 | INTENA_VERTB, 0); + amiga_custom_w(machine, REG_INTREQ, 0x8000 | INTENA_VERTB, 0xffff); /* clock the first CIA TOD */ cia_clock_tod(0); @@ -982,7 +982,7 @@ static TIMER_CALLBACK( amiga_blitter_proc ) CUSTOM_REG(REG_DMACON) &= ~0x4000; /* signal an interrupt */ - amiga_custom_w(machine, REG_INTREQ, 0x8000 | INTENA_BLIT, 0); + amiga_custom_w(machine, REG_INTREQ, 0x8000 | INTENA_BLIT, 0xffff); /* reset the blitter timer */ timer_reset( amiga_blitter_timer, attotime_never); @@ -1083,7 +1083,7 @@ READ16_HANDLER( amiga_cia_r ) data = cia_read(which, offset >> 7); if (LOG_CIA) - logerror("%06x:cia_%c_read(%03x) = %04x & %04x\n", safe_activecpu_get_pc(), 'A' + ((~offset & 0x0800) >> 11), offset * 2, data << shift, mem_mask ^ 0xffff); + logerror("%06x:cia_%c_read(%03x) = %04x & %04x\n", safe_activecpu_get_pc(), 'A' + ((~offset & 0x0800) >> 11), offset * 2, data << shift, mem_mask); return data << shift; } @@ -1101,7 +1101,7 @@ WRITE16_HANDLER( amiga_cia_w ) int which; if (LOG_CIA) - logerror("%06x:cia_%c_write(%03x) = %04x & %04x\n", safe_activecpu_get_pc(), 'A' + ((~offset & 0x0800) >> 11), offset * 2, data, mem_mask ^ 0xffff); + logerror("%06x:cia_%c_write(%03x) = %04x & %04x\n", safe_activecpu_get_pc(), 'A' + ((~offset & 0x0800) >> 11), offset * 2, data, mem_mask); /* offsets 0000-07ff reference CIA B, and are accessed via the MSB */ if ((offset & 0x0800) == 0) @@ -1135,13 +1135,13 @@ WRITE16_HANDLER( amiga_cia_w ) static void amiga_cia_0_irq(int state) { - amiga_custom_w(Machine, REG_INTREQ, (state ? 0x8000 : 0x0000) | INTENA_PORTS, 0); + amiga_custom_w(Machine, REG_INTREQ, (state ? 0x8000 : 0x0000) | INTENA_PORTS, 0xffff); } static void amiga_cia_1_irq(int state) { - amiga_custom_w(Machine, REG_INTREQ, (state ? 0x8000 : 0x0000) | INTENA_EXTER, 0); + amiga_custom_w(Machine, REG_INTREQ, (state ? 0x8000 : 0x0000) | INTENA_EXTER, 0xffff); } @@ -1286,7 +1286,7 @@ static TIMER_CALLBACK( finish_serial_write ) CUSTOM_REG(REG_SERDATR) |= 0x3000; /* signal an interrupt */ - amiga_custom_w(machine, REG_INTREQ, 0x8000 | INTENA_TBE, 0); + amiga_custom_w(machine, REG_INTREQ, 0x8000 | INTENA_TBE, 0xffff); } @@ -1522,7 +1522,7 @@ void amiga_serial_in_w(UINT16 data) } /* signal an interrupt */ - amiga_custom_w(Machine, REG_INTREQ, 0x8000 | INTENA_RBF, 0); + amiga_custom_w(Machine, REG_INTREQ, 0x8000 | INTENA_RBF, 0xffff); } @@ -1734,7 +1734,7 @@ WRITE16_HANDLER( amiga_autoconfig_w ) { int move_to_next = FALSE; - logerror("autoconfig_w(%02X) = %04X & %04X\n", offset, data, mem_mask ^ 0xffff); + logerror("autoconfig_w(%02X) = %04X & %04X\n", offset, data, mem_mask); /* if no current device, bail */ if (!cur_autoconfig || !ACCESSING_BITS_8_15) diff --git a/src/mame/machine/arkanoid.c b/src/mame/machine/arkanoid.c index b6135157b25..de9f4c3b0e4 100644 --- a/src/mame/machine/arkanoid.c +++ b/src/mame/machine/arkanoid.c @@ -121,7 +121,7 @@ WRITE8_HANDLER( arkanoid_68705_ddrC_w ) READ8_HANDLER( arkanoid_68705_input_0_r ) { - int res = input_port_0_r(machine,offset) & 0x3f; + int res = input_port_read_indexed(machine,0) & 0x3f; /* bit 0x40 comes from the sticky bit */ if (!z80write) res |= 0x40; @@ -136,11 +136,11 @@ READ8_HANDLER( arkanoid_input_2_r ) { if (arkanoid_paddle_select) { - arkanoid_paddle_value = input_port_3_r(machine,offset); + arkanoid_paddle_value = input_port_read_indexed(machine,3); } else { - arkanoid_paddle_value = input_port_2_r(machine,offset); + arkanoid_paddle_value = input_port_read_indexed(machine,2); } return arkanoid_paddle_value; diff --git a/src/mame/machine/asic65.c b/src/mame/machine/asic65.c index 07ffcffaf45..591ffa17938 100644 --- a/src/mame/machine/asic65.c +++ b/src/mame/machine/asic65.c @@ -158,7 +158,7 @@ void asic65_reset(int state) else if (!state && asic65_reset_state) { if (asic65_command != -1) - asic65_data_w(Machine, 1, asic65_command, 0); + asic65_data_w(Machine, 1, asic65_command, 0xffff); } /* update the state */ diff --git a/src/mame/machine/atarifb.c b/src/mame/machine/atarifb.c index 5e6ed10b8de..5e2947f22c1 100644 --- a/src/mame/machine/atarifb.c +++ b/src/mame/machine/atarifb.c @@ -152,7 +152,7 @@ READ8_HANDLER( atarifb_in0_r ) (sign_x_2 >> 6) | (sign_y_1 >> 5) | (sign_x_1 >> 4) | - input_port_0_r(machine, offset); + input_port_read_indexed(machine,0); return val; } else @@ -184,7 +184,7 @@ READ8_HANDLER( atarifb_in2_r ) { if ((CTRLD & 0x20)==0x00) { - return input_port_1_r(machine, offset); + return input_port_read_indexed(machine,1); } else { @@ -282,7 +282,7 @@ READ8_HANDLER( atarifb4_in2_r ) { if ((CTRLD & 0x40)==0x00) { - return input_port_2_r(machine, offset); + return input_port_read_indexed(machine,2); } else if ((CTRLD & 0x60) == 0x60) /* LD1 and LD2 both high, return Team 2 right player (player 3) */ diff --git a/src/mame/machine/atarigen.c b/src/mame/machine/atarigen.c index ecfbaca2b75..4f6a4238f24 100644 --- a/src/mame/machine/atarigen.c +++ b/src/mame/machine/atarigen.c @@ -521,7 +521,7 @@ static OPBASE_HANDLER( atarigen_slapstic_setopbase ) { atarigen_slapstic_last_pc = pc; atarigen_slapstic_last_address = address; - atarigen_slapstic_r(machine, (address >> 1) & 0x3fff, 0); + atarigen_slapstic_r(machine, (address >> 1) & 0x3fff, 0xffff); } return ~0; } @@ -733,21 +733,21 @@ WRITE32_HANDLER( atarigen_sound_upper32_w ) READ16_HANDLER( atarigen_sound_r ) { atarigen_sound_to_cpu_ready = 0; - atarigen_sound_int_ack_w(machine, 0, 0, 0); + atarigen_sound_int_ack_w(machine, 0, 0, 0xffff); return atarigen_sound_to_cpu | 0xff00; } READ16_HANDLER( atarigen_sound_upper_r ) { atarigen_sound_to_cpu_ready = 0; - atarigen_sound_int_ack_w(machine, 0, 0, 0); + atarigen_sound_int_ack_w(machine, 0, 0, 0xffff); return (atarigen_sound_to_cpu << 8) | 0x00ff; } READ32_HANDLER( atarigen_sound_upper32_r ) { atarigen_sound_to_cpu_ready = 0; - atarigen_sound_int_ack32_w(machine, 0, 0, 0); + atarigen_sound_int_ack32_w(machine, 0, 0, 0xffff); return (atarigen_sound_to_cpu << 24) | 0x00ffffff; } @@ -808,7 +808,7 @@ static TIMER_CALLBACK( delayed_sound_reset ) /* reset the sound write state */ atarigen_sound_to_cpu_ready = 0; - atarigen_sound_int_ack_w(machine, 0, 0, 0); + atarigen_sound_int_ack_w(machine, 0, 0, 0xffff); /* allocate a high frequency timer until a response is generated */ /* the main CPU is *very* sensistive to the timing of the response */ @@ -1237,7 +1237,7 @@ static void atarivc_common_w(const device_config *screen, offs_t offset, UINT16 /* scanline IRQ ack here */ case 0x1e: - atarigen_scanline_int_ack_w(screen->machine, 0, 0, 0); + atarigen_scanline_int_ack_w(screen->machine, 0, 0, 0xffff); break; /* log anything else */ diff --git a/src/mame/machine/balsente.c b/src/mame/machine/balsente.c index e59a9162904..d20a29c9112 100644 --- a/src/mame/machine/balsente.c +++ b/src/mame/machine/balsente.c @@ -1219,22 +1219,22 @@ READ8_HANDLER( grudge_steering_r ) READ8_HANDLER( shrike_shared_6809_r ) { - UINT16 mem_mask = offset & 1 ? 0xff : 0xff00; + UINT16 mem_mask = offset & 1 ? 0xff00 : 0x00ff; switch( offset ) { case 6: // return OK for 68k status register until motors hooked up return 0; default: - return ( shrike_shared[offset >> 1] & mem_mask ) >> ( ~mem_mask & 8 ); + return ( shrike_shared[offset >> 1] & ~mem_mask ) >> ( mem_mask & 8 ); } } WRITE8_HANDLER( shrike_shared_6809_w ) { - UINT16 mem_mask = offset & 1 ? 0xff : 0xff00; - shrike_shared[offset >> 1] = ( shrike_shared[offset >> 1] & ~mem_mask ) | ( data << ( ~mem_mask & 0x8 ) ); + UINT16 mem_mask = offset & 1 ? 0xff00 : 0x00ff; + shrike_shared[offset >> 1] = ( shrike_shared[offset >> 1] & mem_mask ) | ( data << ( mem_mask & 0x8 ) ); } // uses movep, so writes even 8 bit addresses to odd 16 bit addresses, reads as 16 bit from odd addresses @@ -1246,6 +1246,6 @@ WRITE16_HANDLER( shrike_io_68k_w ) READ16_HANDLER( shrike_io_68k_r ) { - return ( shrike_io[offset] & ~mem_mask ) >> ( 8 & mem_mask ); + return ( shrike_io[offset] & mem_mask ) >> ( 8 & ~mem_mask ); } diff --git a/src/mame/machine/bsktball.c b/src/mame/machine/bsktball.c index bdb7fe98ad9..8fef24ef5f5 100644 --- a/src/mame/machine/bsktball.c +++ b/src/mame/machine/bsktball.c @@ -73,10 +73,10 @@ READ8_HANDLER( bsktball_in0_r ) int p2_vert; int temp; - p1_horiz = input_port_0_r(machine, offset); - p1_vert = input_port_1_r(machine, offset); - p2_horiz = input_port_2_r(machine, offset); - p2_vert = input_port_3_r(machine, offset); + p1_horiz = input_port_read_indexed(machine,0); + p1_vert = input_port_read_indexed(machine,1); + p2_horiz = input_port_read_indexed(machine,2); + p2_vert = input_port_read_indexed(machine,3); /* Set direction bits */ @@ -146,7 +146,7 @@ READ8_HANDLER( bsktball_in0_r ) } else { - temp = input_port_4_r(machine, offset) & 0x0F; + temp = input_port_read_indexed(machine, 4) & 0x0F; /* Remap button 1 back to the Start button */ /* NOTE: This is an ADDED feature, not a part of the original hardware! */ temp = (temp) & (temp>>2); diff --git a/src/mame/machine/cubocd32.c b/src/mame/machine/cubocd32.c index fe91915e23c..047efa34d3f 100644 --- a/src/mame/machine/cubocd32.c +++ b/src/mame/machine/cubocd32.c @@ -361,7 +361,7 @@ static void akiko_set_cd_status( UINT32 status ) #if LOG_AKIKO_CD logerror( "Akiko CD IRQ\n" ); #endif - amiga_custom_w(Machine, REG_INTREQ, 0x8000 | INTENA_PORTS, 0); + amiga_custom_w(Machine, REG_INTREQ, 0x8000 | INTENA_PORTS, 0xffff); } } diff --git a/src/mame/machine/dc.c b/src/mame/machine/dc.c index f114ae6a444..1ac6bacd0d4 100644 --- a/src/mame/machine/dc.c +++ b/src/mame/machine/dc.c @@ -142,7 +142,7 @@ INLINE int decode_reg_64(UINT32 offset, UINT64 mem_mask, UINT64 *shift) *shift = 0; // non 32-bit accesses have not yet been seen here, we need to know when they are - if ((mem_mask != U64(0x00000000ffffffff)) && (mem_mask != U64(0xffffffff00000000))) + if ((mem_mask != U64(0xffffffff00000000)) && (mem_mask != U64(0x00000000ffffffff))) { mame_printf_verbose("Wrong mask! (PC=%x)\n", activecpu_get_pc()); #ifdef ENABLE_DEBUGGER @@ -150,7 +150,7 @@ INLINE int decode_reg_64(UINT32 offset, UINT64 mem_mask, UINT64 *shift) #endif } - if (mem_mask == U64(0x00000000ffffffff)) + if (mem_mask == U64(0xffffffff00000000)) { reg++; *shift = 32; @@ -633,7 +633,7 @@ READ64_HANDLER( dc_gdrom_r ) { UINT32 off; - if ((int)mem_mask & 1) + if ((int)~mem_mask & 1) { off=(offset << 1) | 1; } @@ -654,7 +654,7 @@ WRITE64_HANDLER( dc_gdrom_w ) { UINT32 dat,off; - if ((int)mem_mask & 1) + if ((int)~mem_mask & 1) { dat=(UINT32)(data >> 32); off=(offset << 1) | 1; @@ -748,7 +748,7 @@ READ64_HANDLER( dc_modem_r ) // from ElSemi: this makes Atomiswave do it's "verbose boot" with a Sammy logo and diagnostics instead of just running the cart. // our PVR emulation is apparently not good enough for that to work yet though. - if ((reg == 0x280/4) && (mem_mask == U64(0xffffffff00000000))) + if ((reg == 0x280/4) && (mem_mask == U64(0x00000000ffffffff))) { return 1; } @@ -850,7 +850,7 @@ READ64_HANDLER( dc_aica_reg_r ) // mame_printf_verbose("AICA REG: [%08x] read %llx, mask %llx\n", 0x700000+reg*4, (UINT64)offset, mem_mask); - return (UINT64) AICA_0_r(machine, offset*2, 0x0000)<primary_screen, video_screen_get_vpos(machine->primary_screen) - 1); tms34010_io_register_w(machine, offset, data, mem_mask); diff --git a/src/mame/machine/midwayic.c b/src/mame/machine/midwayic.c index b239f4d84a2..49e48263103 100644 --- a/src/mame/machine/midwayic.c +++ b/src/mame/machine/midwayic.c @@ -853,9 +853,9 @@ READ32_HANDLER( midway_ioasic_packed_r ) { UINT32 result = 0; if (ACCESSING_BITS_0_15) - result |= midway_ioasic_r(machine, offset*2, 0xffff0000) & 0xffff; + result |= midway_ioasic_r(machine, offset*2, 0x0000ffff) & 0xffff; if (ACCESSING_BITS_16_31) - result |= (midway_ioasic_r(machine, offset*2+1, 0xffff0000) & 0xffff) << 16; + result |= (midway_ioasic_r(machine, offset*2+1, 0x0000ffff) & 0xffff) << 16; return result; } @@ -949,9 +949,9 @@ READ32_HANDLER( midway_ioasic_r ) WRITE32_HANDLER( midway_ioasic_packed_w ) { if (ACCESSING_BITS_0_15) - midway_ioasic_w(machine, offset*2, data & 0xffff, 0xffff0000); + midway_ioasic_w(machine, offset*2, data & 0xffff, 0x0000ffff); if (ACCESSING_BITS_16_31) - midway_ioasic_w(machine, offset*2+1, data >> 16, 0xffff0000); + midway_ioasic_w(machine, offset*2+1, data >> 16, 0x0000ffff); } @@ -1075,11 +1075,11 @@ READ32_DEVICE_HANDLER( midway_ide_asic_r ) /* offset 0 is a special case */ if (offset == 0) - result = ide_controller32_r(device, ideoffs, 0xffff0000); + result = ide_controller32_r(device, ideoffs, 0x0000ffff); /* everything else is byte-sized */ else - result = ide_controller32_r(device, ideoffs, ~(0xff << shift)) >> shift; + result = ide_controller32_r(device, ideoffs, 0xff << shift) >> shift; return result; } @@ -1092,9 +1092,9 @@ WRITE32_DEVICE_HANDLER( midway_ide_asic_w ) /* offset 0 is a special case */ if (offset == 0) - ide_controller32_w(device, ideoffs, data, 0xffff0000); + ide_controller32_w(device, ideoffs, data, 0x0000ffff); /* everything else is byte-sized */ else - ide_controller32_w(device, ideoffs, data << shift, ~(0xff << shift)); + ide_controller32_w(device, ideoffs, data << shift, 0xff << shift); } diff --git a/src/mame/machine/midwunit.c b/src/mame/machine/midwunit.c index b6148e785ee..ab6515b2c08 100644 --- a/src/mame/machine/midwunit.c +++ b/src/mame/machine/midwunit.c @@ -191,7 +191,7 @@ READ16_HANDLER( midwunit_io_r ) return input_port_read_indexed(machine, offset); case 4: - return (midway_serial_pic_status_r() << 12) | midwunit_sound_state_r(machine,0,0); + return (midway_serial_pic_status_r() << 12) | midwunit_sound_state_r(machine,0,0xffff); default: logerror("%08X:Unknown I/O read from %d\n", activecpu_get_pc(), offset); @@ -281,7 +281,7 @@ READ16_HANDLER( midxunit_uart_r ) /* non-loopback case: bit 0 means data ready, bit 2 means ok to send */ else { - int temp = midwunit_sound_state_r(machine, 0, 0); + int temp = midwunit_sound_state_r(machine, 0, 0xffff); result |= (temp & 0x800) >> 9; result |= (~temp & 0x400) >> 10; timer_call_after_resynch(NULL, 0, 0); @@ -296,7 +296,7 @@ READ16_HANDLER( midxunit_uart_r ) /* non-loopback case: read from the DCS system */ else - result = midwunit_sound_r(machine, 0, 0); + result = midwunit_sound_r(machine, 0, 0xffff); break; case 5: /* register 5 seems to be like 3, but with in/out swapped */ @@ -308,7 +308,7 @@ READ16_HANDLER( midxunit_uart_r ) /* non-loopback case: bit 0 means data ready, bit 2 means ok to send */ else { - int temp = midwunit_sound_state_r(machine, 0, 0); + int temp = midwunit_sound_state_r(machine, 0, 0xffff); result |= (temp & 0x800) >> 11; result |= (~temp & 0x400) >> 8; timer_call_after_resynch(NULL, 0, 0); diff --git a/src/mame/machine/n64.c b/src/mame/machine/n64.c index f8ae451e1a0..93b650efe15 100644 --- a/src/mame/machine/n64.c +++ b/src/mame/machine/n64.c @@ -1534,7 +1534,7 @@ static UINT32 cic_status = 0x00000000; READ32_HANDLER( n64_pif_ram_r ) { - /*mame_printf_debug( "pif_ram_r: %08X, %08X = %08X\n", offset << 2, mem_mask, ( ( pif_ram[offset*4+0] << 24 ) | ( pif_ram[offset*4+1] << 16 ) | ( pif_ram[offset*4+2] << 8 ) | ( pif_ram[offset*4+3] << 0 ) ) & ~mem_mask );*/ + /*mame_printf_debug( "pif_ram_r: %08X, %08X = %08X\n", offset << 2, mem_mask, ( ( pif_ram[offset*4+0] << 24 ) | ( pif_ram[offset*4+1] << 16 ) | ( pif_ram[offset*4+2] << 8 ) | ( pif_ram[offset*4+3] << 0 ) ) & mem_mask );*/ if( offset == ( 0x24 / 4 ) ) { cic_status = 0x00000080; @@ -1543,26 +1543,26 @@ READ32_HANDLER( n64_pif_ram_r ) { return cic_status; } - return ( ( pif_ram[offset*4+0] << 24 ) | ( pif_ram[offset*4+1] << 16 ) | ( pif_ram[offset*4+2] << 8 ) | ( pif_ram[offset*4+3] << 0 ) ) & ~mem_mask; + return ( ( pif_ram[offset*4+0] << 24 ) | ( pif_ram[offset*4+1] << 16 ) | ( pif_ram[offset*4+2] << 8 ) | ( pif_ram[offset*4+3] << 0 ) ) & mem_mask; } WRITE32_HANDLER( n64_pif_ram_w ) { /*mame_printf_debug("pif_ram_w: %08X, %08X, %08X\n", data, offset << 4, mem_mask);*/ /* - if( (~mem_mask) & 0xff000000 ) + if( mem_mask & 0xff000000 ) { pif_ram[offset*4+0] = ( data >> 24 ) & 0x000000ff; } - if( (~mem_mask) & 0x00ff0000 ) + if( mem_mask & 0x00ff0000 ) { pif_ram[offset*4+1] = ( data >> 16 ) & 0x000000ff; } - if( (~mem_mask) & 0x0000ff00 ) + if( mem_mask & 0x0000ff00 ) { pif_ram[offset*4+2] = ( data >> 8 ) & 0x000000ff; } - if( (~mem_mask) & 0x000000ff ) + if( mem_mask & 0x000000ff ) { pif_ram[offset*4+3] = ( data >> 0 ) & 0x000000ff; } diff --git a/src/mame/machine/psx.c b/src/mame/machine/psx.c index c520f22b35e..ec2402d1dfb 100644 --- a/src/mame/machine/psx.c +++ b/src/mame/machine/psx.c @@ -86,13 +86,13 @@ WRITE32_HANDLER( psx_irq_w ) switch( offset ) { case 0x00: - verboselog( 2, "psx irq data ( %08x, %08x ) %08x -> %08x\n", data, mem_mask, m_n_irqdata, ( m_n_irqdata & mem_mask ) | ( m_n_irqdata & m_n_irqmask & data ) ); - m_n_irqdata = ( m_n_irqdata & mem_mask ) | ( m_n_irqdata & m_n_irqmask & data ); + verboselog( 2, "psx irq data ( %08x, %08x ) %08x -> %08x\n", data, mem_mask, m_n_irqdata, ( m_n_irqdata & ~mem_mask ) | ( m_n_irqdata & m_n_irqmask & data ) ); + m_n_irqdata = ( m_n_irqdata & ~mem_mask ) | ( m_n_irqdata & m_n_irqmask & data ); psx_irq_update(); break; case 0x01: - verboselog( 2, "psx irq mask ( %08x, %08x ) %08x -> %08x\n", data, mem_mask, m_n_irqmask, ( m_n_irqmask & mem_mask ) | data ); - m_n_irqmask = ( m_n_irqmask & mem_mask ) | data; + verboselog( 2, "psx irq mask ( %08x, %08x ) %08x -> %08x\n", data, mem_mask, m_n_irqmask, ( m_n_irqmask & ~mem_mask ) | data ); + m_n_irqmask = ( m_n_irqmask & ~mem_mask ) | data; if( ( m_n_irqmask & ~( 0x1 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80 | 0x100 | 0x200 | 0x400 ) ) != 0 ) { verboselog( 0, "psx_irq_w( %08x, %08x, %08x ) unknown irq\n", offset, data, mem_mask ); @@ -403,13 +403,13 @@ WRITE32_HANDLER( psx_dma_w ) { case 0x0: verboselog( 1, "psx_dma_w( %04x, %08x, %08x ) dpcp\n", offset, data, mem_mask ); - m_n_dpcp = ( m_n_dpcp & mem_mask ) | data; + m_n_dpcp = ( m_n_dpcp & ~mem_mask ) | data; break; case 0x1: - m_n_dicr = ( m_n_dicr & mem_mask ) | - ( ~mem_mask & 0x80000000 & m_n_dicr ) | - ( ~data & ~mem_mask & 0x7f000000 & m_n_dicr ) | - ( data & ~mem_mask & 0x00ffffff ); + m_n_dicr = ( m_n_dicr & ~mem_mask ) | + ( mem_mask & 0x80000000 & m_n_dicr ) | + ( ~data & mem_mask & 0x7f000000 & m_n_dicr ) | + ( data & mem_mask & 0x00ffffff ); /* todo: find out whether to do this instead of dma_interrupt_update() if( ( m_n_dicr & 0x7f000000 ) != 0 ) diff --git a/src/mame/machine/segaic16.c b/src/mame/machine/segaic16.c index 81cbb68421d..299caf988b3 100644 --- a/src/mame/machine/segaic16.c +++ b/src/mame/machine/segaic16.c @@ -410,7 +410,7 @@ WRITE8_HANDLER( segaic16_memory_mapper_w ) READ16_HANDLER( segaic16_memory_mapper_lsb_r ) { - return memory_mapper_r(&memory_mapper, offset, segaic16_open_bus_r(machine,0,0)); + return memory_mapper_r(&memory_mapper, offset, segaic16_open_bus_r(machine,0,0xffff)); } diff --git a/src/mame/machine/segas32.c b/src/mame/machine/segas32.c index 6f0c38ff86e..4c9f62e101d 100644 --- a/src/mame/machine/segas32.c +++ b/src/mame/machine/segas32.c @@ -124,7 +124,7 @@ WRITE16_HANDLER(sonic_level_load_protection) { UINT16 level; //Perform write - system32_workram[CLEARED_LEVELS / 2] = (data & ~mem_mask) | (system32_workram[CLEARED_LEVELS / 2] & mem_mask); + system32_workram[CLEARED_LEVELS / 2] = (data & mem_mask) | (system32_workram[CLEARED_LEVELS / 2] & ~mem_mask); //Refresh current level if (system32_workram[CLEARED_LEVELS / 2] == 0) @@ -155,7 +155,7 @@ WRITE16_HANDLER(sonic_level_load_protection) // and can write things into work RAM. we simulate that here for burning rival. READ16_HANDLER(brival_protection_r) { - if (!mem_mask) // only trap on word-wide reads + if (mem_mask == 0xffff) // only trap on word-wide reads { switch (offset) { @@ -244,14 +244,14 @@ void darkedge_fd1149_vblank(void) WRITE16_HANDLER( darkedge_protection_w ) { logerror("%06x:darkedge_prot_w(%06X) = %04X & %04X\n", - activecpu_get_pc(), 0xa00000 + 2*offset, data, mem_mask ^ 0xffff); + activecpu_get_pc(), 0xa00000 + 2*offset, data, mem_mask); } READ16_HANDLER( darkedge_protection_r ) { logerror("%06x:darkedge_prot_r(%06X) & %04X\n", - activecpu_get_pc(), 0xa00000 + 2*offset, mem_mask ^ 0xffff); + activecpu_get_pc(), 0xa00000 + 2*offset, mem_mask); return 0xffff; } diff --git a/src/mame/machine/seicop.c b/src/mame/machine/seicop.c index 9891b151ef9..803190385b1 100644 --- a/src/mame/machine/seicop.c +++ b/src/mame/machine/seicop.c @@ -768,11 +768,11 @@ READ16_HANDLER( copdxbl_0_r ) //case (0x5b4/2): // return cop_mcu_ram[offset]; - case (0x700/2): return input_port_1_word_r(machine,0,0); - case (0x704/2): return input_port_2_word_r(machine,0,0); - case (0x708/2): return input_port_4_word_r(machine,0,0); - case (0x70c/2): return input_port_3_word_r(machine,0,0); - case (0x71c/2): return input_port_5_word_r(machine,0,0); + case (0x700/2): return input_port_read_indexed(machine,1); + case (0x704/2): return input_port_read_indexed(machine,2); + case (0x708/2): return input_port_read_indexed(machine,4); + case (0x70c/2): return input_port_read_indexed(machine,3); + case (0x71c/2): return input_port_read_indexed(machine,5); } } @@ -1313,15 +1313,15 @@ READ16_HANDLER( heatbrl_mcu_r ) *********************************************************************/ /* Seibu Sound System */ - case (0x3c8/2): return seibu_main_word_r(machine,2,0); - case (0x3cc/2): return seibu_main_word_r(machine,3,0); - case (0x3d4/2): return seibu_main_word_r(machine,5,0); + case (0x3c8/2): return seibu_main_word_r(machine,2,0xffff); + case (0x3cc/2): return seibu_main_word_r(machine,3,0xffff); + case (0x3d4/2): return seibu_main_word_r(machine,5,0xffff); /* Inputs */ - case (0x340/2): return input_port_1_word_r(machine,0,0); - case (0x344/2): return input_port_2_word_r(machine,0,0); - case (0x348/2): return input_port_4_word_r(machine,0,0); - case (0x34c/2): return input_port_3_word_r(machine,0,0); + case (0x340/2): return input_port_read_indexed(machine,1); + case (0x344/2): return input_port_read_indexed(machine,2); + case (0x348/2): return input_port_read_indexed(machine,4); + case (0x34c/2): return input_port_read_indexed(machine,3); } } @@ -1397,10 +1397,10 @@ WRITE16_HANDLER( heatbrl_mcu_w ) 700-7ff - Output (Seibu Sound System) *********************************************************************/ - case (0x3c0/2): { seibu_main_word_w(machine,0,cop_mcu_ram[offset],0xff00); break; } - case (0x3c4/2): { seibu_main_word_w(machine,1,cop_mcu_ram[offset],0xff00); break; } - case (0x3d0/2): { seibu_main_word_w(machine,4,cop_mcu_ram[offset],0xff00); break; } - case (0x3d8/2): { seibu_main_word_w(machine,6,cop_mcu_ram[offset],0xff00); break; } + case (0x3c0/2): { seibu_main_word_w(machine,0,cop_mcu_ram[offset],0x00ff); break; } + case (0x3c4/2): { seibu_main_word_w(machine,1,cop_mcu_ram[offset],0x00ff); break; } + case (0x3d0/2): { seibu_main_word_w(machine,4,cop_mcu_ram[offset],0x00ff); break; } + case (0x3d8/2): { seibu_main_word_w(machine,6,cop_mcu_ram[offset],0x00ff); break; } } } @@ -1424,18 +1424,18 @@ READ16_HANDLER( cupsoc_mcu_r ) /* returning 0xffff for some inputs for now, breaks coinage but allows cupsoc to boot */ - case (0x300/2): return input_port_1_word_r(machine,0,0); - case (0x304/2): return input_port_2_word_r(machine,0,0); - case (0x308/2): return input_port_4_word_r(machine,0,0); - case (0x30c/2): return input_port_3_word_r(machine,0,0); + case (0x300/2): return input_port_read_indexed(machine,1); + case (0x304/2): return input_port_read_indexed(machine,2); + case (0x308/2): return input_port_read_indexed(machine,4); + case (0x30c/2): return input_port_read_indexed(machine,3); case (0x314/2): return 0xffff; - case (0x31c/2): return input_port_5_word_r(machine,0,0); + case (0x31c/2): return input_port_read_indexed(machine,5); case (0x340/2): return 0xffff; case (0x344/2): return 0xffff; - case (0x348/2): return 0xffff;//seibu_main_word_r(machine,2,0); - case (0x34c/2): return 0xffff;//seibu_main_word_r(machine,3,0); - case (0x354/2): return 0xffff;//seibu_main_word_r(machine,5,0); + case (0x348/2): return 0xffff;//seibu_main_word_r(machine,2,0xffff); + case (0x34c/2): return 0xffff;//seibu_main_word_r(machine,3,0xffff); + case (0x354/2): return 0xffff;//seibu_main_word_r(machine,5,0xffff); case (0x35c/2): return 0xffff; } } @@ -1551,10 +1551,10 @@ WRITE16_HANDLER( cupsoc_mcu_w ) case (0x238/2): { legionna_scrollram16[6] = cop_mcu_ram[offset]; break; } case (0x23a/2): { legionna_scrollram16[7] = cop_mcu_ram[offset]; break; } - case (0x340/2): { seibu_main_word_w(machine,0,cop_mcu_ram[offset],0xff00); break; } - case (0x344/2): { seibu_main_word_w(machine,1,cop_mcu_ram[offset],0xff00); break; } - case (0x350/2): { seibu_main_word_w(machine,4,cop_mcu_ram[offset],0xff00); break; } - case (0x358/2): { seibu_main_word_w(machine,6,cop_mcu_ram[offset],0xff00); break; } + case (0x340/2): { seibu_main_word_w(machine,0,cop_mcu_ram[offset],0x00ff); break; } + case (0x344/2): { seibu_main_word_w(machine,1,cop_mcu_ram[offset],0x00ff); break; } + case (0x350/2): { seibu_main_word_w(machine,4,cop_mcu_ram[offset],0x00ff); break; } + case (0x358/2): { seibu_main_word_w(machine,6,cop_mcu_ram[offset],0x00ff); break; } } } @@ -1571,15 +1571,15 @@ READ16_HANDLER( godzilla_mcu_r ) break; /* Non-protection reads */ - case (0x308/2): return seibu_main_word_r(machine,2,0); - case (0x30c/2): return seibu_main_word_r(machine,3,0); - case (0x314/2): return seibu_main_word_r(machine,5,0); + case (0x308/2): return seibu_main_word_r(machine,2,0xffff); + case (0x30c/2): return seibu_main_word_r(machine,3,0xffff); + case (0x314/2): return seibu_main_word_r(machine,5,0xffff); /* Inputs */ - case (0x340/2): return input_port_1_word_r(machine,0,0); - case (0x344/2): return input_port_2_word_r(machine,0,0); - case (0x348/2): return input_port_4_word_r(machine,0,0); - case (0x34c/2): return input_port_3_word_r(machine,0,0); + case (0x340/2): return input_port_read_indexed(machine,1); + case (0x344/2): return input_port_read_indexed(machine,2); + case (0x348/2): return input_port_read_indexed(machine,4); + case (0x34c/2): return input_port_read_indexed(machine,3); } } @@ -1601,10 +1601,10 @@ WRITE16_HANDLER( godzilla_mcu_w ) case (0x228/2): { legionna_scrollram16[4] = cop_mcu_ram[offset]; break; } case (0x22a/2): { legionna_scrollram16[5] = cop_mcu_ram[offset]; break; } - case (0x300/2): { seibu_main_word_w(machine,0,cop_mcu_ram[offset],0xff00); break; } - case (0x304/2): { seibu_main_word_w(machine,1,cop_mcu_ram[offset],0xff00); break; } - case (0x310/2): { seibu_main_word_w(machine,4,cop_mcu_ram[offset],0xff00); break; } - case (0x318/2): { seibu_main_word_w(machine,6,cop_mcu_ram[offset],0xff00); break; } + case (0x300/2): { seibu_main_word_w(machine,0,cop_mcu_ram[offset],0x00ff); break; } + case (0x304/2): { seibu_main_word_w(machine,1,cop_mcu_ram[offset],0x00ff); break; } + case (0x310/2): { seibu_main_word_w(machine,4,cop_mcu_ram[offset],0x00ff); break; } + case (0x318/2): { seibu_main_word_w(machine,6,cop_mcu_ram[offset],0x00ff); break; } } } @@ -1622,16 +1622,16 @@ READ16_HANDLER( denjinmk_mcu_r ) /* Non-protection reads */ - case (0x308/2): return seibu_main_word_r(machine,2,0); - case (0x30c/2): return seibu_main_word_r(machine,3,0); - case (0x314/2): return seibu_main_word_r(machine,5,0); + case (0x308/2): return seibu_main_word_r(machine,2,0xffff); + case (0x30c/2): return seibu_main_word_r(machine,3,0xffff); + case (0x314/2): return seibu_main_word_r(machine,5,0xffff); /* Inputs */ - case (0x340/2): return input_port_1_word_r(machine,0,0); - case (0x344/2): return input_port_2_word_r(machine,0,0); - case (0x348/2): return input_port_4_word_r(machine,0,0); - case (0x34c/2): return input_port_3_word_r(machine,0,0); - case (0x35c/2): return input_port_5_word_r(machine,0,0); + case (0x340/2): return input_port_read_indexed(machine,1); + case (0x344/2): return input_port_read_indexed(machine,2); + case (0x348/2): return input_port_read_indexed(machine,4); + case (0x34c/2): return input_port_read_indexed(machine,3); + case (0x35c/2): return input_port_read_indexed(machine,5); } } @@ -1654,10 +1654,10 @@ WRITE16_HANDLER( denjinmk_mcu_w ) case (0x228/2): { legionna_scrollram16[4] = cop_mcu_ram[offset]; break; } case (0x22a/2): { legionna_scrollram16[5] = cop_mcu_ram[offset]; break; } - case (0x300/2): { seibu_main_word_w(machine,0,cop_mcu_ram[offset],0xff00); break; } - case (0x304/2): { seibu_main_word_w(machine,1,cop_mcu_ram[offset],0xff00); break; } - case (0x310/2): { seibu_main_word_w(machine,4,cop_mcu_ram[offset],0xff00); break; } - case (0x318/2): { seibu_main_word_w(machine,6,cop_mcu_ram[offset],0xff00); break; } + case (0x300/2): { seibu_main_word_w(machine,0,cop_mcu_ram[offset],0x00ff); break; } + case (0x304/2): { seibu_main_word_w(machine,1,cop_mcu_ram[offset],0x00ff); break; } + case (0x310/2): { seibu_main_word_w(machine,4,cop_mcu_ram[offset],0x00ff); break; } + case (0x318/2): { seibu_main_word_w(machine,6,cop_mcu_ram[offset],0x00ff); break; } } } @@ -1688,16 +1688,16 @@ READ16_HANDLER( sdgndmrb_mcu_r ) return cop_mcu_ram[offset]; /* Non-protection reads */ - case (0x308/2): return seibu_main_word_r(machine,2,0); - case (0x30c/2): return seibu_main_word_r(machine,3,0); - case (0x314/2): return seibu_main_word_r(machine,5,0); + case (0x308/2): return seibu_main_word_r(machine,2,0xffff); + case (0x30c/2): return seibu_main_word_r(machine,3,0xffff); + case (0x314/2): return seibu_main_word_r(machine,5,0xffff); /* Inputs */ - case (0x340/2): return input_port_1_word_r(machine,0,0); - case (0x344/2): return input_port_2_word_r(machine,0,0); - case (0x348/2): return input_port_4_word_r(machine,0,0); - case (0x34c/2): return input_port_3_word_r(machine,0,0); - case (0x35c/2): return input_port_5_word_r(machine,0,0); + case (0x340/2): return input_port_read_indexed(machine,1); + case (0x344/2): return input_port_read_indexed(machine,2); + case (0x348/2): return input_port_read_indexed(machine,4); + case (0x34c/2): return input_port_read_indexed(machine,3); + case (0x35c/2): return input_port_read_indexed(machine,5); } } @@ -1861,10 +1861,10 @@ WRITE16_HANDLER( sdgndmrb_mcu_w ) //case (0x280/2): break; //case (0x6fc/2): break; - case (0x300/2): { seibu_main_word_w(machine,0,cop_mcu_ram[offset],0xff00); break; } - case (0x304/2): { seibu_main_word_w(machine,1,cop_mcu_ram[offset],0xff00); break; } - case (0x310/2): { seibu_main_word_w(machine,4,cop_mcu_ram[offset],0xff00); break; } - case (0x318/2): { seibu_main_word_w(machine,6,cop_mcu_ram[offset],0xff00); break; } + case (0x300/2): { seibu_main_word_w(machine,0,cop_mcu_ram[offset],0x00ff); break; } + case (0x304/2): { seibu_main_word_w(machine,1,cop_mcu_ram[offset],0x00ff); break; } + case (0x310/2): { seibu_main_word_w(machine,4,cop_mcu_ram[offset],0x00ff); break; } + case (0x318/2): { seibu_main_word_w(machine,6,cop_mcu_ram[offset],0x00ff); break; } } } @@ -1899,15 +1899,15 @@ READ16_HANDLER( legionna_mcu_r ) *********************************************************************/ /* Seibu Sound System */ - case (0x308/2): return seibu_main_word_r(machine,2,0); - case (0x30c/2): return seibu_main_word_r(machine,3,0); - case (0x314/2): return seibu_main_word_r(machine,5,0); + case (0x308/2): return seibu_main_word_r(machine,2,0xffff); + case (0x30c/2): return seibu_main_word_r(machine,3,0xffff); + case (0x314/2): return seibu_main_word_r(machine,5,0xffff); /* Inputs */ - case (0x340/2): return input_port_1_word_r(machine,0,0); - case (0x344/2): return input_port_2_word_r(machine,0,0); - case (0x348/2): return input_port_0_word_r(machine,0,0); - case (0x34c/2): return input_port_3_word_r(machine,0,0); + case (0x340/2): return input_port_read_indexed(machine,1); + case (0x344/2): return input_port_read_indexed(machine,2); + case (0x348/2): return input_port_read_indexed(machine,0); + case (0x34c/2): return input_port_read_indexed(machine,3); } } @@ -1963,10 +1963,10 @@ WRITE16_HANDLER( legionna_mcu_w ) 700-7ff - Output (Seibu Sound System) *********************************************************************/ - case (0x300/2): { seibu_main_word_w(machine,0,cop_mcu_ram[offset],0xff00); break; } - case (0x304/2): { seibu_main_word_w(machine,1,cop_mcu_ram[offset],0xff00); break; } - case (0x310/2): { seibu_main_word_w(machine,4,cop_mcu_ram[offset],0xff00); break; } - case (0x318/2): { seibu_main_word_w(machine,6,cop_mcu_ram[offset],0xff00); break; } + case (0x300/2): { seibu_main_word_w(machine,0,cop_mcu_ram[offset],0x00ff); break; } + case (0x304/2): { seibu_main_word_w(machine,1,cop_mcu_ram[offset],0x00ff); break; } + case (0x310/2): { seibu_main_word_w(machine,4,cop_mcu_ram[offset],0x00ff); break; } + case (0x318/2): { seibu_main_word_w(machine,6,cop_mcu_ram[offset],0x00ff); break; } } } @@ -1988,9 +1988,9 @@ READ16_HANDLER( raiden2_mcu_r ) case (0x34c/2): return input_port_read_indexed(machine, 5) | 0xff00; /* Inputs */ - case (0x308/2): return seibu_main_word_r(machine,2,0); - case (0x30c/2): return seibu_main_word_r(machine,3,0); - case (0x314/2): return seibu_main_word_r(machine,5,0); + case (0x308/2): return seibu_main_word_r(machine,2,0xffff); + case (0x30c/2): return seibu_main_word_r(machine,3,0xffff); + case (0x314/2): return seibu_main_word_r(machine,5,0xffff); } } @@ -2033,10 +2033,10 @@ WRITE16_HANDLER( raiden2_mcu_w ) case (0x2be/2): sprcpt_adr_w(machine,offset,data,mem_mask); break; case (0x2ce/2): sprcpt_flags_2_w(machine,offset,data,mem_mask); break; - case (0x300/2): { seibu_main_word_w(machine,0,cop_mcu_ram[offset],0xff00); break; } - case (0x304/2): { seibu_main_word_w(machine,1,cop_mcu_ram[offset],0xff00); break; } - case (0x310/2): { seibu_main_word_w(machine,4,cop_mcu_ram[offset],0xff00); break; } - case (0x318/2): { seibu_main_word_w(machine,6,cop_mcu_ram[offset],0xff00); break; } + case (0x300/2): { seibu_main_word_w(machine,0,cop_mcu_ram[offset],0x00ff); break; } + case (0x304/2): { seibu_main_word_w(machine,1,cop_mcu_ram[offset],0x00ff); break; } + case (0x310/2): { seibu_main_word_w(machine,4,cop_mcu_ram[offset],0x00ff); break; } + case (0x318/2): { seibu_main_word_w(machine,6,cop_mcu_ram[offset],0x00ff); break; } } diff --git a/src/mame/machine/stvcd.c b/src/mame/machine/stvcd.c index 6ad437a626f..f3e2996372b 100644 --- a/src/mame/machine/stvcd.c +++ b/src/mame/machine/stvcd.c @@ -1351,15 +1351,15 @@ READ32_HANDLER( stvcd_r ) case 0x98000: case 0x18000: - if (mem_mask == 0) + if (mem_mask == 0xffffffff) { rv = cd_readLong(offset); } - else if (mem_mask == 0x0000ffff) + else if (mem_mask == 0xffff0000) { rv = cd_readWord(offset)<<16; } - else if (mem_mask == 0xffff0000) + else if (mem_mask == 0x0000ffff) { rv = cd_readWord(offset); } diff --git a/src/mame/machine/stvprot.c b/src/mame/machine/stvprot.c index c683481bd13..922b258a1ee 100644 --- a/src/mame/machine/stvprot.c +++ b/src/mame/machine/stvprot.c @@ -356,7 +356,7 @@ static READ32_HANDLER( decathlt_prot_r ) static WRITE32_HANDLER( decathlt_prot_w ) { - decathlt_protregs[offset] = (data&~mem_mask)|(decathlt_protregs[offset]&mem_mask); + decathlt_protregs[offset] = (data&mem_mask)|(decathlt_protregs[offset]&~mem_mask); // decathlt_protregs[0] = 0x0c00000/4; if (offset==0) // seems to set a (scrambled?) source address @@ -370,7 +370,7 @@ static WRITE32_HANDLER( decathlt_prot_w ) if (offset==1) // uploads 2 tables... { - if (mem_mask==0x0000ffff) + if (mem_mask==0xffff0000) { if (data == 0x80000000) { @@ -393,7 +393,7 @@ static WRITE32_HANDLER( decathlt_prot_w ) // mame_printf_info("ARGH! %08x %08x\n",mem_mask,data); } - else if (mem_mask==0xffff0000) + else if (mem_mask==0x0000ffff) { if (decathlt_prot_uploadmode==1) { diff --git a/src/mame/machine/subs.c b/src/mame/machine/subs.c index 5f0f10c51c4..ae64cf174b2 100644 --- a/src/mame/machine/subs.c +++ b/src/mame/machine/subs.c @@ -29,7 +29,7 @@ subs_interrupt INTERRUPT_GEN( subs_interrupt ) { /* only do NMI interrupt if not in TEST mode */ - if ((input_port_2_r(machine, 0) & 0x40)==0x40) + if ((input_port_read_indexed(machine, 2) & 0x40)==0x40) cpunum_set_input_line(machine, 0,INPUT_LINE_NMI,PULSE_LINE); } @@ -46,7 +46,7 @@ static int subs_steering_1(running_machine *machine) int this_val; int delta; - this_val=input_port_3_r(machine, 0); + this_val=input_port_read_indexed(machine, 3); delta=this_val-last_val; last_val=this_val; @@ -112,7 +112,7 @@ subs_control_r ***************************************************************************/ READ8_HANDLER( subs_control_r ) { - int inport = input_port_1_r(machine, offset); + int inport = input_port_read_indexed(machine, 1); switch (offset & 0x07) { @@ -134,7 +134,7 @@ subs_coin_r ***************************************************************************/ READ8_HANDLER( subs_coin_r ) { - int inport = input_port_2_r(machine, offset); + int inport = input_port_read_indexed(machine, 2); switch (offset & 0x07) { @@ -156,7 +156,7 @@ subs_options_r ***************************************************************************/ READ8_HANDLER( subs_options_r ) { - int opts = input_port_0_r(machine, offset); + int opts = input_port_read_indexed(machine, 0); switch (offset & 0x03) { diff --git a/src/mame/machine/taitosj.c b/src/mame/machine/taitosj.c index 9865bab7d5d..88ab4414450 100644 --- a/src/mame/machine/taitosj.c +++ b/src/mame/machine/taitosj.c @@ -317,5 +317,5 @@ WRITE8_HANDLER( alpinea_bankswitch_w ) READ8_HANDLER( alpine_port_2_r ) { - return input_port_2_r(machine,offset) | protection_value; + return input_port_read_indexed(machine,2) | protection_value; } diff --git a/src/mame/machine/toaplan1.c b/src/mame/machine/toaplan1.c index cf1c1315632..9feb8f976a8 100644 --- a/src/mame/machine/toaplan1.c +++ b/src/mame/machine/toaplan1.c @@ -160,14 +160,14 @@ READ16_HANDLER( samesame_port_6_word_r ) { /* Bit 0x80 is secondary CPU (HD647180) ready signal */ logerror("PC:%04x Warning !!! IO reading from $14000a\n",activecpu_get_previouspc()); - return (0x80 | input_port_6_word_r(machine,0,0)) & 0xff; + return (0x80 | input_port_read_indexed(machine,6)) & 0xff; } READ16_HANDLER( vimana_input_port_5_word_r ) { int data, p; - p = input_port_5_word_r(machine,0,0); + p = input_port_read_indexed(machine,5); vimana_latch ^= p; data = (vimana_latch & p ); diff --git a/src/mame/machine/williams.c b/src/mame/machine/williams.c index 66236306954..104266bcf55 100644 --- a/src/mame/machine/williams.c +++ b/src/mame/machine/williams.c @@ -863,7 +863,7 @@ WRITE8_HANDLER( blaster_bank_select_w ) static READ8_HANDLER( lottofun_input_port_0_r ) { /* merge in the ticket dispenser status */ - return input_port_0_r(machine,offset) | ticket_dispenser_r(machine,offset); + return input_port_read_indexed(machine,0) | ticket_dispenser_r(machine,offset); } diff --git a/src/mame/video/amiga.c b/src/mame/video/amiga.c index b90c9759c86..9a164c404ab 100644 --- a/src/mame/video/amiga.c +++ b/src/mame/video/amiga.c @@ -225,7 +225,7 @@ static int copper_execute_next(running_machine *machine, int xpos) if (LOG_COPPER) logerror("%02X.%02X: Write to %s = %04x\n", last_scanline, xpos / 2, amiga_custom_names[copper_pending_offset & 0xff], copper_pending_data); - amiga_custom_w(machine, copper_pending_offset, copper_pending_data, 0); + amiga_custom_w(machine, copper_pending_offset, copper_pending_data, 0xffff); copper_pending_offset = 0; } diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c index 2bbea22219e..a6965e7e96b 100644 --- a/src/mame/video/armedf.c +++ b/src/mame/video/armedf.c @@ -351,5 +351,5 @@ VIDEO_UPDATE( armedf ) VIDEO_EOF( armedf ) { - buffer_spriteram16_w(machine,0,0,0); + buffer_spriteram16_w(machine,0,0,0xffff); } diff --git a/src/mame/video/atarisy1.c b/src/mame/video/atarisy1.c index 1a6e1112d00..669aae43564 100644 --- a/src/mame/video/atarisy1.c +++ b/src/mame/video/atarisy1.c @@ -380,7 +380,7 @@ WRITE16_HANDLER( atarisy1_spriteram_w ) ((offset & 0xc0) == 0x40 && (newword == 0xffff || oldword == 0xffff))) { /* if the timer is in the active bank, update the display list */ - atarimo_0_spriteram_w(machine, offset, data, 0); + atarimo_0_spriteram_w(machine, offset, data, 0xffff); update_timers(machine, video_screen_get_vpos(machine->primary_screen)); } @@ -393,7 +393,7 @@ WRITE16_HANDLER( atarisy1_spriteram_w ) } /* let the MO handler do the basic work */ - atarimo_0_spriteram_w(machine, offset, data, 0); + atarimo_0_spriteram_w(machine, offset, data, 0xffff); } @@ -407,7 +407,7 @@ WRITE16_HANDLER( atarisy1_spriteram_w ) static TIMER_CALLBACK( int3off_callback ) { /* clear the state */ - atarigen_scanline_int_ack_w(machine, 0, 0, 0); + atarigen_scanline_int_ack_w(machine, 0, 0, 0xffff); } diff --git a/src/mame/video/beathead.c b/src/mame/video/beathead.c index 652365c51d5..fdfdd6cc33e 100644 --- a/src/mame/video/beathead.c +++ b/src/mame/video/beathead.c @@ -58,10 +58,10 @@ VIDEO_START( beathead ) WRITE32_HANDLER( beathead_vram_transparent_w ) { /* writes to this area appear to handle transparency */ - if (!(data & 0x000000ff)) mem_mask |= 0x000000ff; - if (!(data & 0x0000ff00)) mem_mask |= 0x0000ff00; - if (!(data & 0x00ff0000)) mem_mask |= 0x00ff0000; - if (!(data & 0xff000000)) mem_mask |= 0xff000000; + if (!(data & 0x000000ff)) mem_mask &= ~0x000000ff; + if (!(data & 0x0000ff00)) mem_mask &= ~0x0000ff00; + if (!(data & 0x00ff0000)) mem_mask &= ~0x00ff0000; + if (!(data & 0xff000000)) mem_mask &= ~0xff000000; COMBINE_DATA(&videoram32[offset]); } @@ -71,7 +71,7 @@ WRITE32_HANDLER( beathead_vram_bulk_w ) /* it appears that writes to this area pass in a mask for 4 words in VRAM */ /* allowing them to be filled from a preset latch */ offset &= ~3; - data = data & ~mem_mask & 0x0f0f0f0f; + data = data & mem_mask & 0x0f0f0f0f; /* for now, just handle the bulk fill case; the others we'll catch later */ if (data == 0x0f0f0f0f) diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c index 2a4a6a18324..15ea2fcd24f 100644 --- a/src/mame/video/bionicc.c +++ b/src/mame/video/bionicc.c @@ -243,5 +243,5 @@ VIDEO_UPDATE( bionicc ) VIDEO_EOF( bionicc ) { - buffer_spriteram16_w(machine,0,0,0); + buffer_spriteram16_w(machine,0,0,0xffff); } diff --git a/src/mame/video/blstroid.c b/src/mame/video/blstroid.c index 71764c487ca..fd3cec126d9 100644 --- a/src/mame/video/blstroid.c +++ b/src/mame/video/blstroid.c @@ -99,7 +99,7 @@ VIDEO_START( blstroid ) static TIMER_CALLBACK( irq_off ) { /* clear the interrupt */ - atarigen_scanline_int_ack_w(machine, 0, 0, 0); + atarigen_scanline_int_ack_w(machine, 0, 0, 0xffff); } diff --git a/src/mame/video/btime.c b/src/mame/video/btime.c index fb0a2f6e2a3..18acfd0937a 100644 --- a/src/mame/video/btime.c +++ b/src/mame/video/btime.c @@ -292,7 +292,7 @@ WRITE8_HANDLER( bnj_video_control_w ) /* For now we just check 0x40 in DSW1, and ignore the write if we */ /* are in upright controls mode. */ - if (input_port_3_r(machine, 0) & 0x40) /* cocktail mode */ + if (input_port_read_indexed(machine, 3) & 0x40) /* cocktail mode */ btime_video_control_w(machine, offset, data); } diff --git a/src/mame/video/cave.c b/src/mame/video/cave.c index 267702fb38c..137fc4e1c3e 100644 --- a/src/mame/video/cave.c +++ b/src/mame/video/cave.c @@ -368,7 +368,7 @@ static TILE_GET_INFO( sailormn_get_tile_info_2 ) INLINE void vram_w(UINT16 *VRAM, tilemap *TILEMAP, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 data, ATTR_UNUSED UINT16 mem_mask) { - if ((VRAM[offset] & ~mem_mask)==(data & ~mem_mask)) return; + if ((VRAM[offset] & mem_mask)==(data & mem_mask)) return; COMBINE_DATA(&VRAM[offset]); offset /= 2; if ( offset < 0x1000/4 ) // 16x16 tilemap @@ -391,7 +391,7 @@ INLINE void vram_w(UINT16 *VRAM, tilemap *TILEMAP, ATTR_UNUSED offs_t offset, AT INLINE void vram_8x8_w(UINT16 *VRAM, tilemap *TILEMAP,ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 data, ATTR_UNUSED UINT16 mem_mask) { offset %= 0x4000/2; - if ((VRAM[offset] & ~mem_mask)==(data & ~mem_mask)) return; + if ((VRAM[offset] & mem_mask)==(data & mem_mask)) return; COMBINE_DATA(&VRAM[offset + 0x0000/2]); COMBINE_DATA(&VRAM[offset + 0x4000/2]); tilemap_mark_tile_dirty(TILEMAP,offset/2); diff --git a/src/mame/video/cischeat.c b/src/mame/video/cischeat.c index 27bbecf073b..9ec55093d8d 100644 --- a/src/mame/video/cischeat.c +++ b/src/mame/video/cischeat.c @@ -225,7 +225,7 @@ READ16_HANDLER( bigrun_vregs_r ) case 0x0004/2 : return input_port_read_indexed(machine, 3); // Motor Limit Switches case 0x0006/2 : return input_port_read_indexed(machine, 4); // DSW 1 & 2 - case 0x0008/2 : return soundlatch2_word_r(machine,0,0); // From sound cpu + case 0x0008/2 : return soundlatch2_word_r(machine,0,0xffff); // From sound cpu case 0x0010/2 : switch (cischeat_ip_select & 0x3) @@ -274,7 +274,7 @@ WRITE16_HANDLER( bigrun_vregs_w ) break; case 0x000a/2 : // to sound cpu - soundlatch_word_w(machine,0,new_data,0); + soundlatch_word_w(machine,0,new_data,0xffff); break; case 0x000c/2 : break; // ?? @@ -386,7 +386,7 @@ WRITE16_HANDLER( cischeat_vregs_w ) case 0x2208/2 : break; // watchdog reset case 0x2300/2 : /* Sound CPU: reads latch during int 4, and stores command */ - soundlatch_word_w(machine,0,new_data,0); + soundlatch_word_w(machine,0,new_data,0xffff); cpunum_set_input_line(machine, 3,4,HOLD_LINE); break; @@ -505,7 +505,7 @@ CPU #0 PC 00235C : Warning, vreg 0006 <- 0000 case 0x0014/2 : break; /* Usually written in sequence, but not always */ - case 0x0008/2 : soundlatch_word_w(machine,0,new_data,0); break; + case 0x0008/2 : soundlatch_word_w(machine,0,new_data,0xffff); break; case 0x0018/2 : cpunum_set_input_line(machine, 3,4,HOLD_LINE); break; case 0x0010/2 : break; @@ -1350,9 +1350,9 @@ if ( input_code_pressed(KEYCODE_Z) || input_code_pressed(KEYCODE_X) ) #if 1 popmessage("Cmd: %04X Pos:%04X Lim:%04X Inp:%04X", scudhamm_motor_command, - scudhamm_motor_pos_r(screen->machine,0,0), - scudhamm_motor_status_r(screen->machine,0,0), - scudhamm_analog_r(screen->machine,0,0) ); + scudhamm_motor_pos_r(screen->machine,0,0xffff), + scudhamm_motor_status_r(screen->machine,0,0xffff), + scudhamm_analog_r(screen->machine,0,0xffff) ); #endif } diff --git a/src/mame/video/crshrace.c b/src/mame/video/crshrace.c index 909f419547c..b148b72ea01 100644 --- a/src/mame/video/crshrace.c +++ b/src/mame/video/crshrace.c @@ -215,6 +215,6 @@ popmessage("gfxctrl = %02x",gfxctrl); VIDEO_EOF( crshrace ) { - buffer_spriteram16_w(machine,0,0,0); - buffer_spriteram16_2_w(machine,0,0,0); + buffer_spriteram16_w(machine,0,0,0xffff); + buffer_spriteram16_2_w(machine,0,0,0xffff); } diff --git a/src/mame/video/dc.c b/src/mame/video/dc.c index 7064583aad4..e75b2d91024 100644 --- a/src/mame/video/dc.c +++ b/src/mame/video/dc.c @@ -52,12 +52,12 @@ INLINE int decode_reg_64(UINT32 offset, UINT64 mem_mask, UINT64 *shift) *shift = 0; // non 32-bit accesses have not yet been seen here, we need to know when they are - if ((mem_mask != U64(0x00000000ffffffff)) && (mem_mask != U64(0xffffffff00000000))) + if ((mem_mask != U64(0xffffffff00000000)) && (mem_mask != U64(0x00000000ffffffff))) { assert_always(0, "Wrong mask!\n"); } - if (mem_mask == U64(0x00000000ffffffff)) + if (mem_mask == U64(0xffffffff00000000)) { reg++; *shift = 32; @@ -199,7 +199,7 @@ WRITE64_HANDLER( ta_fifo_poly_w ) static UINT32 ignoretexalpha,flipuv,clampuv,filtermode,sstexture,mmdadjust,tsinstruction; static UINT32 depthcomparemode,cullingmode,zwritedisable,cachebypass,dcalcctrl,volumeinstruction,mipmapped,vqcompressed,strideselect; - if (!mem_mask) // 64 bit + if (mem_mask == U64(0xffffffffffffffff)) // 64 bit { tafifo_buff[tafifo_pos]=(UINT32)data; tafifo_buff[tafifo_pos+1]=(UINT32)(data >> 32); diff --git a/src/mame/video/dcheese.c b/src/mame/video/dcheese.c index 6fdbc5beb2f..22363b2fb58 100644 --- a/src/mame/video/dcheese.c +++ b/src/mame/video/dcheese.c @@ -300,7 +300,7 @@ WRITE16_HANDLER( madmax_blitter_vidparam_w ) break; default: - logerror("%06X:write to %06X = %04X & %04x\n", activecpu_get_pc(), 0x2a0000 + 2 * offset, data, mem_mask ^ 0xffff); + logerror("%06X:write to %06X = %04X & %04x\n", activecpu_get_pc(), 0x2a0000 + 2 * offset, data, mem_mask); break; } } @@ -309,7 +309,7 @@ WRITE16_HANDLER( madmax_blitter_vidparam_w ) WRITE16_HANDLER( madmax_blitter_unknown_w ) { /* written to just before the blitter command register is written */ - logerror("%06X:write to %06X = %04X & %04X\n", activecpu_get_pc(), 0x300000 + 2 * offset, data, mem_mask ^ 0xffff); + logerror("%06X:write to %06X = %04X & %04X\n", activecpu_get_pc(), 0x300000 + 2 * offset, data, mem_mask); } diff --git a/src/mame/video/dec0.c b/src/mame/video/dec0.c index 8add8801f31..3a85ab367da 100644 --- a/src/mame/video/dec0.c +++ b/src/mame/video/dec0.c @@ -611,8 +611,8 @@ WRITE8_HANDLER( dec0_pf3_control_8bit_w ) offset&=0xffe; myword=buffer[offset] + (buffer[offset+1]<<8); - if (offset<0x10) dec0_pf3_control_0_w(machine,offset/2,myword,0); - else dec0_pf3_control_1_w(machine,(offset-0x10)/2,myword,0); + if (offset<0x10) dec0_pf3_control_0_w(machine,offset/2,myword,0xffff); + else dec0_pf3_control_1_w(machine,(offset-0x10)/2,myword,0xffff); } WRITE8_HANDLER( dec0_pf3_data_8bit_w ) diff --git a/src/mame/video/decocass.c b/src/mame/video/decocass.c index 40c998c75aa..1f79ed46c2d 100644 --- a/src/mame/video/decocass.c +++ b/src/mame/video/decocass.c @@ -608,7 +608,7 @@ VIDEO_UPDATE( decocass ) int scrollx, scrolly_l, scrolly_r; rectangle clip; - if (0xc0 != (input_port_2_r(screen->machine, 0) & 0xc0)) /* coin slots assert an NMI */ + if (0xc0 != (input_port_read_indexed(screen->machine, 2) & 0xc0)) /* coin slots assert an NMI */ cpunum_set_input_line(screen->machine, 0, INPUT_LINE_NMI, ASSERT_LINE); if (0 == (watchdog_flip & 0x04)) diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c index 3098c4367dd..2b04302c3fa 100644 --- a/src/mame/video/dooyong.c +++ b/src/mame/video/dooyong.c @@ -908,5 +908,5 @@ VIDEO_EOF( dooyong ) VIDEO_EOF( rshark ) { - buffer_spriteram16_w(machine, 0, 0, 0); + buffer_spriteram16_w(machine, 0, 0, 0xffff); } diff --git a/src/mame/video/dynduke.c b/src/mame/video/dynduke.c index 3ef1ac0c28c..cf86049d4f1 100644 --- a/src/mame/video/dynduke.c +++ b/src/mame/video/dynduke.c @@ -245,5 +245,5 @@ VIDEO_UPDATE( dynduke ) VIDEO_EOF( dynduke ) { - buffer_spriteram16_w(machine,0,0,0); // Could be a memory location instead + buffer_spriteram16_w(machine,0,0,0xffff); // Could be a memory location instead } diff --git a/src/mame/video/eolith.c b/src/mame/video/eolith.c index 7a5f64725a7..e5f0319aa55 100644 --- a/src/mame/video/eolith.c +++ b/src/mame/video/eolith.c @@ -9,7 +9,7 @@ WRITE32_HANDLER( eolith_vram_w ) { UINT32 *dest = &vram[offset+(0x40000/4)*eolith_buffer]; - if (mem_mask == 0) + if (mem_mask == 0xffffffff) { if (~data & 0x80000000) *dest = (*dest & 0x0000ffff) | (data & 0xffff0000); @@ -17,8 +17,8 @@ WRITE32_HANDLER( eolith_vram_w ) if (~data & 0x00008000) *dest = (*dest & 0xffff0000) | (data & 0x0000ffff); } - else if (((mem_mask == 0x0000ffff) && (~data & 0x80000000)) || - ((mem_mask == 0xffff0000) && (~data & 0x00008000))) + else if (((mem_mask == 0xffff0000) && (~data & 0x80000000)) || + ((mem_mask == 0x0000ffff) && (~data & 0x00008000))) COMBINE_DATA(dest); } diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c index de046d53ab2..e05c2612ad4 100644 --- a/src/mame/video/gaelco2.c +++ b/src/mame/video/gaelco2.c @@ -510,5 +510,5 @@ VIDEO_UPDATE( gaelco2_dual ) VIDEO_EOF( gaelco2 ) { /* sprites are one frame ahead */ - buffer_spriteram16_w(machine, 0, 0, 0); + buffer_spriteram16_w(machine, 0, 0, 0xffff); } diff --git a/src/mame/video/genesis.c b/src/mame/video/genesis.c index c28886bef83..9d33b50e332 100644 --- a/src/mame/video/genesis.c +++ b/src/mame/video/genesis.c @@ -370,9 +370,9 @@ WRITE16_HANDLER( genesis_vdp_w ) { case 0x00: /* Write data */ case 0x01: - if (mem_mask) + if (mem_mask != 0xffff) { - data &= ~mem_mask; + data &= mem_mask; if (ACCESSING_BITS_8_15) data |= data >> 8; else @@ -383,9 +383,9 @@ WRITE16_HANDLER( genesis_vdp_w ) case 0x02: /* Control Write */ case 0x03: - if (mem_mask) + if (mem_mask != 0xffff) { - data &= ~mem_mask; + data &= mem_mask; if (ACCESSING_BITS_8_15) data |= data >> 8; else diff --git a/src/mame/video/groundfx.c b/src/mame/video/groundfx.c index 3f2e58167ec..ab1def11118 100644 --- a/src/mame/video/groundfx.c +++ b/src/mame/video/groundfx.c @@ -261,12 +261,12 @@ VIDEO_UPDATE( groundfx ) it's contents the usual way. */ - if (TC0100SCN_long_r(screen->machine,0x4090/4,0) || TC0480SCP_long_r(screen->machine,0x20/4,0)==0x240866) { /* Anything in text layer - really stupid hack */ + if (TC0100SCN_long_r(screen->machine,0x4090/4,0xffffffff) || TC0480SCP_long_r(screen->machine,0x20/4,0xffffffff)==0x240866) { /* Anything in text layer - really stupid hack */ TC0480SCP_tilemap_draw(bitmap,cliprect,layer[1],0,2); TC0480SCP_tilemap_draw(bitmap,cliprect,layer[2],0,4); TC0480SCP_tilemap_draw(bitmap,cliprect,layer[3],0,8); // TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,pivlayer[2],0,0); - if (TC0480SCP_long_r(screen->machine,0x20/4,0)!=0x240866) /* Stupid hack for start of race */ + if (TC0480SCP_long_r(screen->machine,0x20/4,0xffffffff)!=0x240866) /* Stupid hack for start of race */ TC0480SCP_tilemap_draw(bitmap,&hack_cliprect,layer[0],0,0); draw_sprites(screen->machine,bitmap,cliprect,1,44,-574); } else { diff --git a/src/mame/video/itech32.c b/src/mame/video/itech32.c index 9ee6e8ab945..82dffecec29 100644 --- a/src/mame/video/itech32.c +++ b/src/mame/video/itech32.c @@ -1416,7 +1416,7 @@ WRITE16_HANDLER( bloodstm_video_w ) READ16_HANDLER( bloodstm_video_r ) { - return itech32_video_r(machine, offset / 2,0); + return itech32_video_r(machine, offset / 2, mem_mask); } @@ -1438,7 +1438,7 @@ WRITE32_HANDLER( drivedge_zbuf_control_w ) READ32_HANDLER( itech020_video_r ) { - int result = itech32_video_r(machine,offset,0); + int result = itech32_video_r(machine, offset, mem_mask); return (result << 16) | result; } diff --git a/src/mame/video/konamiic.c b/src/mame/video/konamiic.c index 85999d0dbc8..d3faa0bb3b6 100644 --- a/src/mame/video/konamiic.c +++ b/src/mame/video/konamiic.c @@ -5878,11 +5878,11 @@ static int K056832_rom_read_b(int offset, int blksize, int blksize2, int zerosec READ16_HANDLER( K056832_5bpp_rom_word_r ) { - if (mem_mask == 0x00ff) + if (mem_mask == 0xff00) { return K056832_rom_read_b(offset*2, 4, 5, 0)<<8; } - else if (mem_mask == 0xff00) + else if (mem_mask == 0x00ff) { return K056832_rom_read_b(offset*2+1, 4, 5, 0)<<16; } @@ -5895,19 +5895,19 @@ READ16_HANDLER( K056832_5bpp_rom_word_r ) READ32_HANDLER( K056832_5bpp_rom_long_r ) { - if (mem_mask == 0x00ffffff) + if (mem_mask == 0xff000000) { return K056832_rom_read_b(offset*4, 4, 5, 0)<<24; } - else if (mem_mask == 0xff00ffff) + else if (mem_mask == 0x00ff0000) { return K056832_rom_read_b(offset*4+1, 4, 5, 0)<<16; } - else if (mem_mask == 0xffff00ff) + else if (mem_mask == 0x0000ff00) { return K056832_rom_read_b(offset*4+2, 4, 5, 0)<<8; } - else if (mem_mask == 0xffffff00) + else if (mem_mask == 0x000000ff) { return K056832_rom_read_b(offset*4+3, 4, 5, 1); } @@ -5920,19 +5920,19 @@ READ32_HANDLER( K056832_5bpp_rom_long_r ) READ32_HANDLER( K056832_6bpp_rom_long_r ) { - if (mem_mask == 0x00ffffff) + if (mem_mask == 0xff000000) { return K056832_rom_read_b(offset*4, 4, 6, 0)<<24; } - else if (mem_mask == 0xff00ffff) + else if (mem_mask == 0x00ff0000) { return K056832_rom_read_b(offset*4+1, 4, 6, 0)<<16; } - else if (mem_mask == 0xffff00ff) + else if (mem_mask == 0x0000ff00) { return K056832_rom_read_b(offset*4+2, 4, 6, 0)<<8; } - else if (mem_mask == 0xffffff00) + else if (mem_mask == 0x000000ff) { return K056832_rom_read_b(offset*4+3, 4, 6, 0); } @@ -6206,8 +6206,7 @@ WRITE16_HANDLER( K056832_ram_word_w ) UINT16 old_mask, old_data; tile_ptr = &K056832_videoram[K056832_SelectedPagex4096+offset]; - old_mask = mem_mask; - mem_mask = ~mem_mask; + old_mask = ~mem_mask; old_data = *tile_ptr; data = (data & mem_mask) | (old_data & old_mask); @@ -6248,8 +6247,7 @@ WRITE32_HANDLER( K056832_ram_long_w ) UINT32 old_mask, old_data; tile_ptr = &K056832_videoram[K056832_SelectedPagex4096+offset*2]; - old_mask = mem_mask; - mem_mask = ~mem_mask; + old_mask = ~mem_mask; old_data = (UINT32)tile_ptr[0]<<16 | (UINT32)tile_ptr[1]; data = (data & mem_mask) | (old_data & old_mask); @@ -6402,11 +6400,11 @@ WRITE8_HANDLER( K056832_w ) { if (offset & 1) { - K056832_word_w(machine, (offset>>1), data, 0xff00); + K056832_word_w(machine, (offset>>1), data, 0x00ff); } else { - K056832_word_w(machine, (offset>>1), data<<8, 0x00ff); + K056832_word_w(machine, (offset>>1), data<<8, 0xff00); } } @@ -6414,11 +6412,11 @@ WRITE8_HANDLER( K056832_b_w ) { if (offset & 1) { - K056832_b_word_w(machine, (offset>>1), data, 0xff00); + K056832_b_word_w(machine, (offset>>1), data, 0x00ff); } else { - K056832_b_word_w(machine, (offset>>1), data<<8, 0x00ff); + K056832_b_word_w(machine, (offset>>1), data<<8, 0xff00); } } @@ -7194,7 +7192,7 @@ WRITE32_HANDLER( K055555_long_w ) WRITE16_HANDLER( K055555_word_w ) { - if (mem_mask == 0xff00) + if (mem_mask == 0x00ff) { K055555_write_reg(offset, data&0xff); } diff --git a/src/mame/video/lastduel.c b/src/mame/video/lastduel.c index 5db92b6dd37..c0282b84c44 100644 --- a/src/mame/video/lastduel.c +++ b/src/mame/video/lastduel.c @@ -290,5 +290,5 @@ VIDEO_EOF( lastduel ) /* Spriteram is always 1 frame ahead, suggesting buffering. I can't find a register to control this so I assume it happens automatically every frame at the end of vblank */ - buffer_spriteram16_w(machine,0,0,0); + buffer_spriteram16_w(machine,0,0,0xffff); } diff --git a/src/mame/video/m92.c b/src/mame/video/m92.c index 19b9b9dd5d3..a9ca22d7ed6 100644 --- a/src/mame/video/m92.c +++ b/src/mame/video/m92.c @@ -93,7 +93,7 @@ WRITE16_HANDLER( m92_spritecontrol_w ) /* Sprite buffer - the data written doesn't matter (confirmed by several games) */ if (offset==4) { - buffer_spriteram16_w(machine,0,0,0); + buffer_spriteram16_w(machine,0,0,0xffff); m92_sprite_buffer_busy = 0; /* Pixel clock is 26.6666 MHz, we have 0x800 bytes, or 0x400 words diff --git a/src/mame/video/megasys1.c b/src/mame/video/megasys1.c index 00c1213ab76..d194a09a902 100644 --- a/src/mame/video/megasys1.c +++ b/src/mame/video/megasys1.c @@ -455,7 +455,7 @@ WRITE16_HANDLER( megasys1_vregs_A_w ) cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE); break; - case 0x308/2 : soundlatch_word_w(machine,0,new_data,0); + case 0x308/2 : soundlatch_word_w(machine,0,new_data,0xffff); cpunum_set_input_line(machine, 1,4,HOLD_LINE); break; @@ -472,7 +472,7 @@ READ16_HANDLER( megasys1_vregs_C_r ) { switch (offset) { - case 0x8000/2: return soundlatch2_word_r(machine,0,0); + case 0x8000/2: return soundlatch2_word_r(machine,0,0xffff); default: return megasys1_vregs[offset]; } } @@ -507,7 +507,7 @@ WRITE16_HANDLER( megasys1_vregs_C_w ) break; case 0x8000/2 : /* Cybattler reads sound latch on irq 2 */ - soundlatch_word_w(machine,0,new_data,0); + soundlatch_word_w(machine,0,new_data,0xffff); cpunum_set_input_line(machine, 1,2,HOLD_LINE); break; diff --git a/src/mame/video/neogeo.c b/src/mame/video/neogeo.c index b99267313a9..0f648a38d79 100644 --- a/src/mame/video/neogeo.c +++ b/src/mame/video/neogeo.c @@ -807,8 +807,8 @@ READ16_HANDLER( neogeo_video_register_r ) UINT16 ret; /* accessing the LSB only is not mapped */ - if (mem_mask == 0xff00) - ret = neogeo_unmapped_r(machine, 0, 0) & 0x00ff; + if (mem_mask == 0x00ff) + ret = neogeo_unmapped_r(machine, 0, 0xffff) & 0x00ff; else { switch (offset) @@ -828,10 +828,10 @@ READ16_HANDLER( neogeo_video_register_r ) WRITE16_HANDLER( neogeo_video_register_w ) { /* accessing the LSB only is not mapped */ - if (mem_mask != 0xff00) + if (mem_mask != 0x00ff) { /* accessing the MSB only stores same data in MSB and LSB */ - if (mem_mask == 0x00ff) + if (mem_mask == 0xff00) data = (data & 0xff00) | (data >> 8); switch (offset) diff --git a/src/mame/video/policetr.c b/src/mame/video/policetr.c index 571123306a2..5eef9939532 100644 --- a/src/mame/video/policetr.c +++ b/src/mame/video/policetr.c @@ -159,7 +159,7 @@ WRITE32_HANDLER( policetr_video_w ) { /* we assume 4-byte accesses */ if (mem_mask) - logerror("%08X: policetr_video_w access with mask %08X\n", activecpu_get_previouspc(), ~mem_mask); + logerror("%08X: policetr_video_w access with mask %08X\n", activecpu_get_previouspc(), mem_mask); /* 4 offsets */ switch (offset) @@ -209,7 +209,7 @@ WRITE32_HANDLER( policetr_video_w ) /* log anything else */ default: - logerror("%08X: policetr_video_w(2) = %08X & %08X with latch %02X\n", activecpu_get_previouspc(), data, ~mem_mask, video_latch); + logerror("%08X: policetr_video_w(2) = %08X & %08X with latch %02X\n", activecpu_get_previouspc(), data, mem_mask, video_latch); break; } break; @@ -223,7 +223,7 @@ WRITE32_HANDLER( policetr_video_w ) /* latch 0x00 is unknown; 0, 1, and 2 get written into the upper 12 bits before rendering */ case 0x00: if (data != (0 << 20) && data != (1 << 20) && data != (2 << 20)) - logerror("%08X: policetr_video_w(3) = %08X & %08X with latch %02X\n", activecpu_get_previouspc(), data, ~mem_mask, video_latch); + logerror("%08X: policetr_video_w(3) = %08X & %08X with latch %02X\n", activecpu_get_previouspc(), data, mem_mask, video_latch); break; /* latch 0x10 specifies destination bitmap X and Y offsets */ @@ -235,13 +235,13 @@ WRITE32_HANDLER( policetr_video_w ) /* latch 0x20 is unknown; either 0xef or 0x100 is written every IRQ4 */ case 0x20: if (data != (0x100 << 12) && data != (0xef << 12)) - logerror("%08X: policetr_video_w(3) = %08X & %08X with latch %02X\n", activecpu_get_previouspc(), data, ~mem_mask, video_latch); + logerror("%08X: policetr_video_w(3) = %08X & %08X with latch %02X\n", activecpu_get_previouspc(), data, mem_mask, video_latch); break; /* latch 0x40 is unknown; a 0 is written every IRQ4 */ case 0x40: if (data != 0) - logerror("%08X: policetr_video_w(3) = %08X & %08X with latch %02X\n", activecpu_get_previouspc(), data, ~mem_mask, video_latch); + logerror("%08X: policetr_video_w(3) = %08X & %08X with latch %02X\n", activecpu_get_previouspc(), data, mem_mask, video_latch); break; /* latch 0x50 clears IRQ4 */ @@ -256,7 +256,7 @@ WRITE32_HANDLER( policetr_video_w ) /* log anything else */ default: - logerror("%08X: policetr_video_w(3) = %08X & %08X with latch %02X\n", activecpu_get_previouspc(), data, ~mem_mask, video_latch); + logerror("%08X: policetr_video_w(3) = %08X & %08X with latch %02X\n", activecpu_get_previouspc(), data, mem_mask, video_latch); break; } break; diff --git a/src/mame/video/psikyosh.c b/src/mame/video/psikyosh.c index fd363d60070..8cb7c21071a 100644 --- a/src/mame/video/psikyosh.c +++ b/src/mame/video/psikyosh.c @@ -1145,7 +1145,7 @@ VIDEO_UPDATE( psikyosh ) /* Note the z-buffer on each sprite to get correct prio VIDEO_EOF( psikyosh ) { - buffer_spriteram32_w(machine,0,0,0); + buffer_spriteram32_w(machine,0,0,0xffffffff); } /*popmessage ("Regs %08x %08x %08x\n %08x %08x %08x", diff --git a/src/mame/video/psx.c b/src/mame/video/psx.c index ffda8cc2dc1..1f2d7d0e721 100644 --- a/src/mame/video/psx.c +++ b/src/mame/video/psx.c @@ -3907,7 +3907,7 @@ INTERRUPT_GEN( psx_vblank ) void psx_gpu_reset( void ) { - psx_gpu_w( Machine, 1, 0, 0 ); + psx_gpu_w( Machine, 1, 0, 0xffffffff ); } void psx_lightgun_set( int n_x, int n_y ) diff --git a/src/mame/video/rastan.c b/src/mame/video/rastan.c index f4fa1cd9953..039b8ebb83c 100644 --- a/src/mame/video/rastan.c +++ b/src/mame/video/rastan.c @@ -129,9 +129,9 @@ VIDEO_UPDATE( opwolf ) PC090OJ_draw_sprites(screen->machine,bitmap,cliprect,1); -// if (input_port_5_word_r(0,0xffff)) +// if (input_port_read_indexed(machine,5)) -// popmessage("%d %d",input_port_5_word_r(0,0xffff),input_port_6_word_r(0,0xffff)); +// popmessage("%d %d",input_port_read_indexed(machine,5),input_port_read_indexed(machine,6)); return 0; } diff --git a/src/mame/video/stvvdp1.c b/src/mame/video/stvvdp1.c index cc9954897ac..de72d30a371 100644 --- a/src/mame/video/stvvdp1.c +++ b/src/mame/video/stvvdp1.c @@ -356,7 +356,7 @@ WRITE32_HANDLER ( stv_vdp1_vram_w ) // if (((offset * 4) > 0xdf) && ((offset * 4) < 0x140)) // { -// logerror("cpu #%d (PC=%08X): VRAM dword write to %08X = %08X & %08X\n", cpu_getactivecpu(), activecpu_get_pc(), offset*4, data, mem_mask ^ 0xffffffff); +// logerror("cpu #%d (PC=%08X): VRAM dword write to %08X = %08X & %08X\n", cpu_getactivecpu(), activecpu_get_pc(), offset*4, data, mem_mask); // } data = stv_vdp1_vram[offset]; diff --git a/src/mame/video/suprnova.c b/src/mame/video/suprnova.c index 9acef0b61b8..91453ce4844 100644 --- a/src/mame/video/suprnova.c +++ b/src/mame/video/suprnova.c @@ -970,5 +970,5 @@ VIDEO_UPDATE(skns) VIDEO_EOF(skns) { - buffer_spriteram32_w(machine,0,0,0); + buffer_spriteram32_w(machine,0,0,0xffffffff); } diff --git a/src/mame/video/taito_b.c b/src/mame/video/taito_b.c index 1dbf70fdeed..8d8bf54034c 100644 --- a/src/mame/video/taito_b.c +++ b/src/mame/video/taito_b.c @@ -162,7 +162,7 @@ static void hitice_clear_pixel_bitmap(running_machine *machine) int i; for (i = 0;i < 0x40000;i++) - hitice_pixelram_w(machine,i,0,0); + hitice_pixelram_w(machine,i,0,0xffff); } static TILE_GET_INFO( get_bg_tile_info ) diff --git a/src/mame/video/taitoic.c b/src/mame/video/taitoic.c index 1d8414ab306..7ced0ad9c6d 100644 --- a/src/mame/video/taitoic.c +++ b/src/mame/video/taitoic.c @@ -2612,7 +2612,7 @@ WRITE16_HANDLER( TC0100SCN_ctrl_word_2_w ) READ32_HANDLER( TC0100SCN_ctrl_long_r ) { - return (TC0100SCN_ctrl_word_0_r(machine,offset*2,0)<<16)|TC0100SCN_ctrl_word_0_r(machine,offset*2+1,0); + return (TC0100SCN_ctrl_word_0_r(machine,offset*2,0xffff)<<16)|TC0100SCN_ctrl_word_0_r(machine,offset*2+1,0xffff); } WRITE32_HANDLER( TC0100SCN_ctrl_long_w ) @@ -2623,30 +2623,30 @@ WRITE32_HANDLER( TC0100SCN_ctrl_long_w ) READ32_HANDLER( TC0100SCN_long_r ) { - return (TC0100SCN_word_0_r(machine,offset*2,0)<<16)|TC0100SCN_word_0_r(machine,offset*2+1,0); + return (TC0100SCN_word_0_r(machine,offset*2,0xffff)<<16)|TC0100SCN_word_0_r(machine,offset*2+1,0xffff); } WRITE32_HANDLER( TC0100SCN_long_w ) { if (ACCESSING_BITS_16_31) { - int oldword = TC0100SCN_word_0_r(machine,offset*2,0); + int oldword = TC0100SCN_word_0_r(machine,offset*2,0xffff); int newword = data>>16; if (!ACCESSING_BITS_16_23) newword |= (oldword &0x00ff); if (!ACCESSING_BITS_24_31) newword |= (oldword &0xff00); - TC0100SCN_word_0_w(machine,offset*2,newword,0); + TC0100SCN_word_0_w(machine,offset*2,newword,0xffff); } if (ACCESSING_BITS_0_15) { - int oldword = TC0100SCN_word_0_r(machine,(offset*2)+1,0); + int oldword = TC0100SCN_word_0_r(machine,(offset*2)+1,0xffff); int newword = data&0xffff; if (!ACCESSING_BITS_0_7) newword |= (oldword &0x00ff); if (!ACCESSING_BITS_8_15) newword |= (oldword &0xff00); - TC0100SCN_word_0_w(machine,(offset*2)+1,newword,0); + TC0100SCN_word_0_w(machine,(offset*2)+1,newword,0xffff); } } @@ -3281,7 +3281,7 @@ void TC0480SCP_vh_start(running_machine *machine, int gfxnum,int pixels,int x_of READ32_HANDLER( TC0480SCP_ctrl_long_r ) { - return (TC0480SCP_ctrl_word_r(machine,offset*2,0)<<16)|TC0480SCP_ctrl_word_r(machine,offset*2+1,0); + return (TC0480SCP_ctrl_word_r(machine,offset*2,0xffff)<<16)|TC0480SCP_ctrl_word_r(machine,offset*2+1,0xffff); } /* TODO: byte access ? */ @@ -3294,30 +3294,30 @@ WRITE32_HANDLER( TC0480SCP_ctrl_long_w ) READ32_HANDLER( TC0480SCP_long_r ) { - return (TC0480SCP_word_r(machine,offset*2,0)<<16)|TC0480SCP_word_r(machine,offset*2+1,0); + return (TC0480SCP_word_r(machine,offset*2,0xffff)<<16)|TC0480SCP_word_r(machine,offset*2+1,0xffff); } WRITE32_HANDLER( TC0480SCP_long_w ) { if (ACCESSING_BITS_16_31) { - int oldword = TC0480SCP_word_r(machine,offset*2,0); + int oldword = TC0480SCP_word_r(machine,offset*2,0xffff); int newword = data>>16; if (!ACCESSING_BITS_16_23) newword |= (oldword &0x00ff); if (!ACCESSING_BITS_24_31) newword |= (oldword &0xff00); - TC0480SCP_word_w(machine,offset*2,newword,0); + TC0480SCP_word_w(machine,offset*2,newword,0xffff); } if (ACCESSING_BITS_0_15) { - int oldword = TC0480SCP_word_r(machine,(offset*2)+1,0); + int oldword = TC0480SCP_word_r(machine,(offset*2)+1,0xffff); int newword = data&0xffff; if (!ACCESSING_BITS_0_7) newword |= (oldword &0x00ff); if (!ACCESSING_BITS_8_15) newword |= (oldword &0xff00); - TC0480SCP_word_w(machine,(offset*2)+1,newword,0); + TC0480SCP_word_w(machine,(offset*2)+1,newword,0xffff); } } diff --git a/src/mame/video/thepit.c b/src/mame/video/thepit.c index 67098f1ff5f..6b896359182 100644 --- a/src/mame/video/thepit.c +++ b/src/mame/video/thepit.c @@ -219,11 +219,11 @@ READ8_HANDLER( thepit_input_port_0_r ) horizontal flip switch. (This is how the real PCB does it) */ if (thepit_flip_screen_x) { - return input_port_3_r(machine,offset); + return input_port_read_indexed(machine, 3); } else { - return input_port_0_r(machine,offset); + return input_port_read_indexed(machine, 0); } } diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c index f4caec47c84..a28f3cc460d 100644 --- a/src/mame/video/tigeroad.c +++ b/src/mame/video/tigeroad.c @@ -166,5 +166,5 @@ VIDEO_UPDATE( tigeroad ) VIDEO_EOF( tigeroad ) { - buffer_spriteram16_w(machine,0,0,0); + buffer_spriteram16_w(machine,0,0,0xffff); } diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c index edd95ea39e2..275c32a3163 100644 --- a/src/mame/video/toaplan1.c +++ b/src/mame/video/toaplan1.c @@ -319,12 +319,12 @@ static void toaplan1_set_scrolls(void) static STATE_POSTLOAD( rallybik_flipscreen ) { - rallybik_bcu_flipscreen_w(Machine, 0, bcu_flipscreen, 0); + rallybik_bcu_flipscreen_w(machine, 0, bcu_flipscreen, 0xffff); } static STATE_POSTLOAD( toaplan1_flipscreen ) { - toaplan1_bcu_flipscreen_w(Machine, 0, bcu_flipscreen, 0); + toaplan1_bcu_flipscreen_w(machine, 0, bcu_flipscreen, 0xffff); } @@ -1230,18 +1230,18 @@ VIDEO_UPDATE( demonwld ) VIDEO_EOF( rallybik ) { - buffer_spriteram16_w(machine, 0, 0, 0); + buffer_spriteram16_w(machine, 0, 0, 0xffff); } VIDEO_EOF( toaplan1 ) { - buffer_spriteram16_w(machine, 0, 0, 0); + buffer_spriteram16_w(machine, 0, 0, 0xffff); memcpy(toaplan1_buffered_spritesizeram16, toaplan1_spritesizeram16, TOAPLAN1_SPRITESIZERAM_SIZE); } VIDEO_EOF( samesame ) { - buffer_spriteram16_w(machine, 0, 0, 0); + buffer_spriteram16_w(machine, 0, 0, 0xffff); memcpy(toaplan1_buffered_spritesizeram16, toaplan1_spritesizeram16, TOAPLAN1_SPRITESIZERAM_SIZE); cpunum_set_input_line(machine, 0, MC68000_IRQ_2, HOLD_LINE); /* Frame done */ } diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c index 9a7f0678b73..37654968f50 100644 --- a/src/mame/video/toaplan2.c +++ b/src/mame/video/toaplan2.c @@ -569,7 +569,7 @@ static void toaplan2_voffs_w(offs_t offset, UINT16 data, UINT32 mem_mask, int co WRITE16_HANDLER( toaplan2_0_voffs_w ) { - toaplan2_voffs_w(offset, data, mem_mask, 0); + toaplan2_voffs_w(offset, data, mem_mask, 0xffff); } WRITE16_HANDLER( toaplan2_1_voffs_w ) @@ -802,7 +802,7 @@ static void toaplan2_videoram16_w(offs_t offset, UINT16 data, UINT32 mem_mask, i WRITE16_HANDLER( toaplan2_0_videoram16_w ) { - toaplan2_videoram16_w(offset, data, mem_mask, 0); + toaplan2_videoram16_w(offset, data, mem_mask, 0xffff); } WRITE16_HANDLER( toaplan2_1_videoram16_w ) @@ -1067,20 +1067,20 @@ WRITE16_HANDLER( pipibibi_scroll_w ) READ16_HANDLER( pipibibi_videoram16_r ) { - toaplan2_voffs_w(0, offset, 0, 0); - return toaplan2_videoram16_r(0, 0); + toaplan2_voffs_w(0, offset, 0xffff, 0); + return toaplan2_videoram16_r(0, mem_mask); } WRITE16_HANDLER( pipibibi_videoram16_w) { - toaplan2_voffs_w(0, offset, 0, 0); + toaplan2_voffs_w(0, offset, 0xffff, 0); toaplan2_videoram16_w(0, data, mem_mask, 0); } READ16_HANDLER( pipibibi_spriteram16_r ) { toaplan2_voffs_w(0, (0x1800 + offset), 0, 0); - return toaplan2_videoram16_r(0, 0); + return toaplan2_videoram16_r(0, mem_mask); } WRITE16_HANDLER( pipibibi_spriteram16_w ) diff --git a/src/mame/video/toki.c b/src/mame/video/toki.c index f920a207802..bf91b353c0e 100644 --- a/src/mame/video/toki.c +++ b/src/mame/video/toki.c @@ -38,12 +38,12 @@ WRITE16_HANDLER( toki_control_w ) VIDEO_EOF( toki ) { - buffer_spriteram16_w(machine,0,0,0); + buffer_spriteram16_w(machine,0,0,0xffff); } VIDEO_EOF( tokib ) { - buffer_spriteram16_w(machine,0,0,0); + buffer_spriteram16_w(machine,0,0,0xffff); } static TILE_GET_INFO( get_text_tile_info ) diff --git a/src/mame/video/twin16.c b/src/mame/video/twin16.c index f0cc68ee9db..ce8ae702173 100644 --- a/src/mame/video/twin16.c +++ b/src/mame/video/twin16.c @@ -440,7 +440,7 @@ VIDEO_EOF( twin16 ) need_process_spriteram = 1; - buffer_spriteram16_w(machine,0,0,0); + buffer_spriteram16_w(machine,0,0,0xffff); } VIDEO_UPDATE( twin16 ) diff --git a/src/mame/video/twincobr.c b/src/mame/video/twincobr.c index f231d172ac8..c487de1bfe5 100644 --- a/src/mame/video/twincobr.c +++ b/src/mame/video/twincobr.c @@ -290,37 +290,37 @@ WRITE16_HANDLER( twincobr_exscroll_w ) /* Extra unused video layer */ WRITE8_HANDLER( wardner_txlayer_w ) { int shift = 8 * (offset & 1); - twincobr_txoffs_w(machine, offset / 2, data << shift, 0xff00 >> shift); + twincobr_txoffs_w(machine, offset / 2, data << shift, 0xff << shift); } WRITE8_HANDLER( wardner_bglayer_w ) { int shift = 8 * (offset & 1); - twincobr_bgoffs_w(machine, offset / 2, data << shift, 0xff00 >> shift); + twincobr_bgoffs_w(machine, offset / 2, data << shift, 0xff << shift); } WRITE8_HANDLER( wardner_fglayer_w ) { int shift = 8 * (offset & 1); - twincobr_fgoffs_w(machine, offset / 2, data << shift, 0xff00 >> shift); + twincobr_fgoffs_w(machine, offset / 2, data << shift, 0xff << shift); } WRITE8_HANDLER( wardner_txscroll_w ) { int shift = 8 * (offset & 1); - twincobr_txscroll_w(machine, offset / 2, data << shift, 0xff00 >> shift); + twincobr_txscroll_w(machine, offset / 2, data << shift, 0xff << shift); } WRITE8_HANDLER( wardner_bgscroll_w ) { int shift = 8 * (offset & 1); - twincobr_bgscroll_w(machine, offset / 2, data << shift, 0xff00 >> shift); + twincobr_bgscroll_w(machine, offset / 2, data << shift, 0xff << shift); } WRITE8_HANDLER( wardner_fgscroll_w ) { int shift = 8 * (offset & 1); - twincobr_fgscroll_w(machine, offset / 2, data << shift, 0xff00 >> shift); + twincobr_fgscroll_w(machine, offset / 2, data << shift, 0xff << shift); } WRITE8_HANDLER( wardner_exscroll_w ) /* Extra unused video layer */ @@ -338,9 +338,9 @@ READ8_HANDLER( wardner_videoram_r ) { int shift = 8 * (offset & 1); switch (offset/2) { - case 0: return twincobr_txram_r(machine,0,0) >> shift; break; - case 1: return twincobr_bgram_r(machine,0,0) >> shift; break; - case 2: return twincobr_fgram_r(machine,0,0) >> shift; break; + case 0: return twincobr_txram_r(machine,0,0xffff) >> shift; break; + case 1: return twincobr_bgram_r(machine,0,0xffff) >> shift; break; + case 2: return twincobr_fgram_r(machine,0,0xffff) >> shift; break; } return 0; } @@ -349,9 +349,9 @@ WRITE8_HANDLER( wardner_videoram_w ) { int shift = 8 * (offset & 1); switch (offset/2) { - case 0: twincobr_txram_w(machine,0,data << shift, 0xff00 >> shift); break; - case 1: twincobr_bgram_w(machine,0,data << shift, 0xff00 >> shift); break; - case 2: twincobr_fgram_w(machine,0,data << shift, 0xff00 >> shift); break; + case 0: twincobr_txram_w(machine,0,data << shift, 0xff << shift); break; + case 1: twincobr_bgram_w(machine,0,data << shift, 0xff << shift); break; + case 2: twincobr_fgram_w(machine,0,data << shift, 0xff << shift); break; } } @@ -517,5 +517,5 @@ VIDEO_EOF( toaplan0 ) /* Spriteram is always 1 frame ahead, suggesting spriteram buffering. There are no CPU output registers that control this so we assume it happens automatically every frame, at the end of vblank */ - buffer_spriteram16_w(machine,0,0,0); + buffer_spriteram16_w(machine,0,0,0xffff); } diff --git a/src/mame/video/undrfire.c b/src/mame/video/undrfire.c index d4390b77812..95b63c148a5 100644 --- a/src/mame/video/undrfire.c +++ b/src/mame/video/undrfire.c @@ -495,7 +495,7 @@ VIDEO_UPDATE( undrfire ) /* See if we should draw artificial gun targets */ /* (not yet implemented...) */ - if (input_port_7_word_r(screen->machine,0,0) & 0x1) /* Fake DSW */ + if (input_port_read_indexed(screen->machine,7) & 0x1) /* Fake DSW */ { popmessage("Gunsights on"); } @@ -639,7 +639,7 @@ VIDEO_UPDATE( cbombers ) /* See if we should draw artificial gun targets */ /* (not yet implemented...) */ - if (input_port_7_word_r(screen->machine,0,0) & 0x1) /* Fake DSW */ + if (input_port_read_indexed(screen->machine,7) & 0x1) /* Fake DSW */ { popmessage("Gunsights on"); } diff --git a/src/mame/video/volfied.c b/src/mame/video/volfied.c index ee222d33f3f..202e7954413 100644 --- a/src/mame/video/volfied.c +++ b/src/mame/video/volfied.c @@ -34,7 +34,7 @@ READ16_HANDLER( volfied_video_ram_r ) WRITE16_HANDLER( volfied_video_ram_w ) { - mem_mask |= ~video_mask; + mem_mask &= video_mask; COMBINE_DATA(&video_ram[offset]); }