diff options
Diffstat (limited to 'src/lib/netlist')
| -rw-r--r-- | src/lib/netlist/analog/nld_bjt.h | 10 | ||||
| -rw-r--r-- | src/lib/netlist/devices/nld_4020.h | 1 | ||||
| -rw-r--r-- | src/lib/netlist/devices/nld_74107.h | 2 | ||||
| -rw-r--r-- | src/lib/netlist/devices/nld_74153.h | 2 | ||||
| -rw-r--r-- | src/lib/netlist/devices/nld_7448.h | 3 | ||||
| -rw-r--r-- | src/lib/netlist/devices/nld_7450.h | 1 | ||||
| -rw-r--r-- | src/lib/netlist/devices/nld_7474.cpp | 2 | ||||
| -rw-r--r-- | src/lib/netlist/devices/nld_7474.h | 1 | ||||
| -rw-r--r-- | src/lib/netlist/devices/nld_ne555.h | 1 | ||||
| -rw-r--r-- | src/lib/netlist/devices/nld_system.h | 2 | ||||
| -rw-r--r-- | src/lib/netlist/macro/nlm_ttl74xx.cpp | 22 | ||||
| -rw-r--r-- | src/lib/netlist/macro/nlm_ttl74xx.h | 12 | ||||
| -rw-r--r-- | src/lib/netlist/nl_base.cpp | 13 | ||||
| -rw-r--r-- | src/lib/netlist/nl_base.h | 14 | ||||
| -rw-r--r-- | src/lib/netlist/nl_util.h | 2 | ||||
| -rw-r--r-- | src/lib/netlist/plib/pdynlib.cpp | 2 | ||||
| -rw-r--r-- | src/lib/netlist/solver/nld_matrix_solver.h | 2 | ||||
| -rw-r--r-- | src/lib/netlist/solver/nld_ms_sm.h | 4 | ||||
| -rw-r--r-- | src/lib/netlist/solver/nld_ms_w.h | 2 |
19 files changed, 43 insertions, 55 deletions
diff --git a/src/lib/netlist/analog/nld_bjt.h b/src/lib/netlist/analog/nld_bjt.h index 978f58a19f3..0ccd3d57c76 100644 --- a/src/lib/netlist/analog/nld_bjt.h +++ b/src/lib/netlist/analog/nld_bjt.h @@ -152,11 +152,11 @@ NETLIB_OBJECT_DERIVED(QBJT_EB, QBJT) { public: NETLIB_CONSTRUCTOR_DERIVED(QBJT_EB, QBJT) - , m_D_CB(owner, "m_D_CB") - , m_D_EB(owner, "m_D_EB") - , m_D_EC(owner, "m_D_EC") - , m_alpha_f(0) - , m_alpha_r(0) + , m_D_CB(owner, "m_D_CB") + , m_D_EB(owner, "m_D_EB") + , m_D_EC(owner, "m_D_EC") + , m_alpha_f(0) + , m_alpha_r(0) { enregister("E", m_D_EB.m_P); // Cathode enregister("B", m_D_EB.m_N); // Anode diff --git a/src/lib/netlist/devices/nld_4020.h b/src/lib/netlist/devices/nld_4020.h index 491bef29c21..de6f654fcfb 100644 --- a/src/lib/netlist/devices/nld_4020.h +++ b/src/lib/netlist/devices/nld_4020.h @@ -91,7 +91,6 @@ NETLIB_OBJECT(CD4020) , m_sub(*this, "sub") , m_supply(*this, "supply") { - enregister("RESET", m_RESET); register_subalias("IP", m_sub.m_IP); register_subalias("Q1", m_sub.m_Q[0]); diff --git a/src/lib/netlist/devices/nld_74107.h b/src/lib/netlist/devices/nld_74107.h index 8023f1103fd..10f0bf71224 100644 --- a/src/lib/netlist/devices/nld_74107.h +++ b/src/lib/netlist/devices/nld_74107.h @@ -115,7 +115,6 @@ NETLIB_OBJECT(74107A) NETLIB_CONSTRUCTOR(74107A) , m_sub(*this, "sub") { - register_subalias("CLK", m_sub.m_clk); enregister("J", m_J); enregister("K", m_K); @@ -148,7 +147,6 @@ NETLIB_OBJECT(74107_dip) , m_1(*this, "1") , m_2(*this, "2") { - register_subalias("1", m_1.m_J); register_subalias("2", m_1.m_sub.m_QQ); register_subalias("3", m_1.m_sub.m_Q); diff --git a/src/lib/netlist/devices/nld_74153.h b/src/lib/netlist/devices/nld_74153.h index dc7753c28c6..30d76cb051e 100644 --- a/src/lib/netlist/devices/nld_74153.h +++ b/src/lib/netlist/devices/nld_74153.h @@ -95,7 +95,6 @@ NETLIB_OBJECT(74153) NETLIB_CONSTRUCTOR(74153) , m_sub(*this, "sub") { - register_subalias("C0", m_sub.m_C[0]); register_subalias("C1", m_sub.m_C[1]); register_subalias("C2", m_sub.m_C[2]); @@ -120,7 +119,6 @@ NETLIB_OBJECT(74153_dip) , m_1(*this, "1") , m_2(*this, "2") { - register_subalias("1", m_1.m_G); enregister("2", m_B); // m_2.m_B register_subalias("3", m_1.m_C[3]); diff --git a/src/lib/netlist/devices/nld_7448.h b/src/lib/netlist/devices/nld_7448.h index c9de0af5cc6..b20dde552a3 100644 --- a/src/lib/netlist/devices/nld_7448.h +++ b/src/lib/netlist/devices/nld_7448.h @@ -46,7 +46,7 @@ NETLIB_NAMESPACE_DEVICES_START() * FIXME: Using truthtable is a lot slower than the explicit device */ -#define USE_TRUTHTABLE_7448 (0) +#define USE_TRUTHTABLE_7448 (0) #if (USE_TRUTHTABLE_7448 && USE_TRUTHTABLE) @@ -100,7 +100,6 @@ NETLIB_OBJECT(7448) NETLIB_CONSTRUCTOR(7448) , m_sub(*this, "sub") { - register_subalias("A", m_sub.m_A); register_subalias("B", m_sub.m_B); register_subalias("C", m_sub.m_C); diff --git a/src/lib/netlist/devices/nld_7450.h b/src/lib/netlist/devices/nld_7450.h index 0b10b35e1ed..c0db52f4b22 100644 --- a/src/lib/netlist/devices/nld_7450.h +++ b/src/lib/netlist/devices/nld_7450.h @@ -65,7 +65,6 @@ NETLIB_OBJECT(7450_dip) , m_1(*this, "1") , m_2(*this, "2") { - register_subalias("1", m_1.m_A); register_subalias("2", m_2.m_A); register_subalias("3", m_2.m_B); diff --git a/src/lib/netlist/devices/nld_7474.cpp b/src/lib/netlist/devices/nld_7474.cpp index d1f2e11cd8a..ee2dc56b327 100644 --- a/src/lib/netlist/devices/nld_7474.cpp +++ b/src/lib/netlist/devices/nld_7474.cpp @@ -68,7 +68,7 @@ NETLIB_RESET(7474sub) NETLIB_RESET(7474_dip) { -// m_1.do_reset(); +// m_1.do_reset(); //m_2.do_reset(); } diff --git a/src/lib/netlist/devices/nld_7474.h b/src/lib/netlist/devices/nld_7474.h index 1de0838b9c9..6caad4d68f3 100644 --- a/src/lib/netlist/devices/nld_7474.h +++ b/src/lib/netlist/devices/nld_7474.h @@ -115,7 +115,6 @@ NETLIB_OBJECT(7474_dip) , m_1(*this, "1") , m_2(*this, "2") { - register_subalias("1", m_1.m_CLRQ); register_subalias("2", m_1.m_D); register_subalias("3", m_1.sub.m_CLK); diff --git a/src/lib/netlist/devices/nld_ne555.h b/src/lib/netlist/devices/nld_ne555.h index 9963b83546e..73413796fd7 100644 --- a/src/lib/netlist/devices/nld_ne555.h +++ b/src/lib/netlist/devices/nld_ne555.h @@ -37,7 +37,6 @@ NETLIB_OBJECT(NE555) , m_last_out(false) , m_ff(false) { - register_subalias("GND", m_R3.m_N); // Pin 1 enregister("TRIG", m_TRIG); // Pin 2 enregister("OUT", m_OUT); // Pin 3 diff --git a/src/lib/netlist/devices/nld_system.h b/src/lib/netlist/devices/nld_system.h index a5609704a7d..1b22ae3e9dd 100644 --- a/src/lib/netlist/devices/nld_system.h +++ b/src/lib/netlist/devices/nld_system.h @@ -525,7 +525,7 @@ public: protected: - NETLIB_RESETI() { } + NETLIB_RESETI() { } NETLIB_UPDATEI() { diff --git a/src/lib/netlist/macro/nlm_ttl74xx.cpp b/src/lib/netlist/macro/nlm_ttl74xx.cpp index fc589231b19..b21b388ba58 100644 --- a/src/lib/netlist/macro/nlm_ttl74xx.cpp +++ b/src/lib/netlist/macro/nlm_ttl74xx.cpp @@ -79,7 +79,7 @@ NETLIST_START(TTL_7402_DIP) s2.A, /* A2 |5 10| Y3 */ s3.Q, s2.B, /* B2 |6 9| B3 */ s3.B, GND.I, /* GND |7 8| A3 */ s3.A - /* +--------------+ */ + /* +--------------+ */ ) NETLIST_END() @@ -117,7 +117,7 @@ NETLIST_START(TTL_7404_DIP) s3.A, /* A3 |5 10| Y5 */ s5.Q, s3.Q, /* Y3 |6 9| A4 */ s4.A, GND.I, /* GND |7 8| Y4 */ s4.Q - /* +--------------+ */ + /* +--------------+ */ ) NETLIST_END() @@ -156,7 +156,7 @@ NETLIST_START(TTL_7408_DIP) s2.B, /* B2 |5 10| B3 */ s3.B, s2.Q, /* Y2 |6 9| A3 */ s3.A, GND.I, /* GND |7 8| Y3 */ s3.Q - /* +--------------+ */ + /* +--------------+ */ ) NETLIST_END() @@ -193,7 +193,7 @@ NETLIST_START(TTL_7410_DIP) s2.C, /* C2 |5 10| B3 */ s3.B, s2.Q, /* Y2 |6 9| A3 */ s3.A, GND.I, /* GND |7 8| Y3 */ s3.Q - /* +--------------+ */ + /* +--------------+ */ ) NETLIST_END() @@ -230,7 +230,7 @@ NETLIST_START(TTL_7411_DIP) s2.C, /* C2 |5 10| B3 */ s3.B, s2.Q, /* Y2 |6 9| A3 */ s3.A, GND.I, /* GND |7 8| Y3 */ s3.Q - /* +--------------+ */ + /* +--------------+ */ ) NETLIST_END() @@ -297,7 +297,7 @@ NETLIST_START(TTL_7420_DIP) s1.D, /* D1 |5 10| B2 */ s2.B, s1.Q, /* Y1 |6 9| A2 */ s2.A, GND.I, /* GND |7 8| Y2 */ s2.Q - /* +--------------+ */ + /* +--------------+ */ ) NETLIST_END() @@ -334,12 +334,12 @@ NETLIST_START(TTL_7425_DIP) DIPPINS( /* +--------------+ */ s1.A, /* A1 |1 ++ 14| VCC */ VCC.I, s1.B, /* B1 |2 13| D2 */ s2.D, - X.I, /* X1 |3 12| C2 */ s2.C, + X.I, /* X1 |3 12| C2 */ s2.C, s1.C, /* C1 |4 7425 11| X2 */ X.I, s1.D, /* D1 |5 10| B2 */ s2.B, s1.Q, /* Y1 |6 9| A2 */ s2.A, GND.I, /* GND |7 8| Y2 */ s2.Q - /* +--------------+ */ + /* +--------------+ */ ) NETLIST_END() @@ -377,7 +377,7 @@ NETLIST_START(TTL_7427_DIP) s2.C, /* C2 |5 10| B3 */ s3.B, s2.Q, /* Y2 |6 9| A3 */ s3.A, GND.I, /* GND |7 8| Y3 */ s3.Q - /* +--------------+ */ + /* +--------------+ */ ) NETLIST_END() @@ -417,7 +417,7 @@ NETLIST_START(TTL_7430_DIP) s1.E, /* E |5 10| NC */ NC.I, s1.F, /* F |6 9| NC */ NC.I, GND.I, /* GND |7 8| Y */ s1.Q - /* +--------------+ */ + /* +--------------+ */ ) NETLIST_END() @@ -456,7 +456,7 @@ NETLIST_START(TTL_7432_DIP) s2.B, /* B2 |5 10| B3 */ s3.B, s2.Q, /* Y2 |6 9| A3 */ s3.A, GND.I, /* GND |7 8| Y3 */ s3.Q - /* +--------------+ */ + /* +--------------+ */ ) NETLIST_END() diff --git a/src/lib/netlist/macro/nlm_ttl74xx.h b/src/lib/netlist/macro/nlm_ttl74xx.h index 541a9932fb5..924b2c31093 100644 --- a/src/lib/netlist/macro/nlm_ttl74xx.h +++ b/src/lib/netlist/macro/nlm_ttl74xx.h @@ -15,8 +15,8 @@ NET_REGISTER_DEV(TTL_7400_GATE, _name) #define TTL_7400_NAND(_name, _A, _B) \ - NET_REGISTER_DEV(TTL_7400_NAND, _name) \ - NET_CONNECT(_name, A, _A) \ + NET_REGISTER_DEV(TTL_7400_NAND, _name) \ + NET_CONNECT(_name, A, _A) \ NET_CONNECT(_name, B, _B) #define TTL_7400_DIP(_name) \ @@ -50,8 +50,8 @@ NET_REGISTER_DEV(TTL_7408_GATE, _name) #define TTL_7408_AND(_name, _A, _B) \ - NET_REGISTER_DEV(TTL_7408_AND, _name) \ - NET_CONNECT(_name, A, _A) \ + NET_REGISTER_DEV(TTL_7408_AND, _name) \ + NET_CONNECT(_name, A, _A) \ NET_CONNECT(_name, B, _B) #define TTL_7408_DIP(_name) \ @@ -166,8 +166,8 @@ NET_REGISTER_DEV(TTL_7437_GATE, _name) #define TTL_7437_NAND(_name, _A, _B) \ - NET_REGISTER_DEV(TTL_7437_NAND, _name) \ - NET_CONNECT(_name, A, _A) \ + NET_REGISTER_DEV(TTL_7437_NAND, _name) \ + NET_CONNECT(_name, A, _A) \ NET_CONNECT(_name, B, _B) #define TTL_7437_DIP(_name) \ diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp index 6a23dd651b5..477887622a4 100644 --- a/src/lib/netlist/nl_base.cpp +++ b/src/lib/netlist/nl_base.cpp @@ -20,7 +20,6 @@ const netlist::netlist_time netlist::netlist_time::zero = netlist::netlist_time( namespace netlist { - #if 0 static pmempool p(65536, 16); @@ -31,8 +30,8 @@ void * object_t::operator new (size_t size) void object_t::operator delete (void * mem) { - if (mem) - p.free(mem); + if (mem) + p.free(mem); } #else void * object_t::operator new (size_t size) @@ -42,8 +41,8 @@ void * object_t::operator new (size_t size) void object_t::operator delete (void * mem) { - if (mem) - ::operator delete(mem); + if (mem) + ::operator delete(mem); } #endif @@ -234,7 +233,6 @@ netlist_t::netlist_t(const pstring &aname) netlist_t::~netlist_t() { - m_nets.clear(); m_devices.clear(); @@ -619,7 +617,7 @@ ATTR_COLD net_t::~net_t() // FIXME: move somewhere central struct do_nothing_deleter{ - template<typename T> void operator()(T*){} + template<typename T> void operator()(T*){} }; ATTR_COLD void net_t::init_object(netlist_t &nl, const pstring &aname, core_terminal_t *mr) @@ -1058,4 +1056,3 @@ ATTR_HOT /* inline */ void NETLIB_NAME(mainclock)::mc_update(logic_net_t &net) NETLIB_NAMESPACE_DEVICES_END() - diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h index d60828b7d62..4fd71b8a2c1 100644 --- a/src/lib/netlist/nl_base.h +++ b/src/lib/netlist/nl_base.h @@ -176,9 +176,9 @@ */ using netlist_sig_t = std::uint32_t; - //============================================================ - // MACROS / New Syntax - //============================================================ + //============================================================ + // MACROS / New Syntax + //============================================================ #define NETLIB_NAMESPACE_DEVICES_START() namespace netlist { namespace devices { #define NETLIB_NAMESPACE_DEVICES_END() }} @@ -208,10 +208,10 @@ class NETLIB_NAME(_name) : public device_t public: template <class _CLASS> ATTR_COLD NETLIB_NAME(_name)(_CLASS &owner, const pstring name, __VA_ARGS__) \ : device_t(owner, name) -#define NETLIB_DYNAMIC() \ +#define NETLIB_DYNAMIC() \ public: ATTR_HOT virtual bool is_dynamic1() const override { return true; } -#define NETLIB_TIMESTEP() \ +#define NETLIB_TIMESTEP() \ public: ATTR_HOT virtual bool is_timestep() const override { return true; } \ public: ATTR_HOT virtual void step_time(const nl_double step) override @@ -403,8 +403,8 @@ namespace netlist #if 1 public: - void * operator new (size_t size); - void operator delete (void * mem); + void * operator new (size_t size); + void operator delete (void * mem); #endif }; diff --git a/src/lib/netlist/nl_util.h b/src/lib/netlist/nl_util.h index f25a0d13320..69ffb10ecdd 100644 --- a/src/lib/netlist/nl_util.h +++ b/src/lib/netlist/nl_util.h @@ -182,7 +182,7 @@ public: } bool is_owned() const { return m_is_owned; } - + template<typename _DC> powned_ptr<_DC> & operator =(powned_ptr<_DC> &r) { diff --git a/src/lib/netlist/plib/pdynlib.cpp b/src/lib/netlist/plib/pdynlib.cpp index d08f194a137..743ea7705f4 100644 --- a/src/lib/netlist/plib/pdynlib.cpp +++ b/src/lib/netlist/plib/pdynlib.cpp @@ -41,7 +41,7 @@ pdynlib::pdynlib(const pstring libname) pdynlib::pdynlib(const pstring path, const pstring libname) : m_isLoaded(false), m_lib(nullptr) { - // printf("win: loading <%s>\n", libname.cstr()); + // printf("win: loading <%s>\n", libname.cstr()); #ifdef _WIN32 if (libname != "") m_lib = LoadLibrary(libname.cstr()); diff --git a/src/lib/netlist/solver/nld_matrix_solver.h b/src/lib/netlist/solver/nld_matrix_solver.h index ab6364cb2d3..93d01c962f2 100644 --- a/src/lib/netlist/solver/nld_matrix_solver.h +++ b/src/lib/netlist/solver/nld_matrix_solver.h @@ -87,7 +87,7 @@ public: matrix_solver_t(netlist_t &anetlist, const pstring &name, const eSortType sort, const solver_parameters_t *params) : device_t(anetlist, name), - m_stat_calculations(0), + m_stat_calculations(0), m_stat_newton_raphson(0), m_stat_vsolver_calls(0), m_iterative_fail(0), diff --git a/src/lib/netlist/solver/nld_ms_sm.h b/src/lib/netlist/solver/nld_ms_sm.h index 1a3c50b4a27..c5d0e1105b6 100644 --- a/src/lib/netlist/solver/nld_ms_sm.h +++ b/src/lib/netlist/solver/nld_ms_sm.h @@ -13,9 +13,9 @@ * In this specific implementation, u is a unit vector specifying the row which * changed. Thus v contains the changed column. * - * Than z = A⁻¹ u , w = transpose(A⁻¹) v , lambda = v z + * Than z = A^-1 u , w = transpose(A^-1) v , lambda = v z * - * A⁻¹ <- 1.0 / (1.0 + lambda) * (z x w) + * A^-1 <- 1.0 / (1.0 + lambda) * (z x w) * * The approach is iterative and applied for each row changed. * diff --git a/src/lib/netlist/solver/nld_ms_w.h b/src/lib/netlist/solver/nld_ms_w.h index f61c2b1b616..e976fcf3184 100644 --- a/src/lib/netlist/solver/nld_ms_w.h +++ b/src/lib/netlist/solver/nld_ms_w.h @@ -15,7 +15,7 @@ * Whilst the book proposes to invert the matrix R=(I+transpose(V)*Z) we define * * w = transpose(V)*y - * a = R⁻¹ * w + * a = R^-1 * w * * and consequently * |
