Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-04 08:28:39 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

netlist: Minor optimizations. (nw)

Browse Source
This commit is contained in:
couriersud 2019-11-05 17:17:32 +01:00
parent 6c517ab98e
commit a970ef42f1
5 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/devices/machine/netlist.cpp
View File

@ -1342,8 +1342,8 @@ offs_t netlist_disassembler::disassemble(std::ostream &stream, offs_t pc, const
if (relpc >= 0 && relpc < m_dev->netlist().queue().size()) if (relpc >= 0 && relpc < m_dev->netlist().queue().size())
{ {
int dpc = m_dev->netlist().queue().size() - relpc - 1; int dpc = m_dev->netlist().queue().size() - relpc - 1;
util::stream_format(stream, "%c %s @%10.7f", (relpc == 0) ? '*' : ' ', m_dev->netlist().queue()[dpc].m_object->name().c_str(), util::stream_format(stream, "%c %s @%10.7f", (relpc == 0) ? '*' : ' ', m_dev->netlist().queue()[dpc].object()->name().c_str(),
m_dev->netlist().queue()[dpc].m_exec_time.as_double()); m_dev->netlist().queue()[dpc].exec_time().as_double());
} }
pc+=1; pc+=1;

8
src/lib/netlist/analog/nlid_twoterm.h
View File

@ -89,20 +89,20 @@ namespace analog
void solve_later(netlist_time delay = netlist_time::quantum()); void solve_later(netlist_time delay = netlist_time::quantum());
void set_G_V_I(const nl_fptype G, const nl_fptype V, const nl_fptype I) void set_G_V_I(nl_fptype G, nl_fptype V, nl_fptype I) const noexcept
{ {
/* GO, GT, I */ /* GO, GT, I */
m_P.set_go_gt_I( -G, G, ( V) * G - I); m_P.set_go_gt_I( -G, G, ( V) * G - I);
m_N.set_go_gt_I( -G, G, ( -V) * G + I); m_N.set_go_gt_I( -G, G, ( -V) * G + I);
} }
nl_fptype deltaV() const nl_fptype deltaV() const noexcept
{ {
return m_P.net().Q_Analog() - m_N.net().Q_Analog(); return m_P.net().Q_Analog() - m_N.net().Q_Analog();
} }
void set_mat(const nl_fptype a11, const nl_fptype a12, const nl_fptype rhs1, void set_mat(nl_fptype a11, nl_fptype a12, nl_fptype rhs1,
const nl_fptype a21, const nl_fptype a22, const nl_fptype rhs2) nl_fptype a21, nl_fptype a22, nl_fptype rhs2) const noexcept
{ {
/* GO, GT, I */ /* GO, GT, I */
m_P.set_go_gt_I(a12, a11, rhs1); m_P.set_go_gt_I(a12, a11, rhs1);

18
src/lib/netlist/nl_base.cpp
View File

@ -127,8 +127,8 @@ namespace netlist
m_qsize = this->size(); m_qsize = this->size();
for (std::size_t i = 0; i < m_qsize; i++ ) for (std::size_t i = 0; i < m_qsize; i++ )
{ {
m_times[i] = this->listptr()[i].m_exec_time.as_raw(); m_times[i] = this->listptr()[i].exec_time().as_raw();
m_net_ids[i] = state().find_net_id(this->listptr()[i].m_object); m_net_ids[i] = state().find_net_id(this->listptr()[i].object());
} }
} }
@ -663,7 +663,7 @@ namespace netlist
} }
void detail::net_t::reset() void detail::net_t::reset() noexcept
{ {
m_next_scheduled_time = netlist_time::zero(); m_next_scheduled_time = netlist_time::zero();
m_in_queue = queue_status::DELIVERED; m_in_queue = queue_status::DELIVERED;
@ -796,7 +796,7 @@ namespace netlist
net().solver()->update_forced(); net().solver()->update_forced();
} }
void terminal_t::schedule_solve_after(const netlist_time after) void terminal_t::schedule_solve_after(netlist_time after)
{ {
// Nets may belong to railnets which do not have a solver attached // Nets may belong to railnets which do not have a solver attached
if (this->has_net()) if (this->has_net())
@ -826,7 +826,7 @@ namespace netlist
state().setup().register_term(*this); state().setup().register_term(*this);
} }
void logic_output_t::initial(const netlist_sig_t val) void logic_output_t::initial(const netlist_sig_t val) noexcept
{ {
if (has_net()) if (has_net())
net().initial(val); net().initial(val);
@ -858,7 +858,7 @@ namespace netlist
state().setup().register_term(*this); state().setup().register_term(*this);
} }
void analog_output_t::initial(const nl_fptype val) void analog_output_t::initial(const nl_fptype val) noexcept
{ {
net().set_Q_Analog(val); net().set_Q_Analog(val);
} }
@ -928,7 +928,7 @@ namespace netlist
m_param = device.state().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() void param_str_t::changed() noexcept
{ {
} }
@ -939,10 +939,8 @@ namespace netlist
//netlist().save(*this, m_param, "m_param"); //netlist().save(*this, m_param, "m_param");
} }
void param_model_t::changed() void param_model_t::changed() noexcept
{ {
// FIXME: should we really throw here ?
plib::pthrow<nl_exception>(MF_MODEL_1_CAN_NOT_BE_CHANGED_AT_RUNTIME(name()));
} }
const pstring param_model_t::value_str(const pstring &entity) const pstring param_model_t::value_str(const pstring &entity)

