summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author couriersud <couriersud@gmx.org>2020-08-20 18:16:06 +0200
committer couriersud <couriersud@gmx.org>2020-08-20 18:16:17 +0200
commit1e74aa6bff26485a36c1d96ca24970a87c00f04d (patch)
tree3139b27c824cac3ffc3d1eb0754f9141d799ad34
parent3aaa8706da6121762d1a782e3c0a8ba239b51e31 (diff)
netlist: optimized 7416
-rw-r--r--src/lib/netlist/devices/nld_74165.cpp52
1 files changed, 28 insertions, 24 deletions
diff --git a/src/lib/netlist/devices/nld_74165.cpp b/src/lib/netlist/devices/nld_74165.cpp
index 9b29a7beaf2..527e4605bef 100644
--- a/src/lib/netlist/devices/nld_74165.cpp
+++ b/src/lib/netlist/devices/nld_74165.cpp
@@ -31,56 +31,61 @@ namespace netlist
{
namespace devices
{
+
NETLIB_OBJECT(74165)
{
NETLIB_CONSTRUCTOR(74165)
, m_DATA(*this, { "H", "G", "F", "E", "D", "C", "B", "A" }, NETLIB_DELEGATE(inputs))
- , m_SER(*this, "SER", NETLIB_DELEGATE(inputs))
+ , m_SER(*this, "SER", NETLIB_DELEGATE(noop))
, m_SH_LDQ(*this, "SH_LDQ", NETLIB_DELEGATE(inputs))
- , m_CLK(*this, "CLK", NETLIB_DELEGATE(inputs))
+ , m_CLK(*this, "CLK", NETLIB_DELEGATE(clk))
, m_CLKINH(*this, "CLKINH", NETLIB_DELEGATE(inputs))
, m_QH(*this, "QH")
, m_QHQ(*this, "QHQ")
, m_shifter(*this, "m_shifter", 0)
- , m_last_CLK(*this, "m_last_CLK", 0)
, m_power_pins(*this)
{
}
NETLIB_RESETI()
{
+ m_CLK.set_state(logic_t::STATE_INP_LH);
m_shifter = 0;
- m_last_CLK = 0;
}
- NETLIB_HANDLERI(inputs)
+ NETLIB_HANDLERI(noop)
{
- {
- netlist_sig_t qh = 0;
+ }
- if (!m_SH_LDQ())
- {
- m_shifter = 0;
- for (std::size_t i=0; i<8; i++)
- m_shifter |= (m_DATA[i]() << i);
- }
- else if (m_CLK() && !m_last_CLK && !m_CLKINH())
- {
- unsigned high_bit = m_SER() ? 0x80 : 0;
- m_shifter = high_bit | (m_shifter >> 1);
- }
+ NETLIB_HANDLERI(clk)
+ {
+ unsigned high_bit = m_SER() ? 0x80 : 0;
+ m_shifter = high_bit | (m_shifter >> 1);
- qh = m_shifter & 1;
+ const auto qh = m_shifter & 1;
- m_last_CLK = m_CLK();
+ m_QH.push(qh, NLTIME_FROM_NS(20)); // FIXME: Timing
+ m_QHQ.push(qh ^ 1, NLTIME_FROM_NS(20)); // FIXME: Timing
+ }
+
+ NETLIB_HANDLERI(inputs)
+ {
+ if (!m_SH_LDQ())
+ {
+ m_shifter = 0;
+ for (std::size_t i=0; i<8; i++)
+ m_shifter |= (m_DATA[i]() << i);
+ const auto qh = m_shifter & 1;
m_QH.push(qh, NLTIME_FROM_NS(20)); // FIXME: Timing
- m_QHQ.push(qh ? 0 : 1, NLTIME_FROM_NS(20)); // FIXME: Timing
+ m_QHQ.push(qh ^ 1, NLTIME_FROM_NS(20)); // FIXME: Timing
}
-
+ if (!m_SH_LDQ() || m_CLKINH())
+ m_CLK.inactivate();
+ else
+ m_CLK.activate_lh();
}
- friend class NETLIB_NAME(74165_dip);
private:
object_array_t<logic_input_t, 8> m_DATA;
logic_input_t m_SER;
@@ -91,7 +96,6 @@ namespace netlist
logic_output_t m_QHQ;
state_var<unsigned> m_shifter;
- state_var<unsigned> m_last_CLK;
nld_power_pins m_power_pins;
};