Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 08:49:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Removed printf debugging. (nw)

Browse Source
This commit is contained in:
couriersud 2015-05-22 02:05:54 +02:00
parent dc7588f63d
commit a1c593b8dd
2 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/emu/netlist/nl_base.h
View File

@ -260,14 +260,15 @@ ATTR_COLD virtual const netlist_logic_family_desc_t *default_logic_family()
// forward definitions
// -----------------------------------------------------------------------------
class netlist_net_t;
class netlist_logic_output_t;
class netlist_analog_net_t;
class netlist_logic_net_t;
class netlist_logic_output_t;
class netlist_net_t;
class netlist_param_t;
class netlist_setup_t;
class netlist_base_t;
class netlist_matrix_solver_t;
class NETLIB_NAME(gnd);
class NETLIB_NAME(solver);
class NETLIB_NAME(mainclock);
@ -749,7 +750,6 @@ public:
*/
ATTR_COLD inline netlist_sig_t &Q_state_ptr()
{
nl_assert(family() == LOGIC);
return m_cur_Q;
}
@ -777,15 +777,11 @@ public:
ATTR_HOT inline nl_double Q_Analog() const
{
//nl_assert(object_type(SIGNAL_MASK) == SIGNAL_ANALOG);
nl_assert(family() == ANALOG);
return m_cur_Analog;
}
ATTR_COLD inline nl_double &Q_Analog_state_ptr()
{
//nl_assert(object_type(SIGNAL_MASK) == SIGNAL_ANALOG);
nl_assert(family() == ANALOG);
return m_cur_Analog;
}
@ -1381,7 +1377,6 @@ ATTR_HOT inline void netlist_net_t::reschedule_in_queue(const netlist_time &dela
ATTR_HOT inline netlist_sig_t netlist_logic_input_t::Q() const
{
nl_assert(family() == LOGIC);
return net().as_logic().Q();
}

40
src/emu/netlist/nl_setup.c
View File

@ -570,24 +570,38 @@ bool netlist_setup_t::connect_input_input(netlist_core_terminal_t &t1, netlist_c
bool ret = false;
if (t1.has_net())
{
for (int i=0; i<t1.net().m_core_terms.count(); i++)
if (t1.net().isRailNet())
ret = connect(t2, t1.net().railterminal());
if (!ret)
{
if (t1.net().m_core_terms[i]->isType(netlist_core_terminal_t::TERMINAL)
|| t1.net().m_core_terms[i]->isType(netlist_core_terminal_t::OUTPUT))
ret = connect(t2, *t1.net().m_core_terms[i]);
if (ret)
break;
for (int i=0; i<t1.net().m_core_terms.count(); i++)
{
if (t1.net().m_core_terms[i]->isType(netlist_core_terminal_t::TERMINAL)
/*|| t1.net().m_core_terms[i]->isType(netlist_core_terminal_t::OUTPUT)*/)
{
ret = connect(t2, *t1.net().m_core_terms[i]);
}
if (ret)
break;
}
}
}
if (!ret && t2.has_net())
{
for (int i=0; i<t2.net().m_core_terms.count(); i++)
if (t2.net().isRailNet())
ret = connect(t1, t2.net().railterminal());
if (!ret)
{
if (t2.net().m_core_terms[i]->isType(netlist_core_terminal_t::TERMINAL)
|| t2.net().m_core_terms[i]->isType(netlist_core_terminal_t::OUTPUT))
ret = connect(t1, *t2.net().m_core_terms[i]);
if (ret)
break;
for (int i=0; i<t2.net().m_core_terms.count(); i++)
{
if (t2.net().m_core_terms[i]->isType(netlist_core_terminal_t::TERMINAL)
/*|| t2.net().m_core_terms[i]->isType(netlist_core_terminal_t::OUTPUT)*/)
{
ret = connect(t1, *t2.net().m_core_terms[i]);
}
if (ret)
break;
}
}
}
return ret;
@ -667,12 +681,10 @@ void netlist_setup_t::resolve_inputs()
if (connect(*t1, *t2))
{
printf("%s and %s connected\n", t1s.cstr(), t2s.cstr());
m_links.remove_at(li);
}
else
{
printf("%s and %s failed\n", t1s.cstr(), t2s.cstr());
li++;
}
}