summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2016-02-07 13:50:05 +0100
committer hap <happppp@users.noreply.github.com>2016-02-07 13:50:34 +0100
commit4bcc966c7af18258e0f18e64d3ed4b9135940d3b (patch)
tree9a9a98165f0b42a0b84f571d055e27a63705316a
parent5bc83a25063330ab9177a291ab984c5c7052aa02 (diff)
z80: added crude implementation of WAIT pin
-rw-r--r--src/devices/bus/abcbus/lux10828.cpp8
-rw-r--r--src/devices/cpu/z80/z80.cpp72
-rw-r--r--src/devices/cpu/z80/z80.h1
-rw-r--r--src/mame/drivers/adam.cpp2
-rw-r--r--src/mame/drivers/ep64.cpp2
-rw-r--r--src/mame/drivers/horizon.cpp2
-rw-r--r--src/mame/drivers/mpz80.cpp2
-rw-r--r--src/mame/drivers/mrgame.cpp2
-rw-r--r--src/mame/drivers/nightgal.cpp4
-rw-r--r--src/mame/drivers/super6.cpp6
-rw-r--r--src/mame/drivers/xor100.cpp8
11 files changed, 47 insertions, 62 deletions
diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp
index 32bc5e619bc..e14bdf9a20e 100644
--- a/src/devices/bus/abcbus/lux10828.cpp
+++ b/src/devices/bus/abcbus/lux10828.cpp
@@ -310,14 +310,14 @@ WRITE_LINE_MEMBER( luxor_55_10828_device::fdc_intrq_w )
m_fdc_irq = state;
m_pio->port_b_write(state << 7);
- if (state) m_maincpu->set_input_line(Z80_INPUT_LINE_WAIT, CLEAR_LINE);
+ if (state) m_maincpu->set_input_line(Z80_INPUT_LINE_BOGUSWAIT, CLEAR_LINE);
}
WRITE_LINE_MEMBER( luxor_55_10828_device::fdc_drq_w )
{
m_fdc_drq = state;
- if (state) m_maincpu->set_input_line(Z80_INPUT_LINE_WAIT, CLEAR_LINE);
+ if (state) m_maincpu->set_input_line(Z80_INPUT_LINE_BOGUSWAIT, CLEAR_LINE);
}
@@ -654,7 +654,7 @@ READ8_MEMBER( luxor_55_10828_device::fdc_r )
{
logerror("Z80 WAIT not supported by MAME core\n");
- m_maincpu->set_input_line(Z80_INPUT_LINE_WAIT, ASSERT_LINE);
+ m_maincpu->set_input_line(Z80_INPUT_LINE_BOGUSWAIT, ASSERT_LINE);
}
return m_fdc->gen_r(offset);
@@ -671,7 +671,7 @@ WRITE8_MEMBER( luxor_55_10828_device::fdc_w )
{
logerror("Z80 WAIT not supported by MAME core\n");
- m_maincpu->set_input_line(Z80_INPUT_LINE_WAIT, ASSERT_LINE);
+ m_maincpu->set_input_line(Z80_INPUT_LINE_BOGUSWAIT, ASSERT_LINE);
}
m_fdc->gen_w(offset, data);
diff --git a/src/devices/cpu/z80/z80.cpp b/src/devices/cpu/z80/z80.cpp
index 055e98ecdd7..a46edbec749 100644
--- a/src/devices/cpu/z80/z80.cpp
+++ b/src/devices/cpu/z80/z80.cpp
@@ -10,6 +10,7 @@
* - If LD A,I or LD A,R is interrupted, P/V flag gets reset, even if IFF2
* was set before this instruction (implemented, but not enabled: we need
* document Z80 types first, see below)
+ * - WAIT only stalls between instructions now, it should stall immediately.
* - Ideally, the tiny differences between Z80 types should be supported,
* currently known differences:
* - LD A,I/R P/V flag reset glitch is fixed on CMOS Z80
@@ -113,10 +114,6 @@
#define VERBOSE 0
-/* Debug purpose: set to 1 to test /WAIT pin behaviour.
- */
-#define STALLS_ON_WAIT_ASSERT 0
-
/* On an NMOS Z80, if LD A,I or LD A,R is interrupted, P/V flag gets reset,
even if IFF2 was set before this instruction. This issue was fixed on
the CMOS Z80, so until knowing (most) Z80 types on hardware, it's disabled */
@@ -3478,10 +3475,16 @@ void nsc800_device::device_reset()
}
/****************************************************************************
- * Execute 'cycles' T-states. Return number of T-states really executed
+ * Execute 'cycles' T-states.
****************************************************************************/
void z80_device::execute_run()
{
+ if (m_wait_state)
+ {
+ // stalled
+ m_icount = 0;
+ 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 */
@@ -3523,29 +3526,23 @@ void z80_device::execute_run()
PRVPC = PCD;
debugger_instruction_hook(this, PCD);
m_r++;
-#if STALLS_ON_WAIT_ASSERT
- static int test_cycles;
-
- if(m_wait_state == ASSERT_LINE)
- {
- m_icount --;
- test_cycles ++;
- }
- else
- {
- if(test_cycles != 0)
- printf("stalls for %d z80 cycles\n",test_cycles);
- test_cycles = 0;
- EXEC(op,rop());
- }
-#else
EXEC(op,rop());
-#endif
+
+ if (m_wait_state)
+ m_icount = 0;
+
} while (m_icount > 0);
}
void nsc800_device::execute_run()
{
+ if (m_wait_state)
+ {
+ // stalled
+ m_icount = 0;
+ 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 */
@@ -3579,6 +3576,10 @@ void nsc800_device::execute_run()
debugger_instruction_hook(this, PCD);
m_r++;
EXEC(op,rop());
+
+ if (m_wait_state)
+ m_icount = 0;
+
} while (m_icount > 0);
}
@@ -3609,6 +3610,9 @@ void z80_device::execute_set_input(int inputnum, int state)
case Z80_INPUT_LINE_WAIT:
m_wait_state = state;
break;
+
+ default:
+ break;
}
}
@@ -3616,17 +3620,6 @@ void nsc800_device::execute_set_input(int inputnum, int state)
{
switch (inputnum)
{
- case Z80_INPUT_LINE_BUSRQ:
- m_busrq_state = state;
- break;
-
- case INPUT_LINE_NMI:
- /* mark an NMI pending on the rising edge */
- if (m_nmi_state == CLEAR_LINE && state != CLEAR_LINE)
- m_nmi_pending = TRUE;
- m_nmi_state = state;
- break;
-
case NSC800_RSTA:
m_nsc800_irq_state[NSC800_RSTA] = state;
break;
@@ -3639,17 +3632,8 @@ void nsc800_device::execute_set_input(int inputnum, int state)
m_nsc800_irq_state[NSC800_RSTC] = state;
break;
- case INPUT_LINE_IRQ0:
- /* update the IRQ state via the daisy chain */
- m_irq_state = state;
- if (m_daisy.present())
- m_irq_state = m_daisy.update_irq_state();
-
- /* the main execute loop will take the interrupt */
- break;
-
- case Z80_INPUT_LINE_WAIT:
- m_wait_state = state;
+ default:
+ z80_device::execute_set_input(inputnum, state);
break;
}
}
diff --git a/src/devices/cpu/z80/z80.h b/src/devices/cpu/z80/z80.h
index c523f101a24..faed3eb832c 100644
--- a/src/devices/cpu/z80/z80.h
+++ b/src/devices/cpu/z80/z80.h
@@ -19,6 +19,7 @@ enum
NSC800_RSTB,
NSC800_RSTC,
Z80_INPUT_LINE_WAIT,
+ Z80_INPUT_LINE_BOGUSWAIT, /* WAIT pin implementation used to be nonexistent, please remove this when all drivers are updated with Z80_INPUT_LINE_WAIT */
Z80_INPUT_LINE_BUSRQ
};
diff --git a/src/mame/drivers/adam.cpp b/src/mame/drivers/adam.cpp
index a52eb37e567..4369295343b 100644
--- a/src/mame/drivers/adam.cpp
+++ b/src/mame/drivers/adam.cpp
@@ -1067,7 +1067,7 @@ static MACHINE_CONFIG_START( adam, adam_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(SN76489A_TAG, SN76489A, XTAL_7_15909MHz/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MCFG_SN76496_READY_HANDLER(INPUTLINE(Z80_TAG, Z80_INPUT_LINE_WAIT))
+ MCFG_SN76496_READY_HANDLER(INPUTLINE(Z80_TAG, Z80_INPUT_LINE_BOGUSWAIT))
// devices
MCFG_ADAMNET_BUS_ADD()
diff --git a/src/mame/drivers/ep64.cpp b/src/mame/drivers/ep64.cpp
index eb537de944b..84a529841f9 100644
--- a/src/mame/drivers/ep64.cpp
+++ b/src/mame/drivers/ep64.cpp
@@ -516,7 +516,7 @@ static MACHINE_CONFIG_START( ep64, ep64_state )
MCFG_EP64_EXPANSION_BUS_SLOT_DAVE(DAVE_TAG)
MCFG_EP64_EXPANSION_BUS_SLOT_IRQ_CALLBACK(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_EP64_EXPANSION_BUS_SLOT_NMI_CALLBACK(INPUTLINE(Z80_TAG, INPUT_LINE_NMI))
- MCFG_EP64_EXPANSION_BUS_SLOT_WAIT_CALLBACK(INPUTLINE(Z80_TAG, Z80_INPUT_LINE_WAIT))
+ MCFG_EP64_EXPANSION_BUS_SLOT_WAIT_CALLBACK(INPUTLINE(Z80_TAG, Z80_INPUT_LINE_BOGUSWAIT))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(ep64_state, write_centronics_busy))
diff --git a/src/mame/drivers/horizon.cpp b/src/mame/drivers/horizon.cpp
index 11076e517f2..8a0badd1c4b 100644
--- a/src/mame/drivers/horizon.cpp
+++ b/src/mame/drivers/horizon.cpp
@@ -168,7 +168,7 @@ static MACHINE_CONFIG_START( horizon, horizon_state )
// S-100
MCFG_S100_BUS_ADD()
- MCFG_S100_RDY_CALLBACK(INPUTLINE(Z80_TAG, Z80_INPUT_LINE_WAIT))
+ MCFG_S100_RDY_CALLBACK(INPUTLINE(Z80_TAG, Z80_INPUT_LINE_BOGUSWAIT))
//MCFG_S100_SLOT_ADD("s100_1", horizon_s100_cards, NULL, NULL) // CPU
MCFG_S100_SLOT_ADD("s100_2", horizon_s100_cards, nullptr) // RAM
MCFG_S100_SLOT_ADD("s100_3", horizon_s100_cards, "mdsad") // MDS
diff --git a/src/mame/drivers/mpz80.cpp b/src/mame/drivers/mpz80.cpp
index 0c42707b541..e5e05a051a4 100644
--- a/src/mame/drivers/mpz80.cpp
+++ b/src/mame/drivers/mpz80.cpp
@@ -716,7 +716,7 @@ static MACHINE_CONFIG_START( mpz80, mpz80_state )
MCFG_S100_BUS_ADD()
MCFG_S100_IRQ_CALLBACK(WRITELINE(mpz80_state, s100_pint_w))
MCFG_S100_NMI_CALLBACK(WRITELINE(mpz80_state, s100_nmi_w))
- MCFG_S100_RDY_CALLBACK(INPUTLINE(Z80_TAG, Z80_INPUT_LINE_WAIT))
+ MCFG_S100_RDY_CALLBACK(INPUTLINE(Z80_TAG, Z80_INPUT_LINE_BOGUSWAIT))
MCFG_S100_SLOT_ADD("s100_1", mpz80_s100_cards, "mm65k16s")
MCFG_S100_SLOT_ADD("s100_2", mpz80_s100_cards, "wunderbus")
MCFG_S100_SLOT_ADD("s100_3", mpz80_s100_cards, "dj2db")
diff --git a/src/mame/drivers/mrgame.cpp b/src/mame/drivers/mrgame.cpp
index beb0a9e0bca..bcb1e89957a 100644
--- a/src/mame/drivers/mrgame.cpp
+++ b/src/mame/drivers/mrgame.cpp
@@ -492,7 +492,7 @@ static MACHINE_CONFIG_START( mrgame, mrgame_state )
MCFG_DAC_ADD("dacr")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MCFG_SOUND_ADD("tms", TMS5220, 672000) // uses a RC combination. 672k copied from jedi.h
- MCFG_TMS52XX_READYQ_HANDLER(INPUTLINE("audiocpu2", Z80_INPUT_LINE_WAIT))
+ MCFG_TMS52XX_READYQ_HANDLER(INPUTLINE("audiocpu2", Z80_INPUT_LINE_BOGUSWAIT))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
diff --git a/src/mame/drivers/nightgal.cpp b/src/mame/drivers/nightgal.cpp
index 1150cc05c45..98976ef8b88 100644
--- a/src/mame/drivers/nightgal.cpp
+++ b/src/mame/drivers/nightgal.cpp
@@ -425,12 +425,12 @@ READ8_MEMBER(nightgal_state::royalqn_nsc_blit_r)
TIMER_CALLBACK_MEMBER(nightgal_state::z80_wait_ack_cb)
{
- m_maincpu->set_input_line(Z80_INPUT_LINE_WAIT, CLEAR_LINE);
+ m_maincpu->set_input_line(Z80_INPUT_LINE_BOGUSWAIT, CLEAR_LINE);
}
void nightgal_state::z80_wait_assert_cb()
{
- m_maincpu->set_input_line(Z80_INPUT_LINE_WAIT, ASSERT_LINE);
+ m_maincpu->set_input_line(Z80_INPUT_LINE_BOGUSWAIT, ASSERT_LINE);
// Note: cycles_to_attotime requires z80 context to work, calling for example m_subcpu as context gives a x4 cycle boost in z80 terms (reads execute_cycles_to_clocks() from NCS?) even if they runs at same speed basically.
// TODO: needs a getter that tells a given CPU how many cycles requires an executing opcode for the r/w operation, which stacks with wait state penalty for accessing this specific area.
diff --git a/src/mame/drivers/super6.cpp b/src/mame/drivers/super6.cpp
index 599aadbcdf5..838db3e3b20 100644
--- a/src/mame/drivers/super6.cpp
+++ b/src/mame/drivers/super6.cpp
@@ -193,7 +193,7 @@ READ8_MEMBER( super6_state::fdc_r )
// don't crash please... but it's true, WAIT does nothing in our Z80
//fatalerror("Z80 WAIT not supported by MAME core\n");
- m_maincpu->set_input_line(Z80_INPUT_LINE_WAIT, ASSERT_LINE);
+ m_maincpu->set_input_line(Z80_INPUT_LINE_BOGUSWAIT, ASSERT_LINE);
return !m_fdc->intrq_r() << 7;
}
@@ -409,14 +409,14 @@ SLOT_INTERFACE_END
WRITE_LINE_MEMBER( super6_state::fdc_intrq_w )
{
- if (state) m_maincpu->set_input_line(Z80_INPUT_LINE_WAIT, CLEAR_LINE);
+ if (state) m_maincpu->set_input_line(Z80_INPUT_LINE_BOGUSWAIT, CLEAR_LINE);
m_ctc->trg3(!state);
}
WRITE_LINE_MEMBER( super6_state::fdc_drq_w )
{
- if (state) m_maincpu->set_input_line(Z80_INPUT_LINE_WAIT, CLEAR_LINE);
+ if (state) m_maincpu->set_input_line(Z80_INPUT_LINE_BOGUSWAIT, CLEAR_LINE);
m_dma->rdy_w(state);
}
diff --git a/src/mame/drivers/xor100.cpp b/src/mame/drivers/xor100.cpp
index 3d85c372c7d..05b81f316ac 100644
--- a/src/mame/drivers/xor100.cpp
+++ b/src/mame/drivers/xor100.cpp
@@ -189,7 +189,7 @@ READ8_MEMBER( xor100_state::fdc_wait_r )
if (!m_fdc_irq && !m_fdc_drq)
{
fatalerror("Z80 WAIT not supported by MAME core\n");
- m_maincpu->set_input_line(Z80_INPUT_LINE_WAIT, ASSERT_LINE);
+ m_maincpu->set_input_line(Z80_INPUT_LINE_BOGUSWAIT, ASSERT_LINE);
}
}
@@ -442,7 +442,7 @@ void xor100_state::fdc_intrq_w(bool state)
if (state)
{
fatalerror("Z80 WAIT not supported by MAME core\n");
- m_maincpu->set_input_line(Z80_INPUT_LINE_WAIT, ASSERT_LINE);
+ m_maincpu->set_input_line(Z80_INPUT_LINE_BOGUSWAIT, ASSERT_LINE);
}
}
@@ -453,7 +453,7 @@ void xor100_state::fdc_drq_w(bool state)
if (state)
{
fatalerror("Z80 WAIT not supported by MAME core\n");
- m_maincpu->set_input_line(Z80_INPUT_LINE_WAIT, ASSERT_LINE);
+ m_maincpu->set_input_line(Z80_INPUT_LINE_BOGUSWAIT, ASSERT_LINE);
}
}
@@ -568,7 +568,7 @@ static MACHINE_CONFIG_START( xor100, xor100_state )
// S-100
MCFG_S100_BUS_ADD()
- MCFG_S100_RDY_CALLBACK(INPUTLINE(Z80_TAG, Z80_INPUT_LINE_WAIT))
+ MCFG_S100_RDY_CALLBACK(INPUTLINE(Z80_TAG, Z80_INPUT_LINE_BOGUSWAIT))
MCFG_S100_SLOT_ADD("s100_1", xor100_s100_cards, nullptr)
MCFG_S100_SLOT_ADD("s100_2", xor100_s100_cards, nullptr)
MCFG_S100_SLOT_ADD("s100_3", xor100_s100_cards, nullptr)