summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist/nl_base.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/netlist/nl_base.cpp')
-rw-r--r--src/lib/netlist/nl_base.cpp23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index d69f61df2db..209992d1562 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -561,7 +561,7 @@ namespace netlist
: core_device_t(owner, name)
{
}
-
+#if 0
setup_t &device_t::setup() noexcept
{
return state().setup();
@@ -571,13 +571,14 @@ namespace netlist
{
return state().setup();
}
+#endif
void device_t::register_subalias(const pstring &name, detail::core_terminal_t &term)
{
pstring alias = this->name() + "." + name;
// everything already fully qualified
- setup().register_alias_nofqn(alias, term.name());
+ state().setup().register_alias_nofqn(alias, term.name());
}
void device_t::register_subalias(const pstring &name, const pstring &aliased)
@@ -586,17 +587,17 @@ namespace netlist
pstring aliased_fqn = this->name() + "." + aliased;
// everything already fully qualified
- setup().register_alias_nofqn(alias, aliased_fqn);
+ state().setup().register_alias_nofqn(alias, aliased_fqn);
}
void device_t::connect(detail::core_terminal_t &t1, detail::core_terminal_t &t2)
{
- setup().register_link_fqn(t1.name(), t2.name());
+ state().setup().register_link_fqn(t1.name(), t2.name());
}
void device_t::connect(const pstring &t1, const pstring &t2)
{
- setup().register_link_fqn(name() + "." + t1, name() + "." + t2);
+ state().setup().register_link_fqn(name() + "." + t1, name() + "." + t2);
}
/* FIXME: this is only used by solver code since matrix solvers are started in
@@ -604,7 +605,7 @@ namespace netlist
*/
void device_t::connect_post_start(detail::core_terminal_t &t1, detail::core_terminal_t &t2)
{
- if (!setup().connect(t1, t2))
+ if (!state().setup().connect(t1, t2))
log().fatal(MF_ERROR_CONNECTING_1_TO_2(t1.name(), t2.name()));
}
@@ -620,7 +621,7 @@ namespace netlist
detail::family_setter_t::family_setter_t(core_device_t &dev, const pstring &desc)
{
- dev.set_logic_family(dev.setup().family_from_model(desc));
+ dev.set_logic_family(dev.state().setup().family_from_model(desc));
}
detail::family_setter_t::family_setter_t(core_device_t &dev, const logic_family_desc_t *desc)
@@ -870,7 +871,7 @@ namespace netlist
param_t::param_t(device_t &device, const pstring &name)
: device_object_t(device, device.name() + "." + name)
{
- device.setup().register_param_t(this->name(), *this);
+ device.state().setup().register_param_t(this->name(), *this);
}
param_t::param_type_t param_t::param_type() const
@@ -900,7 +901,7 @@ namespace netlist
pstring param_t::get_initial(const device_t &dev, bool *found)
{
- pstring res = dev.setup().get_initial_param_val(this->name(), "");
+ pstring res = dev.state().setup().get_initial_param_val(this->name(), "");
*found = (res != "");
return res;
}
@@ -913,7 +914,7 @@ namespace netlist
param_str_t::param_str_t(device_t &device, const pstring &name, const pstring &val)
: param_t(device, name)
{
- m_param = device.setup().get_initial_param_val(this->name(),val);
+ m_param = device.state().setup().get_initial_param_val(this->name(),val);
}
void param_str_t::changed()
@@ -945,7 +946,7 @@ namespace netlist
plib::unique_ptr<std::istream> param_data_t::stream()
{
- return device().setup().get_data_stream(str());
+ return device().state().setup().get_data_stream(str());
}
bool detail::core_terminal_t::is_logic() const NL_NOEXCEPT