summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author couriersud <couriersud@arcor.de>2016-06-25 00:20:17 +0200
committer couriersud <couriersud@arcor.de>2016-06-25 00:20:17 +0200
commitaf750f143cd6d36f377fb22f214970553f278a09 (patch)
tree4e867df3d7f0af42fcc340a696081cd6de50c646
parent798bb7956756fcb8f356dcaeeaf7fe1e31dab8da (diff)
Srcclean on netlist files. Avoid the merge massacre. (nw)
-rw-r--r--src/devices/machine/netlist.h2
-rw-r--r--src/lib/netlist/analog/nld_bjt.cpp1
-rw-r--r--src/lib/netlist/analog/nld_bjt.h1
-rw-r--r--src/lib/netlist/analog/nld_fourterm.cpp1
-rw-r--r--src/lib/netlist/analog/nld_fourterm.h2
-rw-r--r--src/lib/netlist/analog/nld_opamps.cpp1
-rw-r--r--src/lib/netlist/analog/nld_opamps.h2
-rw-r--r--src/lib/netlist/analog/nld_switches.cpp1
-rw-r--r--src/lib/netlist/analog/nld_switches.h1
-rw-r--r--src/lib/netlist/analog/nld_twoterm.cpp1
-rw-r--r--src/lib/netlist/analog/nld_twoterm.h2
-rw-r--r--src/lib/netlist/build/makefile22
-rw-r--r--src/lib/netlist/devices/net_lib.cpp1
-rw-r--r--src/lib/netlist/devices/nld_4020.cpp3
-rw-r--r--src/lib/netlist/devices/nld_4066.cpp1
-rw-r--r--src/lib/netlist/devices/nld_74107.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74123.cpp1
-rw-r--r--src/lib/netlist/devices/nld_74153.cpp3
-rw-r--r--src/lib/netlist/devices/nld_74175.cpp1
-rw-r--r--src/lib/netlist/devices/nld_74192.cpp1
-rw-r--r--src/lib/netlist/devices/nld_74193.cpp1
-rw-r--r--src/lib/netlist/devices/nld_74279.cpp1
-rw-r--r--src/lib/netlist/devices/nld_7448.cpp1
-rw-r--r--src/lib/netlist/devices/nld_7448.h6
-rw-r--r--src/lib/netlist/devices/nld_7450.cpp2
-rw-r--r--src/lib/netlist/devices/nld_7474.cpp4
-rw-r--r--src/lib/netlist/devices/nld_7483.cpp1
-rw-r--r--src/lib/netlist/devices/nld_7490.cpp1
-rw-r--r--src/lib/netlist/devices/nld_7493.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74ls629.cpp1
-rw-r--r--src/lib/netlist/devices/nld_82S16.cpp1
-rw-r--r--src/lib/netlist/devices/nld_9310.cpp1
-rw-r--r--src/lib/netlist/devices/nld_9312.cpp1
-rw-r--r--src/lib/netlist/devices/nld_9316.cpp1
-rw-r--r--src/lib/netlist/devices/nld_legacy.cpp1
-rw-r--r--src/lib/netlist/devices/nld_legacy.h1
-rw-r--r--src/lib/netlist/devices/nld_log.cpp2
-rw-r--r--src/lib/netlist/devices/nld_mm5837.cpp1
-rw-r--r--src/lib/netlist/devices/nld_ne555.cpp2
-rw-r--r--src/lib/netlist/devices/nld_r2r_dac.cpp1
-rw-r--r--src/lib/netlist/devices/nld_system.cpp1
-rw-r--r--src/lib/netlist/devices/nld_truthtable.cpp1
-rw-r--r--src/lib/netlist/devices/nld_truthtable.h23
-rw-r--r--src/lib/netlist/devices/nlid_cmos.h1
-rw-r--r--src/lib/netlist/devices/nlid_system.h6
-rw-r--r--src/lib/netlist/macro/nlm_ttl74xx.cpp24
-rw-r--r--src/lib/netlist/macro/nlm_ttl74xx.h12
-rw-r--r--src/lib/netlist/nl_base.cpp18
-rw-r--r--src/lib/netlist/nl_base.h34
-rw-r--r--src/lib/netlist/nl_config.h10
-rw-r--r--src/lib/netlist/nl_factory.cpp1
-rw-r--r--src/lib/netlist/nl_factory.h1
-rw-r--r--src/lib/netlist/nl_lists.h10
-rw-r--r--src/lib/netlist/nl_setup.h4
-rw-r--r--src/lib/netlist/plib/palloc.cpp1
-rw-r--r--src/lib/netlist/plib/palloc.h5
-rw-r--r--src/lib/netlist/plib/pchrono.cpp2
-rw-r--r--src/lib/netlist/plib/pchrono.h8
-rw-r--r--src/lib/netlist/plib/pconfig.h1
-rw-r--r--src/lib/netlist/plib/pdynlib.cpp3
-rw-r--r--src/lib/netlist/plib/pdynlib.h1
-rw-r--r--src/lib/netlist/plib/pfmtlog.cpp2
-rw-r--r--src/lib/netlist/plib/pfmtlog.h1
-rw-r--r--src/lib/netlist/plib/plists.h9
-rw-r--r--src/lib/netlist/plib/poptions.cpp2
-rw-r--r--src/lib/netlist/plib/poptions.h1
-rw-r--r--src/lib/netlist/plib/pparser.h1
-rw-r--r--src/lib/netlist/plib/pstate.cpp1
-rw-r--r--src/lib/netlist/plib/pstate.h13
-rw-r--r--src/lib/netlist/plib/pstream.cpp1
-rw-r--r--src/lib/netlist/plib/pstream.h1
-rw-r--r--src/lib/netlist/plib/pstring.h26
-rw-r--r--src/lib/netlist/plib/ptypes.h1
-rw-r--r--src/lib/netlist/plib/putil.cpp3
-rw-r--r--src/lib/netlist/plib/putil.h6
-rw-r--r--src/lib/netlist/prg/nltool.cpp22
-rw-r--r--src/lib/netlist/prg/nlwav.cpp12
-rw-r--r--src/lib/netlist/solver/nld_matrix_solver.h1
-rw-r--r--src/lib/netlist/solver/nld_ms_direct.h1
-rw-r--r--src/lib/netlist/solver/nld_ms_direct1.h1
-rw-r--r--src/lib/netlist/solver/nld_ms_direct2.h1
-rw-r--r--src/lib/netlist/solver/nld_ms_direct_lu.h1
-rw-r--r--src/lib/netlist/solver/nld_ms_gcr.h1
-rw-r--r--src/lib/netlist/solver/nld_ms_gmres.h1
-rw-r--r--src/lib/netlist/solver/nld_ms_sm.h1
-rw-r--r--src/lib/netlist/solver/nld_ms_sor.h1
-rw-r--r--src/lib/netlist/solver/nld_ms_sor_mat.h1
-rw-r--r--src/lib/netlist/solver/nld_ms_w.h1
-rw-r--r--src/lib/netlist/solver/nld_solver.cpp1
-rw-r--r--src/lib/netlist/solver/nld_solver.h1
-rw-r--r--src/mame/machine/nl_breakout.cpp2
91 files changed, 131 insertions, 235 deletions
diff --git a/src/devices/machine/netlist.h b/src/devices/machine/netlist.h
index ad2cfdd47d1..e4166f29151 100644
--- a/src/devices/machine/netlist.h
+++ b/src/devices/machine/netlist.h
@@ -680,8 +680,6 @@ public:
, m_feedback(*this, "FB") // clock part
, m_Q(*this, "Q")
{
-
-
connect_late(m_feedback, m_Q);
m_inc = netlist::netlist_time::from_nsec(1);
diff --git a/src/lib/netlist/analog/nld_bjt.cpp b/src/lib/netlist/analog/nld_bjt.cpp
index 80b6ffe107b..8d587c1b80d 100644
--- a/src/lib/netlist/analog/nld_bjt.cpp
+++ b/src/lib/netlist/analog/nld_bjt.cpp
@@ -13,7 +13,6 @@ namespace netlist
{
namespace devices
{
-
class diode
{
public:
diff --git a/src/lib/netlist/analog/nld_bjt.h b/src/lib/netlist/analog/nld_bjt.h
index bb9f6863ec1..e2da1bd529f 100644
--- a/src/lib/netlist/analog/nld_bjt.h
+++ b/src/lib/netlist/analog/nld_bjt.h
@@ -28,7 +28,6 @@ namespace netlist
{
namespace devices
{
-
// -----------------------------------------------------------------------------
// nld_Q - Base classes
// -----------------------------------------------------------------------------
diff --git a/src/lib/netlist/analog/nld_fourterm.cpp b/src/lib/netlist/analog/nld_fourterm.cpp
index 8fda95bc0f6..a077e8d3bcc 100644
--- a/src/lib/netlist/analog/nld_fourterm.cpp
+++ b/src/lib/netlist/analog/nld_fourterm.cpp
@@ -13,7 +13,6 @@ namespace netlist
{
namespace devices
{
-
// ----------------------------------------------------------------------------------------
// nld_VCCS
// ----------------------------------------------------------------------------------------
diff --git a/src/lib/netlist/analog/nld_fourterm.h b/src/lib/netlist/analog/nld_fourterm.h
index d87f4ab045d..5beba564ee2 100644
--- a/src/lib/netlist/analog/nld_fourterm.h
+++ b/src/lib/netlist/analog/nld_fourterm.h
@@ -32,7 +32,6 @@ namespace netlist
{
namespace devices
{
-
// ----------------------------------------------------------------------------------------
// nld_VCCS
// ----------------------------------------------------------------------------------------
@@ -206,7 +205,6 @@ public:
, m_OP2(*this, "_OP2")
, m_ON2(*this, "_ON2")
{
-
m_OP2.m_otherterm = &m_ON2;
m_ON2.m_otherterm = &m_OP2;
diff --git a/src/lib/netlist/analog/nld_opamps.cpp b/src/lib/netlist/analog/nld_opamps.cpp
index 932232a9ecb..48a28dfe87c 100644
--- a/src/lib/netlist/analog/nld_opamps.cpp
+++ b/src/lib/netlist/analog/nld_opamps.cpp
@@ -42,7 +42,6 @@ namespace netlist
{
namespace devices
{
-
/*
* Type = 0: Impedance changer
* 1; Idealized opamp
diff --git a/src/lib/netlist/analog/nld_opamps.h b/src/lib/netlist/analog/nld_opamps.h
index 6bef8b0bbdc..60e9a6fbe52 100644
--- a/src/lib/netlist/analog/nld_opamps.h
+++ b/src/lib/netlist/analog/nld_opamps.h
@@ -36,7 +36,6 @@ namespace netlist
{
namespace devices
{
-
NETLIB_OBJECT(OPAMP)
{
NETLIB_CONSTRUCTOR(OPAMP)
@@ -49,7 +48,6 @@ NETLIB_OBJECT(OPAMP)
, m_VL(*this, "VL")
, m_VREF(*this, "VREF")
{
-
m_type = m_model.model_value("TYPE");
if (m_type == 1)
diff --git a/src/lib/netlist/analog/nld_switches.cpp b/src/lib/netlist/analog/nld_switches.cpp
index 46762e72eb1..639d608dbf2 100644
--- a/src/lib/netlist/analog/nld_switches.cpp
+++ b/src/lib/netlist/analog/nld_switches.cpp
@@ -15,7 +15,6 @@ namespace netlist
{
namespace devices
{
-
// ----------------------------------------------------------------------------------------
// SWITCH
// ----------------------------------------------------------------------------------------
diff --git a/src/lib/netlist/analog/nld_switches.h b/src/lib/netlist/analog/nld_switches.h
index 69954cb4a2a..8510b4e1e5f 100644
--- a/src/lib/netlist/analog/nld_switches.h
+++ b/src/lib/netlist/analog/nld_switches.h
@@ -31,7 +31,6 @@ namespace netlist
{
namespace devices
{
-
NETLIB_OBJECT(switch1)
{
NETLIB_CONSTRUCTOR(switch1)
diff --git a/src/lib/netlist/analog/nld_twoterm.cpp b/src/lib/netlist/analog/nld_twoterm.cpp
index 0460d6f2e71..b834180eae8 100644
--- a/src/lib/netlist/analog/nld_twoterm.cpp
+++ b/src/lib/netlist/analog/nld_twoterm.cpp
@@ -14,7 +14,6 @@ namespace netlist
{
namespace devices
{
-
// ----------------------------------------------------------------------------------------
// generic_diode
// ----------------------------------------------------------------------------------------
diff --git a/src/lib/netlist/analog/nld_twoterm.h b/src/lib/netlist/analog/nld_twoterm.h
index 0b9f68b7fdd..279bd0d1bf3 100644
--- a/src/lib/netlist/analog/nld_twoterm.h
+++ b/src/lib/netlist/analog/nld_twoterm.h
@@ -98,7 +98,6 @@ namespace netlist
{
namespace devices
{
-
// -----------------------------------------------------------------------------
// nld_twoterm
// -----------------------------------------------------------------------------
@@ -417,7 +416,6 @@ public:
, m_R(*this, "R", 0.1)
, m_V(*this, "V", 0.0)
{
-
register_subalias("P", m_P);
register_subalias("N", m_N);
}
diff --git a/src/lib/netlist/build/makefile b/src/lib/netlist/build/makefile
index 0a3efaa70f8..7a5e88a5e4c 100644
--- a/src/lib/netlist/build/makefile
+++ b/src/lib/netlist/build/makefile
@@ -19,7 +19,7 @@ LTO = -flto=4 -fuse-linker-plugin -flto-partition=balanced -Wodr
CDEFS = -DPSTANDALONE=1 -DPTR64=1
#-Werror
#CFLAGS = $(LTO) -g -O3 -std=c++98 -Doverride="" -march=native -msse4.2 -Wall -Wpedantic -Wsign-compare -Wextra -Wno-long-long -Wno-unused-parameter -Wno-unused-result -Wno-variadic-macros -I..
-#LDFLAGS = $(LTO) -g -O3 -std=c++98
+#LDFLAGS = $(LTO) -g -O3 -std=c++98
CFLAGS = $(LTO) -g -O3 -std=c++11 -march=native -I.. -Wall -Wpedantic -Wsign-compare -Wextra -Wno-unused-parameter
LDFLAGS = $(LTO) -g -O3 -std=c++11 -lpthread -ldl
@@ -34,15 +34,15 @@ NLOBJ = $(OBJ)
POBJ = $(OBJ)/plib
OBJDIRS = $(OBJ) \
- $(OBJ)/analog \
- $(OBJ)/solver \
- $(OBJ)/devices \
- $(OBJ)/plib \
- $(OBJ)/devices \
- $(OBJ)/macro \
- $(OBJ)/tools \
- $(OBJ)/prg \
-
+ $(OBJ)/analog \
+ $(OBJ)/solver \
+ $(OBJ)/devices \
+ $(OBJ)/plib \
+ $(OBJ)/devices \
+ $(OBJ)/macro \
+ $(OBJ)/tools \
+ $(OBJ)/prg \
+
OBJS = $(POBJS) $(NLOBJS)
@@ -110,7 +110,7 @@ SOURCES = $(patsubst $(OBJ)%, $(SRC)%, $(ALL_OBJS:.o=.cpp))
# all
#-------------------------------------------------
-all: maketree $(TARGETS)
+all: maketree $(TARGETS)
#-------------------------------------------------
# clean
diff --git a/src/lib/netlist/devices/net_lib.cpp b/src/lib/netlist/devices/net_lib.cpp
index 15ae8bfed71..701bcd8dbbc 100644
--- a/src/lib/netlist/devices/net_lib.cpp
+++ b/src/lib/netlist/devices/net_lib.cpp
@@ -71,7 +71,6 @@ namespace netlist
{
namespace devices
{
-
void initialize_factory(factory_list_t &factory)
{
ENTRY(R, RES, "R")
diff --git a/src/lib/netlist/devices/nld_4020.cpp b/src/lib/netlist/devices/nld_4020.cpp
index 3dec9b087b7..3f7dac5e742 100644
--- a/src/lib/netlist/devices/nld_4020.cpp
+++ b/src/lib/netlist/devices/nld_4020.cpp
@@ -10,11 +10,8 @@
namespace netlist
{
-
-
namespace devices
{
-
NETLIB_OBJECT(CD4020_sub)
{
NETLIB_CONSTRUCTOR(CD4020_sub)
diff --git a/src/lib/netlist/devices/nld_4066.cpp b/src/lib/netlist/devices/nld_4066.cpp
index 8aeac121b8c..4fc78357e84 100644
--- a/src/lib/netlist/devices/nld_4066.cpp
+++ b/src/lib/netlist/devices/nld_4066.cpp
@@ -13,7 +13,6 @@ namespace netlist
{
namespace devices
{
-
NETLIB_OBJECT(CD4066_GATE)
{
NETLIB_CONSTRUCTOR(CD4066_GATE)
diff --git a/src/lib/netlist/devices/nld_74107.cpp b/src/lib/netlist/devices/nld_74107.cpp
index 52b59a0816d..2bdd4653b48 100644
--- a/src/lib/netlist/devices/nld_74107.cpp
+++ b/src/lib/netlist/devices/nld_74107.cpp
@@ -11,7 +11,6 @@ namespace netlist
{
namespace devices
{
-
NETLIB_OBJECT(74107Asub)
{
NETLIB_CONSTRUCTOR(74107Asub)
@@ -78,7 +77,6 @@ namespace netlist
, 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_74123.cpp b/src/lib/netlist/devices/nld_74123.cpp
index 29cd3cd97ac..8aa623ffd1e 100644
--- a/src/lib/netlist/devices/nld_74123.cpp
+++ b/src/lib/netlist/devices/nld_74123.cpp
@@ -17,7 +17,6 @@ namespace netlist
{
namespace devices
{
-
NETLIB_OBJECT(74123)
{
NETLIB_CONSTRUCTOR_EX(74123, int dev_type = 74123)
diff --git a/src/lib/netlist/devices/nld_74153.cpp b/src/lib/netlist/devices/nld_74153.cpp
index 913d9d19518..5f9df45dfdb 100644
--- a/src/lib/netlist/devices/nld_74153.cpp
+++ b/src/lib/netlist/devices/nld_74153.cpp
@@ -11,7 +11,6 @@ namespace netlist
{
namespace devices
{
-
/* FIXME: timing is not 100% accurate, Strobe and Select inputs have a
* slightly longer timing.
* Convert this to sub-devices at some time.
@@ -46,7 +45,6 @@ namespace netlist
, m_A(*this, "A")
, m_B(*this, "B")
{
-
register_subalias("C0", m_sub.m_C[0]);
register_subalias("C1", m_sub.m_C[1]);
register_subalias("C2", m_sub.m_C[2]);
@@ -71,7 +69,6 @@ namespace netlist
, m_A(*this, "14") // m_2.m_B
, m_B(*this, "2") // m_2.m_B
{
-
register_subalias("1", m_1.m_G);
register_subalias("3", m_1.m_C[3]);
register_subalias("4", m_1.m_C[2]);
diff --git a/src/lib/netlist/devices/nld_74175.cpp b/src/lib/netlist/devices/nld_74175.cpp
index b9c02009a68..e927c485e20 100644
--- a/src/lib/netlist/devices/nld_74175.cpp
+++ b/src/lib/netlist/devices/nld_74175.cpp
@@ -11,7 +11,6 @@ namespace netlist
{
namespace devices
{
-
NETLIB_OBJECT(74175_sub)
{
NETLIB_CONSTRUCTOR(74175_sub)
diff --git a/src/lib/netlist/devices/nld_74192.cpp b/src/lib/netlist/devices/nld_74192.cpp
index 93af5de836d..d3f657b93ae 100644
--- a/src/lib/netlist/devices/nld_74192.cpp
+++ b/src/lib/netlist/devices/nld_74192.cpp
@@ -13,7 +13,6 @@ namespace netlist
{
namespace devices
{
-
NETLIB_OBJECT(74192_subABCD)
{
NETLIB_CONSTRUCTOR(74192_subABCD)
diff --git a/src/lib/netlist/devices/nld_74193.cpp b/src/lib/netlist/devices/nld_74193.cpp
index 264c348e656..b6f414a3cba 100644
--- a/src/lib/netlist/devices/nld_74193.cpp
+++ b/src/lib/netlist/devices/nld_74193.cpp
@@ -13,7 +13,6 @@ namespace netlist
{
namespace devices
{
-
NETLIB_OBJECT(74193)
{
NETLIB_CONSTRUCTOR(74193)
diff --git a/src/lib/netlist/devices/nld_74279.cpp b/src/lib/netlist/devices/nld_74279.cpp
index 7bcbadff855..48c2e7e095b 100644
--- a/src/lib/netlist/devices/nld_74279.cpp
+++ b/src/lib/netlist/devices/nld_74279.cpp
@@ -12,7 +12,6 @@ namespace netlist
{
namespace devices
{
-
NETLIB_TRUTHTABLE(74279A, 3, 1);
NETLIB_TRUTHTABLE(74279B, 4, 1);
diff --git a/src/lib/netlist/devices/nld_7448.cpp b/src/lib/netlist/devices/nld_7448.cpp
index ea1b46ca5dd..6b29786bf70 100644
--- a/src/lib/netlist/devices/nld_7448.cpp
+++ b/src/lib/netlist/devices/nld_7448.cpp
@@ -12,7 +12,6 @@ namespace netlist
{
namespace devices
{
-
#if (USE_TRUTHTABLE_7448 && USE_TRUTHTABLE)
NETLIB_TRUTHTABLE(7448, 7, 7, 0);
diff --git a/src/lib/netlist/devices/nld_7448.h b/src/lib/netlist/devices/nld_7448.h
index 5f3784d192d..199b46343a8 100644
--- a/src/lib/netlist/devices/nld_7448.h
+++ b/src/lib/netlist/devices/nld_7448.h
@@ -28,11 +28,11 @@
/*
* FIXME: Using truthtable is a lot slower than the explicit device
- * in breakout. Performance drops by 20%. This can be fixed by
- * setting param USE_DEACTIVATE for the device.
+ * in breakout. Performance drops by 20%. This can be fixed by
+ * setting param USE_DEACTIVATE for the device.
*/
-#define USE_TRUTHTABLE_7448 (0)
+#define USE_TRUTHTABLE_7448 (0)
#define TTL_7448(name, cA0, cA1, cA2, cA3, cLTQ, cBIQ, cRBIQ) \
NET_REGISTER_DEV(TTL_7448, name) \
diff --git a/src/lib/netlist/devices/nld_7450.cpp b/src/lib/netlist/devices/nld_7450.cpp
index 67060e7955e..8039014a781 100644
--- a/src/lib/netlist/devices/nld_7450.cpp
+++ b/src/lib/netlist/devices/nld_7450.cpp
@@ -11,7 +11,6 @@ namespace netlist
{
namespace devices
{
-
NETLIB_OBJECT(7450)
{
NETLIB_CONSTRUCTOR(7450)
@@ -39,7 +38,6 @@ namespace netlist
, 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 56f9d1dfcb8..41339ebfa4a 100644
--- a/src/lib/netlist/devices/nld_7474.cpp
+++ b/src/lib/netlist/devices/nld_7474.cpp
@@ -11,7 +11,6 @@ namespace netlist
{
namespace devices
{
-
NETLIB_OBJECT(7474sub)
{
NETLIB_CONSTRUCTOR(7474sub)
@@ -68,7 +67,6 @@ namespace netlist
, 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);
@@ -152,7 +150,7 @@ namespace netlist
NETLIB_RESET(7474_dip)
{
- // m_1.do_reset();
+ // m_1.do_reset();
//m_2.do_reset();
}
diff --git a/src/lib/netlist/devices/nld_7483.cpp b/src/lib/netlist/devices/nld_7483.cpp
index c314be16d33..a3c7a3ca973 100644
--- a/src/lib/netlist/devices/nld_7483.cpp
+++ b/src/lib/netlist/devices/nld_7483.cpp
@@ -11,7 +11,6 @@ namespace netlist
{
namespace devices
{
-
NETLIB_OBJECT(7483)
{
NETLIB_CONSTRUCTOR(7483)
diff --git a/src/lib/netlist/devices/nld_7490.cpp b/src/lib/netlist/devices/nld_7490.cpp
index 22deac2ea9a..f2dd6ff5455 100644
--- a/src/lib/netlist/devices/nld_7490.cpp
+++ b/src/lib/netlist/devices/nld_7490.cpp
@@ -11,7 +11,6 @@ namespace netlist
{
namespace devices
{
-
NETLIB_OBJECT(7490)
{
NETLIB_CONSTRUCTOR(7490)
diff --git a/src/lib/netlist/devices/nld_7493.cpp b/src/lib/netlist/devices/nld_7493.cpp
index 31faa5191dc..46aec6921af 100644
--- a/src/lib/netlist/devices/nld_7493.cpp
+++ b/src/lib/netlist/devices/nld_7493.cpp
@@ -12,8 +12,6 @@ namespace netlist
{
namespace devices
{
-
-
NETLIB_OBJECT(7493ff)
{
NETLIB_CONSTRUCTOR(7493ff)
diff --git a/src/lib/netlist/devices/nld_74ls629.cpp b/src/lib/netlist/devices/nld_74ls629.cpp
index 74d2892031c..41f81f3cfea 100644
--- a/src/lib/netlist/devices/nld_74ls629.cpp
+++ b/src/lib/netlist/devices/nld_74ls629.cpp
@@ -46,7 +46,6 @@ namespace netlist
{
namespace devices
{
-
NETLIB_OBJECT(SN74LS629clk)
{
NETLIB_CONSTRUCTOR(SN74LS629clk)
diff --git a/src/lib/netlist/devices/nld_82S16.cpp b/src/lib/netlist/devices/nld_82S16.cpp
index a5992909b02..2f685e37aba 100644
--- a/src/lib/netlist/devices/nld_82S16.cpp
+++ b/src/lib/netlist/devices/nld_82S16.cpp
@@ -11,7 +11,6 @@ namespace netlist
{
namespace devices
{
-
NETLIB_OBJECT(82S16)
{
NETLIB_CONSTRUCTOR(82S16)
diff --git a/src/lib/netlist/devices/nld_9310.cpp b/src/lib/netlist/devices/nld_9310.cpp
index ba53394ef8d..66d3a6ddaf4 100644
--- a/src/lib/netlist/devices/nld_9310.cpp
+++ b/src/lib/netlist/devices/nld_9310.cpp
@@ -13,7 +13,6 @@ namespace netlist
{
namespace devices
{
-
NETLIB_OBJECT(9310_subABCD)
{
NETLIB_CONSTRUCTOR(9310_subABCD)
diff --git a/src/lib/netlist/devices/nld_9312.cpp b/src/lib/netlist/devices/nld_9312.cpp
index 33b6d8e7a87..af5f35d965c 100644
--- a/src/lib/netlist/devices/nld_9312.cpp
+++ b/src/lib/netlist/devices/nld_9312.cpp
@@ -27,7 +27,6 @@ namespace netlist
{
namespace devices
{
-
#if (USE_TRUTHTABLE)
/* The truthtable implementation is a lot faster than
* the carefully crafted code :-(
diff --git a/src/lib/netlist/devices/nld_9316.cpp b/src/lib/netlist/devices/nld_9316.cpp
index 3033ace81bc..3775cc90902 100644
--- a/src/lib/netlist/devices/nld_9316.cpp
+++ b/src/lib/netlist/devices/nld_9316.cpp
@@ -13,7 +13,6 @@ namespace netlist
{
namespace devices
{
-
NETLIB_OBJECT(9316_subABCD)
{
NETLIB_CONSTRUCTOR(9316_subABCD)
diff --git a/src/lib/netlist/devices/nld_legacy.cpp b/src/lib/netlist/devices/nld_legacy.cpp
index 1f16dbe97b8..e199a2fd371 100644
--- a/src/lib/netlist/devices/nld_legacy.cpp
+++ b/src/lib/netlist/devices/nld_legacy.cpp
@@ -12,7 +12,6 @@ namespace netlist
{
namespace devices
{
-
NETLIB_OBJECT(nicRSFF)
{
NETLIB_CONSTRUCTOR(nicRSFF)
diff --git a/src/lib/netlist/devices/nld_legacy.h b/src/lib/netlist/devices/nld_legacy.h
index 99a99008451..a1e976220fd 100644
--- a/src/lib/netlist/devices/nld_legacy.h
+++ b/src/lib/netlist/devices/nld_legacy.h
@@ -33,7 +33,6 @@ namespace netlist
{
namespace devices
{
-
} //namespace devices
} // namespace netlist
diff --git a/src/lib/netlist/devices/nld_log.cpp b/src/lib/netlist/devices/nld_log.cpp
index 77d3560181b..b483263a00c 100644
--- a/src/lib/netlist/devices/nld_log.cpp
+++ b/src/lib/netlist/devices/nld_log.cpp
@@ -16,13 +16,11 @@ namespace netlist
{
namespace devices
{
-
NETLIB_OBJECT(log)
{
NETLIB_CONSTRUCTOR(log)
, m_I(*this, "I")
{
-
pstring filename = plib::pfmt("{1}.log")(this->name());
m_strm = plib::make_unique<plib::pofilestream>(filename);
}
diff --git a/src/lib/netlist/devices/nld_mm5837.cpp b/src/lib/netlist/devices/nld_mm5837.cpp
index d86fc90b0d7..20239c5e7ea 100644
--- a/src/lib/netlist/devices/nld_mm5837.cpp
+++ b/src/lib/netlist/devices/nld_mm5837.cpp
@@ -16,7 +16,6 @@ namespace netlist
{
namespace devices
{
-
NETLIB_OBJECT(MM5837_dip)
{
NETLIB_CONSTRUCTOR(MM5837_dip)
diff --git a/src/lib/netlist/devices/nld_ne555.cpp b/src/lib/netlist/devices/nld_ne555.cpp
index e2553099cbd..31b5f091fa4 100644
--- a/src/lib/netlist/devices/nld_ne555.cpp
+++ b/src/lib/netlist/devices/nld_ne555.cpp
@@ -16,7 +16,6 @@ namespace netlist
{
namespace devices
{
-
NETLIB_OBJECT(NE555)
{
NETLIB_CONSTRUCTOR(NE555)
@@ -31,7 +30,6 @@ namespace netlist
, m_last_out(*this, "m_last_out", false)
, m_ff(*this, "m_ff", false)
{
-
register_subalias("GND", m_R3.m_N); // Pin 1
register_subalias("CONT", m_R1.m_N); // Pin 5
register_subalias("DISCH", m_RDIS.m_P); // Pin 7
diff --git a/src/lib/netlist/devices/nld_r2r_dac.cpp b/src/lib/netlist/devices/nld_r2r_dac.cpp
index b9ff196f541..f1aee1ba45d 100644
--- a/src/lib/netlist/devices/nld_r2r_dac.cpp
+++ b/src/lib/netlist/devices/nld_r2r_dac.cpp
@@ -12,7 +12,6 @@ namespace netlist
{
namespace devices
{
-
NETLIB_OBJECT_DERIVED(r2r_dac, twoterm)
{
NETLIB_CONSTRUCTOR_DERIVED(r2r_dac, twoterm)
diff --git a/src/lib/netlist/devices/nld_system.cpp b/src/lib/netlist/devices/nld_system.cpp
index d3f554f4912..90364c58a6a 100644
--- a/src/lib/netlist/devices/nld_system.cpp
+++ b/src/lib/netlist/devices/nld_system.cpp
@@ -13,7 +13,6 @@ namespace netlist
{
namespace devices
{
-
// ----------------------------------------------------------------------------------------
// netlistparams
// ----------------------------------------------------------------------------------------
diff --git a/src/lib/netlist/devices/nld_truthtable.cpp b/src/lib/netlist/devices/nld_truthtable.cpp
index 29895ae8b4c..22520b61882 100644
--- a/src/lib/netlist/devices/nld_truthtable.cpp
+++ b/src/lib/netlist/devices/nld_truthtable.cpp
@@ -13,7 +13,6 @@ namespace netlist
{
namespace devices
{
-
template<unsigned m_NI, unsigned m_NO>
class netlist_factory_truthtable_t : public netlist_base_factory_truthtable_t
{
diff --git a/src/lib/netlist/devices/nld_truthtable.h b/src/lib/netlist/devices/nld_truthtable.h
index 157aea166fc..a252dbe3bbe 100644
--- a/src/lib/netlist/devices/nld_truthtable.h
+++ b/src/lib/netlist/devices/nld_truthtable.h
@@ -17,8 +17,8 @@
#include "nl_factory.h"
#include "plib/plists.h"
-#define NETLIB_TRUTHTABLE(cname, nIN, nOUT) \
- class NETLIB_NAME(cname) : public nld_truthtable_t<nIN, nOUT> \
+#define NETLIB_TRUTHTABLE(cname, nIN, nOUT) \
+ class NETLIB_NAME(cname) : public nld_truthtable_t<nIN, nOUT> \
{ \
public: \
template <class C> \
@@ -34,16 +34,15 @@ namespace netlist
{
namespace devices
{
-
template<unsigned bits>
struct need_bytes_for_bits
{
- enum { value =
- bits <= 8 ? 1 :
- bits <= 16 ? 2 :
- bits <= 32 ? 4 :
- 8
- };
+ enum { value =
+ bits <= 8 ? 1 :
+ bits <= 16 ? 2 :
+ bits <= 32 ? 4 :
+ 8
+ };
};
template<unsigned bits> struct uint_for_size;
@@ -361,9 +360,9 @@ namespace netlist
}
/* FIXME: check width */
- state_var_u32 m_ign;
- state_var_s32 m_active;
- truthtable_t * m_ttp;
+ state_var_u32 m_ign;
+ state_var_s32 m_active;
+ truthtable_t * m_ttp;
plib::pstring_vector_t m_desc;
};
diff --git a/src/lib/netlist/devices/nlid_cmos.h b/src/lib/netlist/devices/nlid_cmos.h
index d776f96c3b3..74482c85046 100644
--- a/src/lib/netlist/devices/nlid_cmos.h
+++ b/src/lib/netlist/devices/nlid_cmos.h
@@ -14,7 +14,6 @@ namespace netlist
{
namespace devices
{
-
NETLIB_OBJECT(vdd_vss)
{
NETLIB_CONSTRUCTOR(vdd_vss)
diff --git a/src/lib/netlist/devices/nlid_system.h b/src/lib/netlist/devices/nlid_system.h
index 7f5aeb7cdb9..9adf43c2234 100644
--- a/src/lib/netlist/devices/nlid_system.h
+++ b/src/lib/netlist/devices/nlid_system.h
@@ -22,7 +22,6 @@ namespace netlist
{
namespace devices
{
-
// -----------------------------------------------------------------------------
// netlistparams
// -----------------------------------------------------------------------------
@@ -50,7 +49,6 @@ namespace netlist
, m_Q(*this, "Q")
, m_freq(*this, "FREQ", 7159000.0 * 5)
{
-
m_inc = netlist_time::from_hz(m_freq.Value()*2);
}
@@ -92,7 +90,6 @@ namespace netlist
, m_Q(*this, "Q")
, m_freq(*this, "FREQ", 7159000.0 * 5.0)
{
-
m_inc = netlist_time::from_hz(m_freq.Value()*2);
connect_late(m_feedback, m_Q);
@@ -312,7 +309,6 @@ namespace netlist
, m_func(*this, "FUNC", "")
, m_Q(*this, "Q")
{
-
for (int i=0; i < m_N; i++)
m_I.push_back(plib::make_unique<analog_input_t>(*this, plib::pfmt("A{1}")(i)));
@@ -471,7 +467,7 @@ namespace netlist
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 41065012690..314ba84062c 100644
--- a/src/lib/netlist/macro/nlm_ttl74xx.cpp
+++ b/src/lib/netlist/macro/nlm_ttl74xx.cpp
@@ -79,13 +79,13 @@ 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()
/*
* DM7404: Hex Inverting Gates
- *
+ *
* Y = A
* +---++---+
* | A || Y |
@@ -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 2a29334487e..54b9dfa6e44 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, cA, cB) \
- NET_REGISTER_DEV(TTL_7400_NAND, name) \
- NET_CONNECT(name, A, cA) \
+ NET_REGISTER_DEV(TTL_7400_NAND, name) \
+ NET_CONNECT(name, A, cA) \
NET_CONNECT(name, B, cB)
#define TTL_7400_DIP(name) \
@@ -50,8 +50,8 @@
NET_REGISTER_DEV(TTL_7408_GATE, name)
#define TTL_7408_AND(name, cA, cB) \
- NET_REGISTER_DEV(TTL_7408_AND, name) \
- NET_CONNECT(name, A, cA) \
+ NET_REGISTER_DEV(TTL_7408_AND, name) \
+ NET_CONNECT(name, A, cA) \
NET_CONNECT(name, B, cB)
#define TTL_7408_DIP(name) \
@@ -166,8 +166,8 @@
NET_REGISTER_DEV(TTL_7437_GATE, name)
#define TTL_7437_NAND(name, cA, cB) \
- NET_REGISTER_DEV(TTL_7437_NAND, name) \
- NET_CONNECT(name, A, cA) \
+ NET_REGISTER_DEV(TTL_7437_NAND, name) \
+ NET_CONNECT(name, A, cA) \
NET_CONNECT(name, B, cB)
#define TTL_7437_DIP(name) \
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index 2450ad9e83e..ffabb04e8c7 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -18,7 +18,6 @@
namespace netlist
{
-
#if (NL_USE_MEMPOOL)
static plib::mempool p(65536, 8);
@@ -29,8 +28,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)
@@ -40,8 +39,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
@@ -204,7 +203,6 @@ netlist_t::netlist_t(const pstring &aname)
netlist_t::~netlist_t()
{
-
m_nets.clear();
m_devices.clear();
@@ -268,7 +266,7 @@ void netlist_t::reset()
if (m_mainclock != nullptr)
m_mainclock->m_Q.net().set_time(netlist_time::zero());
//if (m_solver != nullptr)
- // m_solver->do_reset();
+ // m_solver->do_reset();
// Reset all nets once !
for (auto & n : m_nets)
@@ -566,7 +564,7 @@ family_setter_t::family_setter_t(core_device_t &dev, const logic_family_desc_t *
// FIXME: move somewhere central
struct do_nothing_deleter{
- template<typename T> void operator()(T*){}
+ template<typename T> void operator()(T*){}
};
@@ -812,7 +810,7 @@ void core_terminal_t::set_net(net_t *anet)
m_net = anet;
}
- void core_terminal_t::clear_net()
+ void core_terminal_t::clear_net()
{
m_net = nullptr;
}
@@ -952,7 +950,6 @@ nl_double param_model_t::model_value(const pstring &entity)
namespace devices
{
-
// ----------------------------------------------------------------------------------------
// mainclock
// ----------------------------------------------------------------------------------------
@@ -966,4 +963,3 @@ nl_double param_model_t::model_value(const pstring &entity)
} //namespace devices
} // namespace netlist
-
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 79b651f2058..b08ce88eb02 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -173,9 +173,9 @@
using netlist_sig_t = std::uint_least32_t;
- //============================================================
- // MACROS / New Syntax
- //============================================================
+ //============================================================
+ // MACROS / New Syntax
+ //============================================================
#define NETLIB_NAME(chip) nld_ ## chip
@@ -202,14 +202,14 @@ class NETLIB_NAME(name) : public device_t
public: template <class CLASS> NETLIB_NAME(cname)(CLASS &owner, const pstring name, __VA_ARGS__) \
: device_t(owner, name)
-#define NETLIB_DYNAMIC() \
+#define NETLIB_DYNAMIC() \
public: virtual bool is_dynamic() const override { return true; }
-#define NETLIB_TIMESTEP() \
+#define NETLIB_TIMESTEP() \
public: virtual bool is_timestep() const override { return true; } \
public: virtual void step_time(const nl_double step) override
-#define NETLIB_UPDATE_AFTER_PARAM_CHANGE() \
+#define NETLIB_UPDATE_AFTER_PARAM_CHANGE() \
public: virtual bool needs_update_after_param_change() const override { return true; }
#define NETLIB_FAMILY(family) , m_famsetter(*this, family)
@@ -411,10 +411,10 @@ namespace netlist
pstring m_name;
public:
- void * operator new (size_t size, void *ptr) { return ptr; }
- void operator delete (void *ptr, void *) { }
- void * operator new (size_t size);
- void operator delete (void * mem);
+ void * operator new (size_t size, void *ptr) { return ptr; }
+ void operator delete (void *ptr, void *) { }
+ void * operator new (size_t size);
+ void operator delete (void * mem);
};
struct netlist_ref
@@ -662,7 +662,7 @@ namespace netlist
bool is_logic() const;
bool is_analog() const;
- void toggle_new_Q() { m_new_Q ^= 1; }
+ void toggle_new_Q() { m_new_Q ^= 1; }
void push_to_queue(const netlist_time delay) NOEXCEPT;
void reschedule_in_queue(const netlist_time delay) NOEXCEPT;
@@ -693,7 +693,7 @@ namespace netlist
state_var<netlist_time> m_time;
state_var_s32 m_active;
- state_var_u8 m_in_queue; /* 0: not in queue, 1: in queue, 2: last was taken */
+ state_var_u8 m_in_queue; /* 0: not in queue, 1: in queue, 2: last was taken */
private:
plib::linkedlist_t<core_terminal_t> m_list_active;
@@ -714,7 +714,7 @@ namespace netlist
virtual ~logic_net_t() { };
netlist_sig_t Q() const { return m_cur_Q; }
- netlist_sig_t new_Q() const { return m_new_Q; }
+ netlist_sig_t new_Q() const { return m_new_Q; }
void initial(const netlist_sig_t val) { m_cur_Q = m_new_Q = val; }
void set_Q(const netlist_sig_t newQ, const netlist_time delay) NOEXCEPT
@@ -739,7 +739,7 @@ namespace netlist
/* internal state support
* FIXME: get rid of this and implement export/import in MAME
*/
- netlist_sig_t &Q_state_ptr() { return m_cur_Q; }
+ netlist_sig_t &Q_state_ptr() { return m_cur_Q; }
protected:
private:
@@ -1038,7 +1038,7 @@ namespace netlist
// queue_t
// -----------------------------------------------------------------------------
- class queue_t : public timed_queue<net_t *, netlist_time>,
+ class queue_t : public timed_queue<net_t *, netlist_time>,
public object_t,
public netlist_ref,
public plib::state_manager_t::callback_t
@@ -1168,12 +1168,12 @@ namespace netlist
nperfcount_t m_perf_inp_active;
private:
- plib::state_manager_t m_state;
+ plib::state_manager_t m_state;
/* mostly rw */
netlist_time m_time;
queue_t m_queue;
- nperftime_t m_stat_mainloop;
+ nperftime_t m_stat_mainloop;
/* mostly ro */
devices::NETLIB_NAME(mainclock) * m_mainclock;
diff --git a/src/lib/netlist/nl_config.h b/src/lib/netlist/nl_config.h
index 153057dbc22..d7a024d100a 100644
--- a/src/lib/netlist/nl_config.h
+++ b/src/lib/netlist/nl_config.h
@@ -75,18 +75,18 @@
// GENERAL
//============================================================
-#define NL_USE_MEMPOOL (0)
-#define USE_TRUTHTABLE (1)
+#define NL_USE_MEMPOOL (0)
+#define USE_TRUTHTABLE (1)
//============================================================
// Solver defines
//============================================================
-#define USE_MATRIX_GS (0)
-#define USE_GABS (1)
+#define USE_MATRIX_GS (0)
+#define USE_GABS (1)
// savings are eaten up by effort
// FIXME: Convert into solver parameter
-#define USE_LINEAR_PREDICTION (0)
+#define USE_LINEAR_PREDICTION (0)
#define NETLIST_GMIN_DEFAULT (1e-9)
diff --git a/src/lib/netlist/nl_factory.cpp b/src/lib/netlist/nl_factory.cpp
index 43f83b39374..fee6d2272e9 100644
--- a/src/lib/netlist/nl_factory.cpp
+++ b/src/lib/netlist/nl_factory.cpp
@@ -14,7 +14,6 @@
namespace netlist
{
-
// ----------------------------------------------------------------------------------------
// net_device_t_base_factory
// ----------------------------------------------------------------------------------------
diff --git a/src/lib/netlist/nl_factory.h b/src/lib/netlist/nl_factory.h
index f97dad9bf5a..d1dac190f30 100644
--- a/src/lib/netlist/nl_factory.h
+++ b/src/lib/netlist/nl_factory.h
@@ -20,7 +20,6 @@
namespace netlist
{
-
// -----------------------------------------------------------------------------
// net_dev class factory
// -----------------------------------------------------------------------------
diff --git a/src/lib/netlist/nl_lists.h b/src/lib/netlist/nl_lists.h
index 9e6cc335b5b..0f5e2c5669e 100644
--- a/src/lib/netlist/nl_lists.h
+++ b/src/lib/netlist/nl_lists.h
@@ -44,8 +44,8 @@ namespace netlist
clear();
}
- std::size_t capacity() const { return m_list.size(); }
- bool empty() const { return (m_end == &m_list[1]); }
+ std::size_t capacity() const { return m_list.size(); }
+ bool empty() const { return (m_end == &m_list[1]); }
void push(const Time t, Element o) NOEXCEPT
{
@@ -116,9 +116,9 @@ namespace netlist
// save state support & mame disasm
- const entry_t *listptr() const { return &m_list[1]; }
- std::size_t size() const { return m_end - &m_list[1]; }
- const entry_t & operator[](const std::size_t index) const { return m_list[ 1 + index]; }
+ const entry_t *listptr() const { return &m_list[1]; }
+ std::size_t size() const { return m_end - &m_list[1]; }
+ const entry_t & operator[](const std::size_t index) const { return m_list[ 1 + index]; }
private:
diff --git a/src/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h
index 5d3cda4bd39..a4e0c7ade05 100644
--- a/src/lib/netlist/nl_setup.h
+++ b/src/lib/netlist/nl_setup.h
@@ -63,7 +63,6 @@
#define NETLIST_START(name) \
void NETLIST_NAME(name)(netlist::setup_t &setup) \
{
-
#define NETLIST_END() }
#define LOCAL_SOURCE(name) \
@@ -105,13 +104,12 @@ void NETLIST_NAME(name)(netlist::setup_t &setup) \
desc.family = x;
#define TRUTHTABLE_END() \
- netlist::devices::tt_factory_create(setup, desc); \
+ netlist::devices::tt_factory_create(setup, desc); \
}
namespace netlist
{
-
// -----------------------------------------------------------------------------
// truthtable desc
// -----------------------------------------------------------------------------
diff --git a/src/lib/netlist/plib/palloc.cpp b/src/lib/netlist/plib/palloc.cpp
index b6d0f37b7ef..557e285bf6b 100644
--- a/src/lib/netlist/plib/palloc.cpp
+++ b/src/lib/netlist/plib/palloc.cpp
@@ -11,7 +11,6 @@
#include "palloc.h"
namespace plib {
-
//============================================================
// Exceptions
//============================================================
diff --git a/src/lib/netlist/plib/palloc.h b/src/lib/netlist/plib/palloc.h
index 72617aa603b..8b49d4367b1 100644
--- a/src/lib/netlist/plib/palloc.h
+++ b/src/lib/netlist/plib/palloc.h
@@ -17,7 +17,6 @@
#include "pstring.h"
namespace plib {
-
//============================================================
// exception base
//============================================================
@@ -41,7 +40,7 @@ private:
template<typename T, typename... Args>
T *palloc(Args&&... args)
{
- return new T(std::forward<Args>(args)...);
+ return new T(std::forward<Args>(args)...);
}
template<typename T>
@@ -58,7 +57,7 @@ void pfree_array(T *ptr) { delete [] ptr; }
template<typename T, typename... Args>
std::unique_ptr<T> make_unique(Args&&... args) {
- return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
+ return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
}
template<typename BC, typename DC, typename... Args>
diff --git a/src/lib/netlist/plib/pchrono.cpp b/src/lib/netlist/plib/pchrono.cpp
index 3beb3b2f161..a1cc85e6964 100644
--- a/src/lib/netlist/plib/pchrono.cpp
+++ b/src/lib/netlist/plib/pchrono.cpp
@@ -7,8 +7,6 @@
namespace plib {
namespace chrono {
-
-
#if defined(__x86_64__) && !defined(_clang__) && !defined(_MSC_VER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6))
fast_ticks::type fast_ticks::per_second()
diff --git a/src/lib/netlist/plib/pchrono.h b/src/lib/netlist/plib/pchrono.h
index 805842007f2..c715ff1c868 100644
--- a/src/lib/netlist/plib/pchrono.h
+++ b/src/lib/netlist/plib/pchrono.h
@@ -42,8 +42,8 @@ namespace chrono {
"rdtscp;"
"shl $32, %%rdx;"
"or %%rdx, %%rax;"
- : "=a"(v) /* outputs */
- : /* inputs */
+ : "=a"(v) /* outputs */
+ : /* inputs */
: "%rcx", "%rdx" /* clobbers */
);
return v;
@@ -66,8 +66,8 @@ namespace chrono {
"rdtsc;"
"shl $32, %%rdx;"
"or %%rdx, %%rax;"
- : "=a"(v) /* outputs */
- : /* inputs */
+ : "=a"(v) /* outputs */
+ : /* inputs */
: "%rdx" /* clobbers */
);
return v;
diff --git a/src/lib/netlist/plib/pconfig.h b/src/lib/netlist/plib/pconfig.h
index 5c1582cdec8..f2164bbde7f 100644
--- a/src/lib/netlist/plib/pconfig.h
+++ b/src/lib/netlist/plib/pconfig.h
@@ -87,7 +87,6 @@ typedef __int128_t INT128;
#endif
namespace plib {
-
/*
* The following class was derived from the MAME delegate.h code.
* It derives a pointer to a member function.
diff --git a/src/lib/netlist/plib/pdynlib.cpp b/src/lib/netlist/plib/pdynlib.cpp
index 27021c9d364..6aa1f180aa3 100644
--- a/src/lib/netlist/plib/pdynlib.cpp
+++ b/src/lib/netlist/plib/pdynlib.cpp
@@ -13,7 +13,6 @@
#endif
namespace plib {
-
dynlib::dynlib(const pstring libname)
: m_isLoaded(false), m_lib(nullptr)
{
@@ -43,7 +42,7 @@ dynlib::dynlib(const pstring libname)
dynlib::dynlib(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/plib/pdynlib.h b/src/lib/netlist/plib/pdynlib.h
index 097f5b069ae..e91b86e3a82 100644
--- a/src/lib/netlist/plib/pdynlib.h
+++ b/src/lib/netlist/plib/pdynlib.h
@@ -14,7 +14,6 @@
#include "pstring.h"
namespace plib {
-
// ----------------------------------------------------------------------------------------
// pdynlib: dynamic loading of libraries ...
// ----------------------------------------------------------------------------------------
diff --git a/src/lib/netlist/plib/pfmtlog.cpp b/src/lib/netlist/plib/pfmtlog.cpp
index b10ab7f6a2b..e29753c7a81 100644
--- a/src/lib/netlist/plib/pfmtlog.cpp
+++ b/src/lib/netlist/plib/pfmtlog.cpp
@@ -17,7 +17,6 @@
#include "palloc.h"
namespace plib {
-
pfmt::pfmt(const pstring &fmt)
: m_str(m_str_buf), m_allocated(0), m_arg(0)
{
@@ -141,4 +140,3 @@ void pfmt::format_element(const char *f, const char *l, const char *fmt_spec, .
}
}
-
diff --git a/src/lib/netlist/plib/pfmtlog.h b/src/lib/netlist/plib/pfmtlog.h
index 7d8677b5725..79fa94da2aa 100644
--- a/src/lib/netlist/plib/pfmtlog.h
+++ b/src/lib/netlist/plib/pfmtlog.h
@@ -15,7 +15,6 @@
#include "ptypes.h"
namespace plib {
-
template <typename T>
struct ptype_treats
{
diff --git a/src/lib/netlist/plib/plists.h b/src/lib/netlist/plib/plists.h
index 97d55120806..16cb2f9e686 100644
--- a/src/lib/netlist/plib/plists.h
+++ b/src/lib/netlist/plib/plists.h
@@ -19,14 +19,13 @@
#include "pstring.h"
namespace plib {
-
/* ----------------------------------------------------------------------------------------
* uninitialised_array_t:
- * fixed size array allowing to override constructor and initialize
- * members by placement new.
+ * fixed size array allowing to override constructor and initialize
+ * members by placement new.
*
- * Use with care. This template is provided to improve locality of storage
- * in high frequency applications. It should not be used for anything else.
+ * Use with care. This template is provided to improve locality of storage
+ * in high frequency applications. It should not be used for anything else.
* ---------------------------------------------------------------------------------------- */
template <class C, std::size_t N>
diff --git a/src/lib/netlist/plib/poptions.cpp b/src/lib/netlist/plib/poptions.cpp
index 8b2db8cf19e..e01169f5264 100644
--- a/src/lib/netlist/plib/poptions.cpp
+++ b/src/lib/netlist/plib/poptions.cpp
@@ -8,7 +8,6 @@
#include "poptions.h"
namespace plib {
-
/***************************************************************************
Options
***************************************************************************/
@@ -59,7 +58,6 @@ namespace plib {
options::options()
{
-
}
options::options(option *o[])
diff --git a/src/lib/netlist/plib/poptions.h b/src/lib/netlist/plib/poptions.h
index 13e11971709..f9ac17832d3 100644
--- a/src/lib/netlist/plib/poptions.h
+++ b/src/lib/netlist/plib/poptions.h
@@ -17,7 +17,6 @@
#include "putil.h"
namespace plib {
-
/***************************************************************************
Options
***************************************************************************/
diff --git a/src/lib/netlist/plib/pparser.h b/src/lib/netlist/plib/pparser.h
index a1a0c138f51..acddc755434 100644
--- a/src/lib/netlist/plib/pparser.h
+++ b/src/lib/netlist/plib/pparser.h
@@ -18,7 +18,6 @@
#include "pstream.h"
namespace plib {
-
class ptokenizer
{
P_PREVENT_COPYING(ptokenizer)
diff --git a/src/lib/netlist/plib/pstate.cpp b/src/lib/netlist/plib/pstate.cpp
index ee44eede27a..753671ceeda 100644
--- a/src/lib/netlist/plib/pstate.cpp
+++ b/src/lib/netlist/plib/pstate.cpp
@@ -8,7 +8,6 @@
#include "pstate.h"
namespace plib {
-
state_manager_t::state_manager_t()
{
}
diff --git a/src/lib/netlist/plib/pstate.h b/src/lib/netlist/plib/pstate.h
index 23aef80f176..6fc423cac17 100644
--- a/src/lib/netlist/plib/pstate.h
+++ b/src/lib/netlist/plib/pstate.h
@@ -20,7 +20,6 @@
// ----------------------------------------------------------------------------------------
namespace plib {
-
class state_manager_t
{
public:
@@ -84,12 +83,12 @@ public:
~entry_t() { }
- pstring m_name;
- const datatype_t m_dt;
- const void * m_owner;
- callback_t * m_callback;
- const std::size_t m_count;
- void * m_ptr;
+ pstring m_name;
+ const datatype_t m_dt;
+ const void * m_owner;
+ callback_t * m_callback;
+ const std::size_t m_count;
+ void * m_ptr;
template<typename T>
T *resolved()
diff --git a/src/lib/netlist/plib/pstream.cpp b/src/lib/netlist/plib/pstream.cpp
index 431ae4c7cce..40152408b0c 100644
--- a/src/lib/netlist/plib/pstream.cpp
+++ b/src/lib/netlist/plib/pstream.cpp
@@ -14,7 +14,6 @@
#include "palloc.h"
namespace plib {
-
// -----------------------------------------------------------------------------
// pistream: input stream
// -----------------------------------------------------------------------------
diff --git a/src/lib/netlist/plib/pstream.h b/src/lib/netlist/plib/pstream.h
index a7f81723262..59406eab025 100644
--- a/src/lib/netlist/plib/pstream.h
+++ b/src/lib/netlist/plib/pstream.h
@@ -17,7 +17,6 @@
#include "pfmtlog.h"
namespace plib {
-
// -----------------------------------------------------------------------------
// pstream: things common to all streams
// -----------------------------------------------------------------------------
diff --git a/src/lib/netlist/plib/pstring.h b/src/lib/netlist/plib/pstring.h
index 2356acec3d0..ba5527d184e 100644
--- a/src/lib/netlist/plib/pstring.h
+++ b/src/lib/netlist/plib/pstring.h
@@ -380,19 +380,19 @@ private:
// custom specialization of std::hash can be injected in namespace std
namespace std
{
- template<> struct hash<pstring>
- {
- typedef pstring argument_type;
- typedef std::size_t result_type;
- result_type operator()(argument_type const& s) const
- {
- const pstring::mem_t *string = s.cstr();
- result_type result = 5381;
- for (pstring::mem_t c = *string; c != 0; c = *string++)
- result = ((result << 5) + result ) ^ (result >> (32 - 5)) ^ c;
- return result;
- }
- };
+ template<> struct hash<pstring>
+ {
+ typedef pstring argument_type;
+ typedef std::size_t result_type;
+ result_type operator()(argument_type const& s) const
+ {
+ const pstring::mem_t *string = s.cstr();
+ result_type result = 5381;
+ for (pstring::mem_t c = *string; c != 0; c = *string++)
+ result = ((result << 5) + result ) ^ (result >> (32 - 5)) ^ c;
+ return result;
+ }
+ };
}
#endif /* PSTRING_H_ */
diff --git a/src/lib/netlist/plib/ptypes.h b/src/lib/netlist/plib/ptypes.h
index 4abfad4fb83..c9b4379e590 100644
--- a/src/lib/netlist/plib/ptypes.h
+++ b/src/lib/netlist/plib/ptypes.h
@@ -15,7 +15,6 @@
namespace plib
{
-
template<typename T> struct is_integral : public std::is_integral<T> { };
template<typename T> struct numeric_limits : public std::numeric_limits<T> { };
diff --git a/src/lib/netlist/plib/putil.cpp b/src/lib/netlist/plib/putil.cpp
index 79cea5bcf88..e8951d05aa9 100644
--- a/src/lib/netlist/plib/putil.cpp
+++ b/src/lib/netlist/plib/putil.cpp
@@ -156,6 +156,3 @@ namespace plib
return pstring(buf);
}
} // namespace plib
-
-
-
diff --git a/src/lib/netlist/plib/putil.h b/src/lib/netlist/plib/putil.h
index 5f9d1fa4047..39d10bcadb5 100644
--- a/src/lib/netlist/plib/putil.h
+++ b/src/lib/netlist/plib/putil.h
@@ -49,11 +49,11 @@ namespace plib
template <class C>
struct indexed_compare
{
- indexed_compare(const C& target): m_target(target) {}
+ indexed_compare(const C& target): m_target(target) {}
- bool operator()(int a, int b) const { return m_target[a] < m_target[b]; }
+ bool operator()(int a, int b) const { return m_target[a] < m_target[b]; }
- const C& m_target;
+ const C& m_target;
};
// ----------------------------------------------------------------------------------------
diff --git a/src/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp
index 0f7b7ffb565..1163788b80f 100644
--- a/src/lib/netlist/prg/nltool.cpp
+++ b/src/lib/netlist/prg/nltool.cpp
@@ -26,17 +26,17 @@ class tool_options_t : public plib::options
public:
tool_options_t() :
plib::options(),
- opt_ttr (*this, "t", "time_to_run", 1.0, "time to run the emulation (seconds)"),
- opt_name(*this, "n", "name", "", "netlist in file to run; default is first one"),
- opt_logs(*this, "l", "logs", "", "colon separated list of terminals to log"),
- opt_file(*this, "f", "file", "-", "file to process (default is stdin)"),
- opt_type(*this, "y", "type", "spice", "spice:eagle", "type of file to be converted: spice,eagle"),
- opt_cmd (*this, "c", "cmd", "run", "run:convert:listdevices:static", "run|convert|listdevices|static"),
- opt_inp(*this, "i", "input", "", "input file to process (default is none)"),
- opt_verb(*this, "v", "verbose", "be verbose - this produces lots of output"),
- opt_quiet(*this, "q", "quiet", "be quiet - no warnings"),
- opt_version(*this, "", "version", "display version and exit"),
- opt_help(*this, "h", "help", "display help and exit")
+ opt_ttr (*this, "t", "time_to_run", 1.0, "time to run the emulation (seconds)"),
+ opt_name(*this, "n", "name", "", "netlist in file to run; default is first one"),
+ opt_logs(*this, "l", "logs", "", "colon separated list of terminals to log"),
+ opt_file(*this, "f", "file", "-", "file to process (default is stdin)"),
+ opt_type(*this, "y", "type", "spice", "spice:eagle", "type of file to be converted: spice,eagle"),
+ opt_cmd (*this, "c", "cmd", "run", "run:convert:listdevices:static", "run|convert|listdevices|static"),
+ opt_inp(*this, "i", "input", "", "input file to process (default is none)"),
+ opt_verb(*this, "v", "verbose", "be verbose - this produces lots of output"),
+ opt_quiet(*this, "q", "quiet", "be quiet - no warnings"),
+ opt_version(*this, "", "version", "display version and exit"),
+ opt_help(*this, "h", "help", "display help and exit")
{}
plib::option_double opt_ttr;
diff --git a/src/lib/netlist/prg/nlwav.cpp b/src/lib/netlist/prg/nlwav.cpp
index 0f560cbe62d..1623bbe91dc 100644
--- a/src/lib/netlist/prg/nlwav.cpp
+++ b/src/lib/netlist/prg/nlwav.cpp
@@ -13,13 +13,13 @@ class nlwav_options_t : public plib::options
public:
nlwav_options_t() :
plib::options(),
- opt_inp(*this, "i", "input", "", "input file"),
- opt_out(*this, "o", "output", "", "output file"),
- opt_amp(*this, "a", "amp", 10000.0, "amplification after mean correction"),
- opt_verb(*this, "v", "verbose", "be verbose - this produces lots of output"),
+ opt_inp(*this, "i", "input", "", "input file"),
+ opt_out(*this, "o", "output", "", "output file"),
+ opt_amp(*this, "a", "amp", 10000.0, "amplification after mean correction"),
+ opt_verb(*this, "v", "verbose", "be verbose - this produces lots of output"),
opt_quiet(*this,"q", "quiet", "be quiet - no warnings"),
- opt_version(*this, "", "version", "display version and exit"),
- opt_help(*this, "h", "help", "display help and exit")
+ opt_version(*this, "", "version", "display version and exit"),
+ opt_help(*this, "h", "help", "display help and exit")
{}
plib::option_str opt_inp;
plib::option_str opt_out;
diff --git a/src/lib/netlist/solver/nld_matrix_solver.h b/src/lib/netlist/solver/nld_matrix_solver.h
index de5e999e340..f58adf44103 100644
--- a/src/lib/netlist/solver/nld_matrix_solver.h
+++ b/src/lib/netlist/solver/nld_matrix_solver.h
@@ -18,7 +18,6 @@ namespace netlist
{
namespace devices
{
-
/* FIXME: these should become proper devices */
struct solver_parameters_t
diff --git a/src/lib/netlist/solver/nld_ms_direct.h b/src/lib/netlist/solver/nld_ms_direct.h
index ec67a7c02ee..db695058abb 100644
--- a/src/lib/netlist/solver/nld_ms_direct.h
+++ b/src/lib/netlist/solver/nld_ms_direct.h
@@ -30,7 +30,6 @@ namespace netlist
{
namespace devices
{
-
//#define nl_ext_double _float128 // slow, very slow
//#define nl_ext_double long double // slightly slower
#define nl_ext_double nl_double
diff --git a/src/lib/netlist/solver/nld_ms_direct1.h b/src/lib/netlist/solver/nld_ms_direct1.h
index 4d8ae1fb677..944e4bbcab2 100644
--- a/src/lib/netlist/solver/nld_ms_direct1.h
+++ b/src/lib/netlist/solver/nld_ms_direct1.h
@@ -15,7 +15,6 @@ namespace netlist
{
namespace devices
{
-
class matrix_solver_direct1_t: public matrix_solver_direct_t<1,1>
{
public:
diff --git a/src/lib/netlist/solver/nld_ms_direct2.h b/src/lib/netlist/solver/nld_ms_direct2.h
index 4094f84c8a2..3661d96b9fe 100644
--- a/src/lib/netlist/solver/nld_ms_direct2.h
+++ b/src/lib/netlist/solver/nld_ms_direct2.h
@@ -15,7 +15,6 @@ namespace netlist
{
namespace devices
{
-
class matrix_solver_direct2_t: public matrix_solver_direct_t<2,2>
{
public:
diff --git a/src/lib/netlist/solver/nld_ms_direct_lu.h b/src/lib/netlist/solver/nld_ms_direct_lu.h
index 9c2ab0d1cd0..7b99dc17e8b 100644
--- a/src/lib/netlist/solver/nld_ms_direct_lu.h
+++ b/src/lib/netlist/solver/nld_ms_direct_lu.h
@@ -19,7 +19,6 @@ namespace netlist
{
namespace devices
{
-
//#define nl_ext_double _float128 // slow, very slow
//#define nl_ext_double long double // slightly slower
#define nl_ext_double double
diff --git a/src/lib/netlist/solver/nld_ms_gcr.h b/src/lib/netlist/solver/nld_ms_gcr.h
index a9acfb0b0de..014a7b6efec 100644
--- a/src/lib/netlist/solver/nld_ms_gcr.h
+++ b/src/lib/netlist/solver/nld_ms_gcr.h
@@ -27,7 +27,6 @@ namespace netlist
{
namespace devices
{
-
template <unsigned m_N, unsigned storage_N>
class matrix_solver_GCR_t: public matrix_solver_t
{
diff --git a/src/lib/netlist/solver/nld_ms_gmres.h b/src/lib/netlist/solver/nld_ms_gmres.h
index 040453d99da..da0c239dd47 100644
--- a/src/lib/netlist/solver/nld_ms_gmres.h
+++ b/src/lib/netlist/solver/nld_ms_gmres.h
@@ -23,7 +23,6 @@ namespace netlist
{
namespace devices
{
-
template <unsigned m_N, unsigned storage_N>
class matrix_solver_GMRES_t: public matrix_solver_direct_t<m_N, storage_N>
{
diff --git a/src/lib/netlist/solver/nld_ms_sm.h b/src/lib/netlist/solver/nld_ms_sm.h
index fe8414ec57d..9fa71810be7 100644
--- a/src/lib/netlist/solver/nld_ms_sm.h
+++ b/src/lib/netlist/solver/nld_ms_sm.h
@@ -43,7 +43,6 @@ namespace netlist
{
namespace devices
{
-
//#define nl_ext_double _float128 // slow, very slow
//#define nl_ext_double long double // slightly slower
#define nl_ext_double nl_double
diff --git a/src/lib/netlist/solver/nld_ms_sor.h b/src/lib/netlist/solver/nld_ms_sor.h
index cf8dc8de5bf..b7012f5532d 100644
--- a/src/lib/netlist/solver/nld_ms_sor.h
+++ b/src/lib/netlist/solver/nld_ms_sor.h
@@ -21,7 +21,6 @@ namespace netlist
{
namespace devices
{
-
template <unsigned m_N, unsigned storage_N>
class matrix_solver_SOR_t: public matrix_solver_direct_t<m_N, storage_N>
{
diff --git a/src/lib/netlist/solver/nld_ms_sor_mat.h b/src/lib/netlist/solver/nld_ms_sor_mat.h
index 781e6bb4eaa..f53727cfe9b 100644
--- a/src/lib/netlist/solver/nld_ms_sor_mat.h
+++ b/src/lib/netlist/solver/nld_ms_sor_mat.h
@@ -22,7 +22,6 @@ namespace netlist
{
namespace devices
{
-
template <unsigned m_N, unsigned storage_N>
class matrix_solver_SOR_mat_t: public matrix_solver_direct_t<m_N, storage_N>
{
diff --git a/src/lib/netlist/solver/nld_ms_w.h b/src/lib/netlist/solver/nld_ms_w.h
index 294b2c4ccf4..f59086c0c83 100644
--- a/src/lib/netlist/solver/nld_ms_w.h
+++ b/src/lib/netlist/solver/nld_ms_w.h
@@ -50,7 +50,6 @@ namespace netlist
{
namespace devices
{
-
//#define nl_ext_double _float128 // slow, very slow
//#define nl_ext_double long double // slightly slower
#define nl_ext_double nl_double
diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp
index 3f4b39b77cb..16ae8dab691 100644
--- a/src/lib/netlist/solver/nld_solver.cpp
+++ b/src/lib/netlist/solver/nld_solver.cpp
@@ -59,7 +59,6 @@ namespace netlist
{
namespace devices
{
-
void terms_t::add(terminal_t *term, int net_other, bool sorted)
{
if (sorted)
diff --git a/src/lib/netlist/solver/nld_solver.h b/src/lib/netlist/solver/nld_solver.h
index a02a6e69311..d683e627d3f 100644
--- a/src/lib/netlist/solver/nld_solver.h
+++ b/src/lib/netlist/solver/nld_solver.h
@@ -32,7 +32,6 @@ namespace netlist
{
namespace devices
{
-
class NETLIB_NAME(solver);
diff --git a/src/mame/machine/nl_breakout.cpp b/src/mame/machine/nl_breakout.cpp
index 5920e8cf1a2..189646385af 100644
--- a/src/mame/machine/nl_breakout.cpp
+++ b/src/mame/machine/nl_breakout.cpp
@@ -284,7 +284,7 @@ CIRCUIT_LAYOUT( breakout )
CHIP("J3", 7402)
CHIP("J4", 9312)
CHIP("J5", 7448)
-#if USE_TRUTHTABLE_7448
+#if USE_TRUTHTABLE_7448
PARAM(J5.USE_DEACTIVATE, 0) // only use this if compiled with 7448 as a truthtable
#endif
CHIP("J6", 9310)