summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine/pgmprot2.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine/pgmprot2.c')
-rw-r--r--src/mame/machine/pgmprot2.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/mame/machine/pgmprot2.c b/src/mame/machine/pgmprot2.c
index 1682119a32e..5dcbfc3cc64 100644
--- a/src/mame/machine/pgmprot2.c
+++ b/src/mame/machine/pgmprot2.c
@@ -40,7 +40,7 @@ static READ32_HANDLER( arm7_latch_arm_r )
device_set_input_line(state->m_prot, ARM7_FIRQ_LINE, CLEAR_LINE ); // guess
if (PGMARM7LOGERROR)
- logerror("ARM7: Latch read: %08x (%08x) (%06x)\n", state->m_kov2_latchdata_68k_w, mem_mask, cpu_get_pc(&space->device()));
+ logerror("ARM7: Latch read: %08x (%08x) (%06x)\n", state->m_kov2_latchdata_68k_w, mem_mask, space->device().safe_pc());
return state->m_kov2_latchdata_68k_w;
}
@@ -49,7 +49,7 @@ static WRITE32_HANDLER( arm7_latch_arm_w )
pgm_arm_type2_state *state = space->machine().driver_data<pgm_arm_type2_state>();
if (PGMARM7LOGERROR)
- logerror("ARM7: Latch write: %08x (%08x) (%06x)\n", data, mem_mask, cpu_get_pc(&space->device()));
+ logerror("ARM7: Latch write: %08x (%08x) (%06x)\n", data, mem_mask, space->device().safe_pc());
COMBINE_DATA(&state->m_kov2_latchdata_arm_w);
}
@@ -59,7 +59,7 @@ static READ32_HANDLER( arm7_shareram_r )
pgm_arm_type2_state *state = space->machine().driver_data<pgm_arm_type2_state>();
if (PGMARM7LOGERROR)
- logerror("ARM7: ARM7 Shared RAM Read: %04x = %08x (%08x) (%06x)\n", offset << 2, state->m_arm7_shareram[offset], mem_mask, cpu_get_pc(&space->device()));
+ logerror("ARM7: ARM7 Shared RAM Read: %04x = %08x (%08x) (%06x)\n", offset << 2, state->m_arm7_shareram[offset], mem_mask, space->device().safe_pc());
return state->m_arm7_shareram[offset];
}
@@ -68,7 +68,7 @@ static WRITE32_HANDLER( arm7_shareram_w )
pgm_arm_type2_state *state = space->machine().driver_data<pgm_arm_type2_state>();
if (PGMARM7LOGERROR)
- logerror("ARM7: ARM7 Shared RAM Write: %04x = %08x (%08x) (%06x)\n", offset << 2, data, mem_mask, cpu_get_pc(&space->device()));
+ logerror("ARM7: ARM7 Shared RAM Write: %04x = %08x (%08x) (%06x)\n", offset << 2, data, mem_mask, space->device().safe_pc());
COMBINE_DATA(&state->m_arm7_shareram[offset]);
}
@@ -77,7 +77,7 @@ static READ16_HANDLER( arm7_latch_68k_r )
pgm_arm_type2_state *state = space->machine().driver_data<pgm_arm_type2_state>();
if (PGMARM7LOGERROR)
- logerror("M68K: Latch read: %04x (%04x) (%06x)\n", state->m_kov2_latchdata_arm_w & 0x0000ffff, mem_mask, cpu_get_pc(&space->device()));
+ logerror("M68K: Latch read: %04x (%04x) (%06x)\n", state->m_kov2_latchdata_arm_w & 0x0000ffff, mem_mask, space->device().safe_pc());
return state->m_kov2_latchdata_arm_w;
}
@@ -86,7 +86,7 @@ static WRITE16_HANDLER( arm7_latch_68k_w )
pgm_arm_type2_state *state = space->machine().driver_data<pgm_arm_type2_state>();
if (PGMARM7LOGERROR)
- logerror("M68K: Latch write: %04x (%04x) (%06x)\n", data & 0x0000ffff, mem_mask, cpu_get_pc(&space->device()));
+ logerror("M68K: Latch write: %04x (%04x) (%06x)\n", data & 0x0000ffff, mem_mask, space->device().safe_pc());
COMBINE_DATA(&state->m_kov2_latchdata_68k_w);
device_set_input_line(state->m_prot, ARM7_FIRQ_LINE, ASSERT_LINE ); // guess
@@ -98,7 +98,7 @@ static READ16_HANDLER( arm7_ram_r )
UINT16 *share16 = reinterpret_cast<UINT16 *>(state->m_arm7_shareram.target());
if (PGMARM7LOGERROR)
- logerror("M68K: ARM7 Shared RAM Read: %04x = %04x (%08x) (%06x)\n", BYTE_XOR_LE(offset), share16[BYTE_XOR_LE(offset)], mem_mask, cpu_get_pc(&space->device()));
+ logerror("M68K: ARM7 Shared RAM Read: %04x = %04x (%08x) (%06x)\n", BYTE_XOR_LE(offset), share16[BYTE_XOR_LE(offset)], mem_mask, space->device().safe_pc());
return share16[BYTE_XOR_LE(offset)];
}
@@ -108,7 +108,7 @@ static WRITE16_HANDLER( arm7_ram_w )
UINT16 *share16 = reinterpret_cast<UINT16 *>(state->m_arm7_shareram.target());
if (PGMARM7LOGERROR)
- logerror("M68K: ARM7 Shared RAM Write: %04x = %04x (%04x) (%06x)\n", BYTE_XOR_LE(offset), data, mem_mask, cpu_get_pc(&space->device()));
+ logerror("M68K: ARM7 Shared RAM Write: %04x = %04x (%04x) (%06x)\n", BYTE_XOR_LE(offset), data, mem_mask, space->device().safe_pc());
COMBINE_DATA(&share16[BYTE_XOR_LE(offset)]);
}
@@ -176,7 +176,7 @@ static void kov2_latch_init( running_machine &machine )
static WRITE32_HANDLER( kov2_arm_region_w )
{
pgm_arm_type2_state *state = space->machine().driver_data<pgm_arm_type2_state>();
- int pc = cpu_get_pc(&space->device());
+ int pc = space->device().safe_pc();
int regionhack = state->ioport("RegionHack")->read();
if (pc==0x190 && regionhack != 0xff) data = (data & 0xffff0000) | (regionhack << 0);
COMBINE_DATA(&state->m_arm7_shareram[0x138/4]);
@@ -229,7 +229,7 @@ DRIVER_INIT_MEMBER(pgm_arm_type2_state,kov2p)
static WRITE32_HANDLER( martmast_arm_region_w )
{
pgm_arm_type2_state *state = space->machine().driver_data<pgm_arm_type2_state>();
- int pc = cpu_get_pc(&space->device());
+ int pc = space->device().safe_pc();
int regionhack = state->ioport("RegionHack")->read();
if (pc==0x170 && regionhack != 0xff) data = (data & 0xffff0000) | (regionhack << 0);
COMBINE_DATA(&state->m_arm7_shareram[0x138/4]);
@@ -250,7 +250,7 @@ DRIVER_INIT_MEMBER(pgm_arm_type2_state,martmast)
static WRITE32_HANDLER( ddp2_arm_region_w )
{
pgm_arm_type2_state *state = space->machine().driver_data<pgm_arm_type2_state>();
- int pc = cpu_get_pc(&space->device());
+ int pc = space->device().safe_pc();
int regionhack = state->ioport("RegionHack")->read();
if (pc==0x0174 && regionhack != 0xff) data = (data & 0x0000ffff) | (regionhack << 16);
COMBINE_DATA(&state->m_arm7_shareram[0x0]);
@@ -259,7 +259,7 @@ static WRITE32_HANDLER( ddp2_arm_region_w )
static READ32_HANDLER( ddp2_speedup_r )
{
pgm_arm_type2_state *state = space->machine().driver_data<pgm_arm_type2_state>();
- int pc = cpu_get_pc(&space->device());
+ int pc = space->device().safe_pc();
UINT32 data = state->m_arm_ram[0x300c/4];
if (pc==0x080109b4)
@@ -282,7 +282,7 @@ static READ16_HANDLER( ddp2_main_speedup_r )
{
UINT16 data = pgm_mainram[0x0ee54/2];
- int pc = cpu_get_pc(&space->device());
+ int pc = space->device().safe_pc();
if (pc == 0x149dce) device_spin_until_interrupt(&space->device());
if (pc == 0x149cfe) device_spin_until_interrupt(&space->device());