Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-05 08:41:31 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

z80: put take_nmi in the execution loop: eg. z80 writes to another device NMI enable register

Browse Source
This commit is contained in:
hap 2016-02-07 14:09:48 +01:00
parent 4bcc966c7a
commit 462b96ab1d
2 changed files with 43 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/devices/cpu/z80/z80.cpp
View File

@ -3125,6 +3125,27 @@ OP(op,fe) { cp(arg());
OP(op,ff) { rst(0x38); } /* RST 7 */
void z80_device::take_nmi()
{
/* there isn't a valid previous program counter */
PRVPC = -1;
/* Check if processor was halted */
leave_halt();
#if HAS_LDAIR_QUIRK
/* reset parity flag after LD A,I or LD A,R */
if (m_after_ldair) F &= ~PF;
#endif
m_iff1 = 0;
push(m_pc);
PCD = 0x0066;
WZ=PCD;
m_icount -= 11;
m_nmi_pending = FALSE;
}
void z80_device::take_interrupt()
{
int irq_vector;
@ -3207,6 +3228,11 @@ void z80_device::take_interrupt()
m_icount -= m_cc_ex[0xff];
}
WZ=PCD;
#if HAS_LDAIR_QUIRK
/* reset parity flag after LD A,I or LD A,R */
if (m_after_ldair) F &= ~PF;
#endif
}
void nsc800_device::take_interrupt_nsc800()
@ -3240,6 +3266,11 @@ void nsc800_device::take_interrupt_nsc800()
m_icount -= m_cc_op[0xff] + cc_ex[0xff];
WZ=PCD;
#if HAS_LDAIR_QUIRK
/* reset parity flag after LD A,I or LD A,R */
if (m_after_ldair) F &= ~PF;
#endif
}
/****************************************************************************
@ -3486,40 +3517,14 @@ void z80_device::execute_run()
return;
}
/* check for NMIs on the way in; they can only be set externally */
/* via timers, and can't be dynamically enabled, so it is safe */
/* to just check here */
if (m_nmi_pending)
{
LOG(("Z80 '%s' take NMI\n", tag()));
PRVPC = -1; /* there isn't a valid previous program counter */
leave_halt(); /* Check if processor was halted */
#if HAS_LDAIR_QUIRK
/* reset parity flag after LD A,I or LD A,R */
if (m_after_ldair) F &= ~PF;
#endif
m_after_ldair = FALSE;
m_iff1 = 0;
push(m_pc);
PCD = 0x0066;
WZ=PCD;
m_icount -= 11;
m_nmi_pending = FALSE;
}
do
{
/* check for IRQs before each instruction */
if (m_irq_state != CLEAR_LINE && m_iff1 && !m_after_ei)
{
#if HAS_LDAIR_QUIRK
/* reset parity flag after LD A,I or LD A,R */
if (m_after_ldair) F &= ~PF;
#endif
// check for interrupts before each instruction
if (m_nmi_pending)
take_nmi();
else if (m_irq_state != CLEAR_LINE && m_iff1 && !m_after_ei)
take_interrupt();
}
m_after_ei = FALSE;
m_after_ldair = FALSE;
@ -3543,34 +3548,18 @@ void nsc800_device::execute_run()
return;
}
/* check for NMIs on the way in; they can only be set externally */
/* via timers, and can't be dynamically enabled, so it is safe */
/* to just check here */
if (m_nmi_pending)
{
LOG(("Z80 '%s' take NMI\n", tag()));
PRVPC = -1; /* there isn't a valid previous program counter */
leave_halt(); /* Check if processor was halted */
m_iff1 = 0;
push(m_pc);
PCD = 0x0066;
WZ=PCD;
m_icount -= 11;
m_nmi_pending = FALSE;
}
do
{
/* check for NSC800 IRQs line RSTA, RSTB, RSTC */
if ((m_nsc800_irq_state[NSC800_RSTA] != CLEAR_LINE || m_nsc800_irq_state[NSC800_RSTB] != CLEAR_LINE || m_nsc800_irq_state[NSC800_RSTC] != CLEAR_LINE) && m_iff1 && !m_after_ei)
// check for interrupts before each instruction
if (m_nmi_pending)
take_nmi();
else if ((m_nsc800_irq_state[NSC800_RSTA] != CLEAR_LINE || m_nsc800_irq_state[NSC800_RSTB] != CLEAR_LINE || m_nsc800_irq_state[NSC800_RSTC] != CLEAR_LINE) && m_iff1 && !m_after_ei)
take_interrupt_nsc800();
/* check for IRQs before each instruction */
if (m_irq_state != CLEAR_LINE && m_iff1 && !m_after_ei)
else if (m_irq_state != CLEAR_LINE && m_iff1 && !m_after_ei)
take_interrupt();
m_after_ei = FALSE;
m_after_ldair = FALSE;
PRVPC = PCD;
debugger_instruction_hook(this, PCD);

1
src/devices/cpu/z80/z80.h
View File

@ -239,6 +239,7 @@ protected:
void ei();
void take_interrupt();
void take_nmi();
// address spaces
const address_space_config m_program_config;