diff options
Diffstat (limited to 'src/lib/netlist/nl_setup.cpp')
-rw-r--r-- | src/lib/netlist/nl_setup.cpp | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp index 67948034bc8..4c8832cb59d 100644 --- a/src/lib/netlist/nl_setup.cpp +++ b/src/lib/netlist/nl_setup.cpp @@ -100,7 +100,7 @@ void setup_t::namespace_pop() } -void setup_t::register_dev(powned_ptr<device_t> dev) +void setup_t::register_dev(plib::powned_ptr<device_t> dev) { for (auto & d : netlist().m_devices) if (d->name() == dev->name()) @@ -171,14 +171,14 @@ void setup_t::register_alias(const pstring &alias, const pstring &out) void setup_t::register_dippins_arr(const pstring &terms) { - pstring_vector_t list(terms,", "); + plib::pstring_vector_t list(terms,", "); if (list.size() == 0 || (list.size() % 2) == 1) log().fatal("You must pass an equal number of pins to DIPPINS"); unsigned n = list.size(); for (unsigned i = 0; i < n / 2; i++) { - register_alias(pfmt("{1}")(i+1), list[i * 2]); - register_alias(pfmt("{1}")(n-i), list[i * 2 + 1]); + register_alias(plib::pfmt("{1}")(i+1), list[i * 2]); + register_alias(plib::pfmt("{1}")(n-i), list[i * 2 + 1]); } } @@ -307,7 +307,7 @@ void setup_t::register_object(device_t &dev, const pstring &name, object_t &obj) void setup_t::register_link_arr(const pstring &terms) { - pstring_vector_t list(terms,", "); + plib::pstring_vector_t list(terms,", "); if (list.size() < 2) log().fatal("You must pass at least 2 terminals to NET_C"); for (std::size_t i = 1; i < list.size(); i++) @@ -351,7 +351,7 @@ void setup_t::remove_connections(const pstring pin) void setup_t::register_frontier(const pstring attach, const double r_IN, const double r_OUT) { - pstring frontier_name = pfmt("frontier_{1}")(m_frontier_cnt); + pstring frontier_name = plib::pfmt("frontier_{1}")(m_frontier_cnt); m_frontier_cnt++; register_dev("FRONTIER_DEV", frontier_name); register_param(frontier_name + ".RIN", r_IN); @@ -382,7 +382,7 @@ void setup_t::register_frontier(const pstring attach, const double r_IN, const d void setup_t::register_param(const pstring ¶m, const double value) { // FIXME: there should be a better way - register_param(param, pfmt("{1}").e(value,".9")); + register_param(param, plib::pfmt("{1}").e(value,".9")); } void setup_t::register_param(const pstring ¶m, const pstring &value) @@ -496,7 +496,7 @@ devices::nld_base_proxy *setup_t::get_d_a_proxy(core_terminal_t &out) if (proxy == nullptr) { // create a new one ... - pstring x = pfmt("proxy_da_{1}_{2}")(out.name())(m_proxy_cnt); + pstring x = plib::pfmt("proxy_da_{1}_{2}")(out.name())(m_proxy_cnt); auto new_proxy = out_cast.logic_family()->create_d_a_proxy(netlist(), x, &out_cast); m_proxy_cnt++; @@ -528,8 +528,8 @@ void setup_t::connect_input_output(core_terminal_t &in, core_terminal_t &out) if (out.is_analog() && in.is_logic()) { logic_input_t &incast = dynamic_cast<logic_input_t &>(in); - pstring x = pfmt("proxy_ad_{1}_{2}")(in.name())( m_proxy_cnt); - auto proxy = powned_ptr<devices::nld_a_to_d_proxy>::Create(netlist(), x, &incast); + pstring x = plib::pfmt("proxy_ad_{1}_{2}")(in.name())( m_proxy_cnt); + auto proxy = plib::powned_ptr<devices::nld_a_to_d_proxy>::Create(netlist(), x, &incast); incast.set_proxy(proxy.get()); m_proxy_cnt++; @@ -566,8 +566,8 @@ void setup_t::connect_terminal_input(terminal_t &term, core_terminal_t &inp) { logic_input_t &incast = dynamic_cast<logic_input_t &>(inp); log().debug("connect_terminal_input: connecting proxy\n"); - pstring x = pfmt("proxy_ad_{1}_{2}")(inp.name())(m_proxy_cnt); - auto proxy = powned_ptr<devices::nld_a_to_d_proxy>::Create(netlist(), x, &incast); + pstring x = plib::pfmt("proxy_ad_{1}_{2}")(inp.name())(m_proxy_cnt); + auto proxy = plib::powned_ptr<devices::nld_a_to_d_proxy>::Create(netlist(), x, &incast); incast.set_proxy(proxy.get()); m_proxy_cnt++; @@ -632,7 +632,7 @@ void setup_t::connect_terminals(core_terminal_t &t1, core_terminal_t &t2) { log().debug("adding analog net ...\n"); // FIXME: Nets should have a unique name - analog_net_t::ptr_t anet = palloc<analog_net_t>(netlist(),"net." + t1.name()); + analog_net_t::ptr_t anet = plib::palloc<analog_net_t>(netlist(),"net." + t1.name()); t1.set_net(anet); anet->register_con(t2); anet->register_con(t1); @@ -802,7 +802,7 @@ void setup_t::resolve_inputs() if (!term->has_net() && dynamic_cast< devices::NETLIB_NAME(dummy_input) *>(&term->device()) != nullptr) log().warning("Found dummy terminal {1} without connections", term->name()); else if (!term->has_net()) - errstr += pfmt("Found terminal {1} without a net\n")(term->name()); + errstr += plib::pfmt("Found terminal {1} without a net\n")(term->name()); else if (term->net().num_cons() == 0) log().warning("Found terminal {1} without connections", term->name()); } @@ -849,7 +849,7 @@ void setup_t::start_devices() if (env != "") { log().debug("Creating dynamic logs ...\n"); - pstring_vector_t loglist(env, ":"); + plib::pstring_vector_t loglist(env, ":"); for (pstring ll : loglist) { pstring name = "log_" + ll; @@ -872,10 +872,10 @@ class logic_family_std_proxy_t : public logic_family_desc_t { public: logic_family_std_proxy_t() { } - virtual powned_ptr<devices::nld_base_d_to_a_proxy> create_d_a_proxy(netlist_t &anetlist, + virtual plib::powned_ptr<devices::nld_base_d_to_a_proxy> create_d_a_proxy(netlist_t &anetlist, const pstring &name, logic_output_t *proxied) const override { - return powned_ptr<devices::nld_base_d_to_a_proxy>::Create<devices::nld_d_to_a_proxy>(anetlist, name, proxied); + return plib::powned_ptr<devices::nld_base_d_to_a_proxy>::Create<devices::nld_d_to_a_proxy>(anetlist, name, proxied); } }; @@ -893,7 +893,7 @@ const logic_family_desc_t *setup_t::family_from_model(const pstring &model) if (e.first == model) return e.second.get(); - auto ret = make_unique_base<logic_family_desc_t, logic_family_std_proxy_t>(); + auto ret = plib::make_unique_base<logic_family_desc_t, logic_family_std_proxy_t>(); ret->m_low_thresh_V = setup_t::model_value(map, "IVL"); ret->m_high_thresh_V = setup_t::model_value(map, "IVH"); @@ -952,7 +952,7 @@ void setup_t::model_parse(const pstring &model_in, model_map_t &map) log().fatal("Model error {1}\n", model); remainder = remainder.left(remainder.len() - 1); - pstring_vector_t pairs(remainder," ", true); + plib::pstring_vector_t pairs(remainder," ", true); for (pstring &pe : pairs) { int pose = pe.find("="); @@ -994,7 +994,7 @@ nl_double setup_t::model_value(model_map_t &map, const pstring &entity) case 'a': factor = 1e-18; break; default: if (numfac < "0" || numfac > "9") - fatalerror_e(pfmt("Unknown number factor <{1}> in: {2}")(numfac)(entity)); + fatalerror_e(plib::pfmt("Unknown number factor <{1}> in: {2}")(numfac)(entity)); } if (factor != NL_FCONST(1.0)) tmp = tmp.left(tmp.len() - 1); @@ -1021,28 +1021,28 @@ void setup_t::include(const pstring &netlist_name) bool source_string_t::parse(setup_t &setup, const pstring &name) { - pimemstream istrm(m_str.cstr(), m_str.len()); - pomemstream ostrm; + plib::pimemstream istrm(m_str.cstr(), m_str.len()); + plib::pomemstream ostrm; - pimemstream istrm2(ppreprocessor().process(istrm, ostrm)); + plib::pimemstream istrm2(plib::ppreprocessor().process(istrm, ostrm)); return parser_t(istrm2, setup).parse(name); } bool source_mem_t::parse(setup_t &setup, const pstring &name) { - pimemstream istrm(m_str.cstr(), m_str.len()); - pomemstream ostrm; + plib::pimemstream istrm(m_str.cstr(), m_str.len()); + plib::pomemstream ostrm; - pimemstream istrm2(ppreprocessor().process(istrm, ostrm)); + plib::pimemstream istrm2(plib::ppreprocessor().process(istrm, ostrm)); return parser_t(istrm2, setup).parse(name); } bool source_file_t::parse(setup_t &setup, const pstring &name) { - pifilestream istrm(m_filename); - pomemstream ostrm; + plib::pifilestream istrm(m_filename); + plib::pomemstream ostrm; - pimemstream istrm2(ppreprocessor().process(istrm, ostrm)); + plib::pimemstream istrm2(plib::ppreprocessor().process(istrm, ostrm)); return parser_t(istrm2, setup).parse(name); } |