summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/vamphalf.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/vamphalf.c')
-rw-r--r--src/mame/drivers/vamphalf.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c
index 7633dbecc3d..853e2c1668e 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -2218,7 +2218,7 @@ static int irq_active(address_space *space)
READ16_MEMBER(vamphalf_state::vamphalf_speedup_r)
{
- if(cpu_get_pc(&space.device()) == 0x82de)
+ if(space.device().safe_pc() == 0x82de)
{
if(irq_active(&space))
device_spin_until_interrupt(&space.device());
@@ -2231,7 +2231,7 @@ READ16_MEMBER(vamphalf_state::vamphalf_speedup_r)
READ16_MEMBER(vamphalf_state::vamphafk_speedup_r)
{
- if(cpu_get_pc(&space.device()) == 0x82de)
+ if(space.device().safe_pc() == 0x82de)
{
if(irq_active(&space))
device_spin_until_interrupt(&space.device());
@@ -2244,7 +2244,7 @@ READ16_MEMBER(vamphalf_state::vamphafk_speedup_r)
READ16_MEMBER(vamphalf_state::misncrft_speedup_r)
{
- if(cpu_get_pc(&space.device()) == 0xecc8)
+ if(space.device().safe_pc() == 0xecc8)
{
if(irq_active(&space))
device_spin_until_interrupt(&space.device());
@@ -2257,7 +2257,7 @@ READ16_MEMBER(vamphalf_state::misncrft_speedup_r)
READ16_MEMBER(vamphalf_state::coolmini_speedup_r)
{
- if(cpu_get_pc(&space.device()) == 0x75f7a)
+ if(space.device().safe_pc() == 0x75f7a)
{
if(irq_active(&space))
device_spin_until_interrupt(&space.device());
@@ -2270,7 +2270,7 @@ READ16_MEMBER(vamphalf_state::coolmini_speedup_r)
READ16_MEMBER(vamphalf_state::suplup_speedup_r)
{
- if(cpu_get_pc(&space.device()) == 0xaf18a )
+ if(space.device().safe_pc() == 0xaf18a )
{
if(irq_active(&space))
device_spin_until_interrupt(&space.device());
@@ -2283,7 +2283,7 @@ READ16_MEMBER(vamphalf_state::suplup_speedup_r)
READ16_MEMBER(vamphalf_state::luplup_speedup_r)
{
- if(cpu_get_pc(&space.device()) == 0xaefac )
+ if(space.device().safe_pc() == 0xaefac )
{
if(irq_active(&space))
device_spin_until_interrupt(&space.device());
@@ -2296,7 +2296,7 @@ READ16_MEMBER(vamphalf_state::luplup_speedup_r)
READ16_MEMBER(vamphalf_state::luplup29_speedup_r)
{
- if(cpu_get_pc(&space.device()) == 0xae6c0 )
+ if(space.device().safe_pc() == 0xae6c0 )
{
if(irq_active(&space))
device_spin_until_interrupt(&space.device());
@@ -2309,7 +2309,7 @@ READ16_MEMBER(vamphalf_state::luplup29_speedup_r)
READ16_MEMBER(vamphalf_state::puzlbang_speedup_r)
{
- if(cpu_get_pc(&space.device()) == 0xae6d2 )
+ if(space.device().safe_pc() == 0xae6d2 )
{
if(irq_active(&space))
device_spin_until_interrupt(&space.device());
@@ -2322,7 +2322,7 @@ READ16_MEMBER(vamphalf_state::puzlbang_speedup_r)
READ32_MEMBER(vamphalf_state::wyvernwg_speedup_r)
{
- int pc = cpu_get_pc(&space.device());
+ int pc = space.device().safe_pc();
if(pc == 0x10758)
{
@@ -2337,7 +2337,7 @@ READ32_MEMBER(vamphalf_state::wyvernwg_speedup_r)
READ32_MEMBER(vamphalf_state::wyvernwga_speedup_r)
{
- int pc = cpu_get_pc(&space.device());
+ int pc = space.device().safe_pc();
if(pc == 0x10758)
{
@@ -2354,7 +2354,7 @@ READ32_MEMBER(vamphalf_state::wyvernwga_speedup_r)
READ32_MEMBER(vamphalf_state::finalgdr_speedup_r)
{
- if(cpu_get_pc(&space.device()) == 0x1c212)
+ if(space.device().safe_pc() == 0x1c212)
{
if(irq_active(&space))
device_spin_until_interrupt(&space.device());
@@ -2367,7 +2367,7 @@ READ32_MEMBER(vamphalf_state::finalgdr_speedup_r)
READ32_MEMBER(vamphalf_state::mrkicker_speedup_r)
{
- UINT32 pc = cpu_get_pc(&space.device());
+ UINT32 pc = space.device().safe_pc();
if(pc == 0x469de || pc == 0x46a36)
{
// if(irq_active(&space))
@@ -2382,7 +2382,7 @@ READ32_MEMBER(vamphalf_state::mrkicker_speedup_r)
READ16_MEMBER(vamphalf_state::dquizgo2_speedup_r)
{
- if(cpu_get_pc(&space.device()) == 0xaa622)
+ if(space.device().safe_pc() == 0xaa622)
{
if(irq_active(&space))
device_spin_until_interrupt(&space.device());
@@ -2395,11 +2395,11 @@ READ16_MEMBER(vamphalf_state::dquizgo2_speedup_r)
READ32_MEMBER(vamphalf_state::aoh_speedup_r)
{
- if(cpu_get_pc(&space.device()) == 0xb994 )
+ if(space.device().safe_pc() == 0xb994 )
{
device_eat_cycles(&space.device(), 500);
}
- else if (cpu_get_pc(&space.device()) == 0xba40 )
+ else if (space.device().safe_pc() == 0xba40 )
{
device_eat_cycles(&space.device(), 500);
}
@@ -2410,7 +2410,7 @@ READ32_MEMBER(vamphalf_state::aoh_speedup_r)
READ16_MEMBER(vamphalf_state::jmpbreak_speedup_r)
{
- if(cpu_get_pc(&space.device()) == 0x983c)
+ if(space.device().safe_pc() == 0x983c)
{
if(irq_active(&space))
device_spin_until_interrupt(&space.device());
@@ -2423,7 +2423,7 @@ READ16_MEMBER(vamphalf_state::jmpbreak_speedup_r)
READ16_MEMBER(vamphalf_state::mrdig_speedup_r)
{
- if(cpu_get_pc(&space.device()) == 0x1710)
+ if(space.device().safe_pc() == 0x1710)
{
if(irq_active(&space))
device_spin_until_interrupt(&space.device());
@@ -2437,7 +2437,7 @@ READ16_MEMBER(vamphalf_state::mrdig_speedup_r)
READ16_MEMBER(vamphalf_state::dtfamily_speedup_r)
{
- int pc = cpu_get_pc(&space.device());
+ int pc = space.device().safe_pc();
if (pc == 0x12fa6)
device_spin_until_interrupt(&space.device());
@@ -2449,7 +2449,7 @@ READ16_MEMBER(vamphalf_state::dtfamily_speedup_r)
READ16_MEMBER(vamphalf_state::toyland_speedup_r)
{
- if (cpu_get_pc(&space.device()) == 0x130c2)
+ if (space.device().safe_pc() == 0x130c2)
device_spin_until_interrupt(&space.device());
return m_wram[0x780d8 / 2];
@@ -2458,7 +2458,7 @@ READ16_MEMBER(vamphalf_state::toyland_speedup_r)
READ16_MEMBER(vamphalf_state::boonggab_speedup_r)
{
- if(cpu_get_pc(&space.device()) == 0x13198)
+ if(space.device().safe_pc() == 0x13198)
{
if(irq_active(&space))
device_spin_until_interrupt(&space.device());