summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author couriersud <couriersud@arcor.de>2015-05-22 02:05:54 +0200
committer couriersud <couriersud@arcor.de>2015-05-22 08:50:10 +0200
commita1c593b8ddb04d6979bb2c3662cc2274f62023df (patch)
tree3b1d991945e0360921f482092b9c2fc8037fb950 /src
parentdc7588f63d822c15701c48c27c2f628a13e112e7 (diff)
Removed printf debugging. (nw)
Diffstat (limited to 'src')
-rw-r--r--src/emu/netlist/nl_base.h11
-rw-r--r--src/emu/netlist/nl_setup.c40
2 files changed, 29 insertions, 22 deletions
diff --git a/src/emu/netlist/nl_base.h b/src/emu/netlist/nl_base.h
index 82307015bbb..a5f471f5f5a 100644
--- a/src/emu/netlist/nl_base.h
+++ b/src/emu/netlist/nl_base.h
@@ -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();
}
diff --git a/src/emu/netlist/nl_setup.c b/src/emu/netlist/nl_setup.c
index 06bc5fb2eb0..ba69d6bd47c 100644
--- a/src/emu/netlist/nl_setup.c
+++ b/src/emu/netlist/nl_setup.c
@@ -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++;
}
}