From 15ea16e1497bcd28168f5c8ba2e53d3a8da8350c Mon Sep 17 00:00:00 2001 From: couriersud Date: Fri, 25 Sep 2020 21:44:39 +0200 Subject: netlist: minor code cleanup. * a number of minor fixes leading to an increase of 570% to 588% on pongf. * admittedly micro optimization. * Includes some comments why certain decisions have been taken. --- src/lib/netlist/nl_setup.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/lib/netlist/nl_setup.cpp') diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp index 3a2ba38d921..11584bceb48 100644 --- a/src/lib/netlist/nl_setup.cpp +++ b/src/lib/netlist/nl_setup.cpp @@ -716,7 +716,7 @@ param_ref_t setup_t::find_param(const pstring ¶m_in) const //NOLINTNEXTLINE(misc-no-recursion) devices::nld_base_proxy *setup_t::get_d_a_proxy(const detail::core_terminal_t &out) { - nl_assert(out.is_logic()); + gsl_Expects(out.is_logic()); const auto &out_cast = dynamic_cast(out); auto iter_proxy(m_proxies.find(&out)); @@ -759,7 +759,7 @@ devices::nld_base_proxy *setup_t::get_d_a_proxy(const detail::core_terminal_t &o //NOLINTNEXTLINE(misc-no-recursion) devices::nld_base_proxy *setup_t::get_a_d_proxy(detail::core_terminal_t &inp) { - nl_assert(inp.is_logic()); + gsl_Expects(inp.is_logic()); const auto &incast = dynamic_cast(inp); @@ -1607,13 +1607,10 @@ void setup_t::prepare_to_run() if (p != m_abstract.m_hints.end()) { p->second = true; // mark as used - if (use_deactivate) - d.second->set_hint_deactivate(false); - else - d.second->set_hint_deactivate(true); + d.second->set_hint_deactivate(false); } else - d.second->set_hint_deactivate(true); + d.second->set_hint_deactivate(use_deactivate); } if (errcnt > 0) -- cgit v1.2.3-70-g09d2