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

don't crash when a layout references a conditional I/O port field (nw)

Browse Source
This commit is contained in:
Vas Crabb 2019-07-06 02:56:24 +10:00
parent 4e2959b5c0
commit abb0842eca
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/emu/rendlay.cpp
View File

@ -3368,17 +3368,17 @@ int layout_view::item::state() const
else if (!m_input_tag.empty()) else if (!m_input_tag.empty())
{ {
// if configured to an input, fetch the input value // if configured to an input, fetch the input value
if (m_input_raw) if (m_input_port)
{ {
if (m_input_port) if (m_input_raw)
return (m_input_port->read() & m_input_mask) >> m_input_shift;
}
else
{
if (m_input_field)
{ {
assert(m_input_port); return (m_input_port->read() & m_input_mask) >> m_input_shift;
return ((m_input_port->read() ^ m_input_field->defvalue()) & m_input_mask) ? 1 : 0; }
else
{
ioport_field const *const field(m_input_field ? m_input_field : m_input_port->field(m_input_mask));
if (field)
return ((m_input_port->read() ^ field->defvalue()) & m_input_mask) ? 1 : 0;
} }
} }
} }
@ -3397,7 +3397,17 @@ void layout_view::item::resolve_tags()
{ {
m_input_port = m_element->machine().root_device().ioport(m_input_tag.c_str()); m_input_port = m_element->machine().root_device().ioport(m_input_tag.c_str());
if (m_input_port) if (m_input_port)
m_input_field = m_input_port->field(m_input_mask); {
for (ioport_field &field : m_input_port->fields())
{
if (field.mask() & m_input_mask)
{
if (field.condition().condition() == ioport_condition::ALWAYS)
m_input_field = &field;
break;
}
}
}
} }
} }