Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-21 16:01:56 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

sgi_gr1: simplify stall handling (nw)

Browse Source 
Avoids a scheduler assert in debug builds.
This commit is contained in:
Patrick Mackinlay 2020-03-19 11:37:02 +07:00
parent 2829ffbb01
commit a0a6637f7f
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mame/video/sgi_ge5.cpp
View File

@ -194,8 +194,7 @@ void sgi_ge5_device::device_reset()
set_int(false);
m_state = DECODE;
suspend(SUSPEND_REASON_HALT, false);
m_state = STALL;
}
device_memory_interface::space_config_vector sgi_ge5_device::memory_space_config() const
@ -218,6 +217,10 @@ void sgi_ge5_device::execute_run()
{
switch (m_state)
{
case STALL:
m_icount = 0;
break;
case DECODE:
debugger_instruction_hook(m_pc);
@ -263,7 +266,6 @@ void sgi_ge5_device::execute_run()
// fifo read stall
m_state = READ;
m_icount = 0;
suspend(SUSPEND_REASON_TRIGGER, false);
}
else
m_bus = m_fifo_read();
@ -378,7 +380,7 @@ void sgi_ge5_device::execute_run()
break;
case 0xc: // stall
LOG("stall\n");
suspend(SUSPEND_REASON_HALT, false);
m_state = STALL;
m_icount = 0;
break;
case 0xd: // call less than
@ -586,7 +588,7 @@ void sgi_ge5_device::command_w(offs_t offset, u16 data, u16 mem_mask)
{
case 0x00: // clear stall
LOG("clear stall\n");
resume(SUSPEND_REASON_HALT);
m_state = DECODE;
debugger_exception_hook(0);
break;
@ -601,6 +603,7 @@ void sgi_ge5_device::command_w(offs_t offset, u16 data, u16 mem_mask)
break;
}
}
template u32 sgi_ge5_device::code_r<false>(offs_t offset);
template u32 sgi_ge5_device::code_r<true>(offs_t offset);
template void sgi_ge5_device::code_w<false>(offs_t offset, u32 data, u32 mem_mask);

1
src/mame/video/sgi_ge5.h
View File

@ -90,6 +90,7 @@ private:
int m_icount;
enum ge5_state : unsigned
{
STALL,
DECODE, // fetch and decode instruction, update pointers
READ, // read source
CONTROL, // flow control

3
src/mame/video/sgi_gr1.cpp
View File

@ -324,9 +324,6 @@ void sgi_gr1_device::fifo_w(offs_t offset, u32 data, u32 mem_mask)
m_dr3 &= ~DR3_FIFOFULL;
m_int_fifo_cb(ASSERT_LINE);
}
if (m_ge->suspended())
m_ge->resume(SUSPEND_REASON_TRIGGER);
}
void sgi_gr1_device::reset_w(int state)