49
src/lib/netlist/nl_base.h
View File

@ -284,8 +284,8 @@ namespace netlist
logic_family_t() : m_logic_family(nullptr) {} logic_family_t() : m_logic_family(nullptr) {}
COPYASSIGNMOVE(logic_family_t, delete) COPYASSIGNMOVE(logic_family_t, delete)
const logic_family_desc_t *logic_family() const { return m_logic_family; } const logic_family_desc_t *logic_family() const noexcept { return m_logic_family; }
void set_logic_family(const logic_family_desc_t *fam) { m_logic_family = fam; } void set_logic_family(const logic_family_desc_t *fam) noexcept { m_logic_family = fam; }
protected: protected:
~logic_family_t() noexcept = default; // prohibit polymorphic destruction ~logic_family_t() noexcept = default; // prohibit polymorphic destruction
@ -629,7 +629,7 @@ namespace netlist
virtual ~net_t() noexcept = default; virtual ~net_t() noexcept = default;
void reset(); void reset() noexcept;
void toggle_new_Q() noexcept { m_new_Q = (m_cur_Q ^ 1); } void toggle_new_Q() noexcept { m_new_Q = (m_cur_Q ^ 1); }
@ -763,28 +763,29 @@ namespace netlist
nl_fptype operator ()() const noexcept; nl_fptype operator ()() const noexcept;
void set_conductivity(const nl_fptype G) const noexcept void set_conductivity(nl_fptype G) const noexcept
{ {
set_go_gt_I(-G, G, nlconst::zero()); set_go_gt_I(-G, G, nlconst::zero());
} }
void set_go_gt(const nl_fptype GO, const nl_fptype GT) const noexcept void set_go_gt(nl_fptype GO, nl_fptype GT) const noexcept
{ {
set_go_gt_I(GO, GT, nlconst::zero()); set_go_gt_I(GO, GT, nlconst::zero());
} }
void set_go_gt_I(const nl_fptype GO, const nl_fptype GT, const nl_fptype I) const noexcept void set_go_gt_I(nl_fptype GO, nl_fptype GT, nl_fptype I) const noexcept
{ {
// FIXME: is this check still needed?
if (m_go1 != nullptr) if (m_go1 != nullptr)
{ {
if (*m_Idr1 != I) *m_Idr1 = I; *m_Idr1 = I;
if (*m_go1 != GO) *m_go1 = GO; *m_go1 = GO;
if (*m_gt1 != GT) *m_gt1 = GT; *m_gt1 = GT;
} }
} }
void solve_now(); void solve_now();
void schedule_solve_after(const netlist_time after); void schedule_solve_after(netlist_time after);
void set_ptrs(nl_fptype *gt, nl_fptype *go, nl_fptype *Idr) noexcept(false); void set_ptrs(nl_fptype *gt, nl_fptype *go, nl_fptype *Idr) noexcept(false);
@ -924,7 +925,7 @@ namespace netlist
logic_output_t(core_device_t &dev, const pstring &aname); logic_output_t(core_device_t &dev, const pstring &aname);
void initial(netlist_sig_t val); void initial(netlist_sig_t val) noexcept;
void push(netlist_sig_t newQ, netlist_time delay) noexcept void push(netlist_sig_t newQ, netlist_time delay) noexcept
{ {
@ -946,7 +947,7 @@ namespace netlist
analog_output_t(core_device_t &dev, const pstring &aname); analog_output_t(core_device_t &dev, const pstring &aname);
void push(const nl_fptype val) noexcept { set_Q(val); } void push(const nl_fptype val) noexcept { set_Q(val); }
void initial(const nl_fptype val); void initial(const nl_fptype val) noexcept;
private: private:
void set_Q(const nl_fptype newQ) noexcept; void set_Q(const nl_fptype newQ) noexcept;
@ -1064,7 +1065,7 @@ namespace netlist
} }
} }
protected: protected:
virtual void changed(); virtual void changed() noexcept;
const pstring &str() const noexcept { return m_param; } const pstring &str() const noexcept { return m_param; }
private: private:
PALIGNAS_CACHELINE() PALIGNAS_CACHELINE()
@ -1107,7 +1108,7 @@ namespace netlist
/* hide this */ /* hide this */
void setTo(const pstring &param) = delete; void setTo(const pstring &param) = delete;
protected: protected:
void changed() override; void changed() noexcept override;
private: private:
}; };
@ -1125,7 +1126,7 @@ namespace netlist
plib::unique_ptr<std::istream> stream(); plib::unique_ptr<std::istream> stream();
protected: protected:
void changed() override { } void changed() noexcept override { }
}; };
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@ -1141,7 +1142,7 @@ namespace netlist
ST operator[] (std::size_t n) const noexcept { return m_data[n]; } ST operator[] (std::size_t n) const noexcept { return m_data[n]; }
protected: protected:
void changed() override void changed() noexcept override
{ {
stream()->read(reinterpret_cast<std::istream::char_type *>(&m_data[0]),1<<AW); stream()->read(reinterpret_cast<std::istream::char_type *>(&m_data[0]),1<<AW);
} }
@ -1987,14 +1988,14 @@ namespace netlist
if (m_mainclock == nullptr) if (m_mainclock == nullptr)
{ {
detail::queue_t::entry_t e(m_queue.pop()); detail::queue_t::entry_t e(m_queue.pop());
m_time = e.m_exec_time; m_time = e.exec_time();
while (e.m_object != nullptr) while (e.object() != nullptr)
{ {
e.m_object->template update_devs<KEEP_STATS>(); e.object()->template update_devs<KEEP_STATS>();
if (KEEP_STATS) if (KEEP_STATS)
m_perf_out_processed.inc(); m_perf_out_processed.inc();
e = m_queue.pop(); e = m_queue.pop();
m_time = e.m_exec_time; m_time = e.exec_time();
} }
} }
else else
@ -2005,7 +2006,7 @@ namespace netlist
do do
{ {
while (m_queue.top().m_exec_time > mc_time) while (m_queue.top().exec_time() > mc_time)
{ {
m_time = mc_time; m_time = mc_time;
mc_net.toggle_new_Q(); mc_net.toggle_new_Q();
@ -2014,10 +2015,10 @@ namespace netlist
} }
detail::queue_t::entry_t e(m_queue.pop()); detail::queue_t::entry_t e(m_queue.pop());
m_time = e.m_exec_time; m_time = e.exec_time();
if (e.m_object != nullptr) if (e.object() != nullptr)
{ {
e.m_object->template update_devs<KEEP_STATS>(); e.object()->template update_devs<KEEP_STATS>();
if (KEEP_STATS) if (KEEP_STATS)
m_perf_out_processed.inc(); m_perf_out_processed.inc();
} }

3
src/lib/netlist/plib/plists.h
View File

@ -285,6 +285,9 @@ namespace plib {
inline static constexpr pqentry_t never() noexcept { return pqentry_t(Time::never(), nullptr); } inline static constexpr pqentry_t never() noexcept { return pqentry_t(Time::never(), nullptr); }
Time exec_time() const noexcept { return m_exec_time; }
Element object() const noexcept { return m_object; }
private:
Time m_exec_time; Time m_exec_time;
Element m_object; Element m_object;
}; };