summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/konami
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-11-24 02:40:16 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-11-24 02:40:16 +0000
commit513011179dadbaf95bd72a113dc1cb9a9f8afe4b (patch)
treeec9c992e3715c7e4bc90a6892fc88169fa2c535d /src/emu/cpu/konami
parent64164a3e97154682d3ebdd5ffdf4cd8b22a1a6b2 (diff)
change_pc? What change_pc?
Diffstat (limited to 'src/emu/cpu/konami')
-rw-r--r--src/emu/cpu/konami/konami.c9
-rw-r--r--src/emu/cpu/konami/konamops.c19
2 files changed, 3 insertions, 25 deletions
diff --git a/src/emu/cpu/konami/konami.c b/src/emu/cpu/konami/konami.c
index 02ee6ac6d33..2fffb9fb06b 100644
--- a/src/emu/cpu/konami/konami.c
+++ b/src/emu/cpu/konami/konami.c
@@ -131,7 +131,6 @@ static PAIR ea; /* effective address */
} \
CC |= CC_IF | CC_II; /* inhibit FIRQ and IRQ */ \
PCD = RM16(0xfff6); \
- change_pc(PC); /* TS 971002 */ \
(void)(*konami.irq_callback)(konami.device, KONAMI_FIRQ_LINE); \
} \
else \
@@ -159,7 +158,6 @@ static PAIR ea; /* effective address */
} \
CC |= CC_II; /* inhibit IRQ */ \
PCD = RM16(0xfff8); \
- change_pc(PC); /* TS 971002 */ \
(void)(*konami.irq_callback)(konami.device, KONAMI_IRQ_LINE); \
}
@@ -291,7 +289,6 @@ CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N
if( f ) \
{ \
PC += SIGNED(t); \
- change_pc(PC); /* TS 971002 */ \
} \
}
@@ -302,7 +299,6 @@ CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N
{ \
konami_ICount -= 1; \
PC += t.w.l; \
- change_pc(PC); /* TS 971002 */ \
} \
}
@@ -381,7 +377,6 @@ static CPU_SET_CONTEXT( konami )
{
if( src )
konami = *(konami_Regs*)src;
- change_pc(PC); /* TS 971002 */
CHECK_IRQ_LINES;
}
@@ -422,7 +417,6 @@ static CPU_RESET( konami )
CC |= CC_IF; /* FIRQ disabled */
PCD = RM16(0xfffe);
- change_pc(PC); /* TS 971002 */
}
static CPU_EXIT( konami )
@@ -467,7 +461,6 @@ static void set_irq_line(int irqline, int state)
}
CC |= CC_IF | CC_II; /* inhibit FIRQ and IRQ */
PCD = RM16(0xfffc);
- change_pc(PC); /* TS 971002 */
}
else if (irqline < 2)
{
@@ -533,7 +526,7 @@ static CPU_SET_INFO( konami )
case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI: set_irq_line(INPUT_LINE_NMI, info->i); break;
case CPUINFO_INT_PC:
- case CPUINFO_INT_REGISTER + KONAMI_PC: PC = info->i; change_pc(PC); break;
+ case CPUINFO_INT_REGISTER + KONAMI_PC: PC = info->i; break;
case CPUINFO_INT_SP:
case CPUINFO_INT_REGISTER + KONAMI_S: S = info->i; break;
case CPUINFO_INT_REGISTER + KONAMI_CC: CC = info->i; CHECK_IRQ_LINES; break;
diff --git a/src/emu/cpu/konami/konamops.c b/src/emu/cpu/konami/konamops.c
index 808b2a58603..f7c9d411eed 100644
--- a/src/emu/cpu/konami/konamops.c
+++ b/src/emu/cpu/konami/konamops.c
@@ -147,7 +147,6 @@ INLINE void jmp_di( void )
{
DIRECT;
PCD=EAD;
- change_pc(PCD);
}
/* $0F CLR direct -0100 */
@@ -192,7 +191,6 @@ INLINE void lbra( void )
{
IMMWORD(ea);
PC += EA;
- change_pc(PCD);
/* EHC 980508 speed up busy loop */
if( EA == 0xfffd && konami_ICount > 0 )
@@ -205,7 +203,6 @@ INLINE void lbsr( void )
IMMWORD(ea);
PUSHWORD(pPC);
PC += EA;
- change_pc(PCD);
}
/* $18 ILLEGAL */
@@ -304,7 +301,6 @@ INLINE void bra( void )
UINT8 t;
IMMBYTE(t);
PC += SIGNED(t);
- change_pc(PCD);
/* JB 970823 - speed up busy loops */
if( t == 0xfe && konami_ICount > 0 )
konami_ICount = 0;
@@ -547,7 +543,7 @@ INLINE void puls( void )
if( t&0x10 ) { PULLWORD(XD); konami_ICount -= 2; }
if( t&0x20 ) { PULLWORD(YD); konami_ICount -= 2; }
if( t&0x40 ) { PULLWORD(UD); konami_ICount -= 2; }
- if( t&0x80 ) { PULLWORD(PCD); change_pc(PCD); konami_ICount -= 2; }
+ if( t&0x80 ) { PULLWORD(PCD); konami_ICount -= 2; }
/* check after all PULLs */
if( t&0x01 ) { CHECK_IRQ_LINES; }
@@ -580,7 +576,7 @@ INLINE void pulu( void )
if( t&0x10 ) { PULUWORD(XD); konami_ICount -= 2; }
if( t&0x20 ) { PULUWORD(YD); konami_ICount -= 2; }
if( t&0x40 ) { PULUWORD(SD); konami_ICount -= 2; }
- if( t&0x80 ) { PULUWORD(PCD); change_pc(PCD); konami_ICount -= 2; }
+ if( t&0x80 ) { PULUWORD(PCD); konami_ICount -= 2; }
/* check after all PULLs */
if( t&0x01 ) { CHECK_IRQ_LINES; }
@@ -592,7 +588,6 @@ INLINE void pulu( void )
INLINE void rts( void )
{
PULLWORD(PCD);
- change_pc(PCD);
}
/* $3A ABX inherent ----- */
@@ -616,7 +611,6 @@ INLINE void rti( void )
PULLWORD(UD);
}
PULLWORD(PCD);
- change_pc(PCD);
CHECK_IRQ_LINES;
}
@@ -671,7 +665,6 @@ INLINE void swi( void )
PUSHBYTE(CC);
CC |= CC_IF | CC_II; /* inhibit FIRQ and IRQ */
PCD=RM16(0xfffa);
- change_pc(PCD);
}
/* $103F SWI2 absolute indirect ----- */
@@ -687,7 +680,6 @@ INLINE void swi2( void )
PUSHBYTE(A);
PUSHBYTE(CC);
PCD=RM16(0xfff4);
- change_pc(PCD);
}
/* $113F SWI3 absolute indirect ----- */
@@ -703,7 +695,6 @@ INLINE void swi3( void )
PUSHBYTE(A);
PUSHBYTE(CC);
PCD=RM16(0xfff2);
- change_pc(PCD);
}
/* $40 NEGA inherent ?**** */
@@ -1045,7 +1036,6 @@ INLINE void tst_ix( void )
INLINE void jmp_ix( void )
{
PCD=EAD;
- change_pc(PCD);
}
/* $6F CLR indexed -0100 */
@@ -1158,7 +1148,6 @@ INLINE void jmp_ex( void )
{
EXTENDED;
PCD=EAD;
- change_pc(PCD);
}
/* $7F CLR extended -0100 */
@@ -1363,7 +1352,6 @@ INLINE void bsr( void )
IMMBYTE(t);
PUSHWORD(pPC);
PC += SIGNED(t);
- change_pc(PCD);
}
/* $8E LDX (LDY) immediate -**0- */
@@ -1594,7 +1582,6 @@ INLINE void jsr_di( void )
DIRECT;
PUSHWORD(pPC);
PCD=EAD;
- change_pc(PCD);
}
/* $9E LDX (LDY) direct -**0- */
@@ -1813,7 +1800,6 @@ INLINE void jsr_ix( void )
{
PUSHWORD(pPC);
PCD=EAD;
- change_pc(PCD);
}
/* $aE LDX (LDY) indexed -**0- */
@@ -2039,7 +2025,6 @@ INLINE void jsr_ex( void )
EXTENDED;
PUSHWORD(pPC);
PCD=EAD;
- change_pc(PCD);
}
/* $bE LDX (LDY) extended -**0- */