diff options
Diffstat (limited to 'src/mame/machine/xevious.c')
-rw-r--r-- | src/mame/machine/xevious.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mame/machine/xevious.c b/src/mame/machine/xevious.c index 77b6d2b9332..c98b68a65c7 100644 --- a/src/mame/machine/xevious.c +++ b/src/mame/machine/xevious.c @@ -63,7 +63,7 @@ TIMER_DEVICE_CALLBACK( battles_nmi_generate ) READ8_HANDLER( battles_customio0_r ) { - logerror("CPU0 %04x: custom I/O Read = %02x\n",cpu_get_pc(&space->device()),battles_customio_command); + logerror("CPU0 %04x: custom I/O Read = %02x\n",space->device().safe_pc(),battles_customio_command); return battles_customio_command; } @@ -71,7 +71,7 @@ READ8_HANDLER( battles_customio3_r ) { int return_data; - if( cpu_get_pc(&space->device()) == 0xAE ){ + if( space->device().safe_pc() == 0xAE ){ /* CPU4 0xAA - 0xB9 : waiting for MB8851 ? */ return_data = ( (battles_customio_command & 0x10) << 3) | 0x00 @@ -81,7 +81,7 @@ READ8_HANDLER( battles_customio3_r ) | 0x60 | (battles_customio_prev_command & 0x0f); } - logerror("CPU3 %04x: custom I/O Read = %02x\n",cpu_get_pc(&space->device()),return_data); + logerror("CPU3 %04x: custom I/O Read = %02x\n",space->device().safe_pc(),return_data); return return_data; } @@ -91,7 +91,7 @@ WRITE8_HANDLER( battles_customio0_w ) { timer_device *timer = space->machine().device<timer_device>("battles_nmi"); - logerror("CPU0 %04x: custom I/O Write = %02x\n",cpu_get_pc(&space->device()),data); + logerror("CPU0 %04x: custom I/O Write = %02x\n",space->device().safe_pc(),data); battles_customio_command = data; battles_customio_command_count = 0; @@ -108,7 +108,7 @@ WRITE8_HANDLER( battles_customio0_w ) WRITE8_HANDLER( battles_customio3_w ) { - logerror("CPU3 %04x: custom I/O Write = %02x\n",cpu_get_pc(&space->device()),data); + logerror("CPU3 %04x: custom I/O Write = %02x\n",space->device().safe_pc(),data); battles_customio_command = data; } @@ -117,27 +117,27 @@ WRITE8_HANDLER( battles_customio3_w ) READ8_HANDLER( battles_customio_data0_r ) { - logerror("CPU0 %04x: custom I/O parameter %02x Read = %02x\n",cpu_get_pc(&space->device()),offset,battles_customio_data); + logerror("CPU0 %04x: custom I/O parameter %02x Read = %02x\n",space->device().safe_pc(),offset,battles_customio_data); return battles_customio_data; } READ8_HANDLER( battles_customio_data3_r ) { - logerror("CPU3 %04x: custom I/O parameter %02x Read = %02x\n",cpu_get_pc(&space->device()),offset,battles_customio_data); + logerror("CPU3 %04x: custom I/O parameter %02x Read = %02x\n",space->device().safe_pc(),offset,battles_customio_data); return battles_customio_data; } WRITE8_HANDLER( battles_customio_data0_w ) { - logerror("CPU0 %04x: custom I/O parameter %02x Write = %02x\n",cpu_get_pc(&space->device()),offset,data); + logerror("CPU0 %04x: custom I/O parameter %02x Write = %02x\n",space->device().safe_pc(),offset,data); battles_customio_data = data; } WRITE8_HANDLER( battles_customio_data3_w ) { - logerror("CPU3 %04x: custom I/O parameter %02x Write = %02x\n",cpu_get_pc(&space->device()),offset,data); + logerror("CPU3 %04x: custom I/O parameter %02x Write = %02x\n",space->device().safe_pc(),offset,data); battles_customio_data = data; } @@ -155,7 +155,7 @@ WRITE8_HANDLER( battles_CPU4_coin_w ) WRITE8_HANDLER( battles_noise_sound_w ) { - logerror("CPU3 %04x: 50%02x Write = %02x\n",cpu_get_pc(&space->device()),offset,data); + logerror("CPU3 %04x: 50%02x Write = %02x\n",space->device().safe_pc(),offset,data); if( (battles_sound_played == 0) && (data == 0xFF) ){ samples_device *samples = space->machine().device<samples_device>("samples"); if( customio[0] == 0x40 ){ |