From 14f58987ee3ea43227b315ef11664c943555c4b0 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Wed, 8 Jun 2016 19:03:05 +0200
Subject: [PATCH 01/39] More c++. (nw)

---
 src/devices/machine/netlist.cpp       |  4 ++--
 src/lib/netlist/devices/nlid_system.h |  2 +-
 src/lib/netlist/nl_base.h             |  2 +-
 src/lib/netlist/nl_factory.h          |  2 +-
 src/lib/netlist/nl_setup.cpp          | 25 +++++++++++++------------
 src/lib/netlist/nl_setup.h            | 10 +++++-----
 src/lib/netlist/plib/plists.h         |  2 --
 src/lib/netlist/plib/poptions.h       |  2 +-
 src/lib/netlist/plib/pparser.cpp      |  6 +++---
 src/lib/netlist/plib/pparser.h        |  2 +-
 src/lib/netlist/plib/pstate.cpp       |  7 +++----
 src/lib/netlist/plib/pstate.h         |  4 ++--
 src/lib/netlist/plib/putil.h          | 19 +++++++++++++++++++
 src/lib/netlist/prg/nltool.cpp        |  8 ++++----
 14 files changed, 56 insertions(+), 39 deletions(-)

diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp
index bd65d0b2eef..637a1225891 100644
--- a/src/devices/machine/netlist.cpp
+++ b/src/devices/machine/netlist.cpp
@@ -566,7 +566,7 @@ void netlist_mame_sound_device_t::device_start()
 
 	// Configure outputs
 
-	plib::pvector_t<nld_sound_out *> outdevs = netlist().get_device_list<nld_sound_out>();
+	std::vector<nld_sound_out *> outdevs = netlist().get_device_list<nld_sound_out>();
 	if (outdevs.size() == 0)
 		fatalerror("No output devices");
 
@@ -592,7 +592,7 @@ void netlist_mame_sound_device_t::device_start()
 	m_num_inputs = 0;
 	m_in = nullptr;
 
-	plib::pvector_t<nld_sound_in *> indevs = netlist().get_device_list<nld_sound_in>();
+	std::vector<nld_sound_in *> indevs = netlist().get_device_list<nld_sound_in>();
 	if (indevs.size() > 1)
 		fatalerror("A maximum of one input device is allowed!");
 	if (indevs.size() == 1)
diff --git a/src/lib/netlist/devices/nlid_system.h b/src/lib/netlist/devices/nlid_system.h
index 8547fcfe22f..b28d7ff342f 100644
--- a/src/lib/netlist/devices/nlid_system.h
+++ b/src/lib/netlist/devices/nlid_system.h
@@ -377,7 +377,7 @@ namespace netlist
 		analog_output_t m_Q;
 		plib::uninitialised_array_t<analog_input_t, 10> m_I;
 
-		plib::pvector_t<rpn_inst> m_precompiled;
+		std::vector<rpn_inst> m_precompiled;
 	};
 
 	// -----------------------------------------------------------------------------
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 7828c2f3f61..5dd6a8095f4 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -408,7 +408,7 @@ namespace netlist
 		P_PREVENT_COPYING(core_terminal_t)
 	public:
 
-		using list_t = plib::pvector_t<core_terminal_t *>;
+		using list_t = std::vector<core_terminal_t *>;
 
 		/* needed here ... */
 
diff --git a/src/lib/netlist/nl_factory.h b/src/lib/netlist/nl_factory.h
index 780408cd285..b85e85bf6b8 100644
--- a/src/lib/netlist/nl_factory.h
+++ b/src/lib/netlist/nl_factory.h
@@ -65,7 +65,7 @@ namespace netlist
 		}
 	};
 
-	class factory_list_t : public plib::pvector_t<plib::owned_ptr<base_factory_t>>
+	class factory_list_t : public std::vector<plib::owned_ptr<base_factory_t>>
 	{
 	public:
 		factory_list_t(setup_t &m_setup);
diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp
index b311e4b1a68..e4c4949b2a9 100644
--- a/src/lib/netlist/nl_setup.cpp
+++ b/src/lib/netlist/nl_setup.cpp
@@ -110,7 +110,7 @@ void setup_t::register_dev(plib::owned_ptr<device_t> dev)
 
 void setup_t::register_lib_entry(const pstring &name)
 {
-	if (m_lib.contains(name))
+	if (plib::container::contains(m_lib, name))
 		log().warning("Lib entry collection already contains {1}. IGNORED", name);
 	else
 		m_lib.push_back(name);
@@ -118,7 +118,7 @@ void setup_t::register_lib_entry(const pstring &name)
 
 void setup_t::register_dev(const pstring &classname, const pstring &name)
 {
-	if (m_lib.contains(classname))
+	if (plib::container::contains(m_lib, classname))
 	{
 		namespace_push(name);
 		include(classname);
@@ -291,15 +291,16 @@ void setup_t::remove_connections(const pstring pin)
 	pstring pinfn = build_fqn(pin);
 	bool found = false;
 
-	for (int i = m_links.size() - 1; i >= 0; i--)
+	for (auto link = m_links.begin(); link != m_links.end(); )
 	{
-		auto &link = m_links[i];
-		if ((link.first == pinfn) || (link.second == pinfn))
+		if ((link->first == pinfn) || (link->second == pinfn))
 		{
-			log().verbose("removing connection: {1} <==> {2}\n", link.first, link.second);
-			m_links.remove_at(i);
+			log().verbose("removing connection: {1} <==> {2}\n", link->first, link->second);
+			link = m_links.erase(link);
 			found = true;
 		}
+		else
+			link++;
 	}
 	if (!found)
 		log().fatal("remove_connections: found no occurrence of {1}\n", pin);
@@ -706,16 +707,16 @@ void setup_t::resolve_inputs()
 	int tries = 100;
 	while (m_links.size() > 0 && tries >  0) // FIXME: convert into constant
 	{
-		unsigned li = 0;
-		while (li < m_links.size())
+		auto li = m_links.begin();
+		while (li != m_links.end())
 		{
-			const pstring t1s = m_links[li].first;
-			const pstring t2s = m_links[li].second;
+			const pstring t1s = li->first;
+			const pstring t2s = li->second;
 			core_terminal_t *t1 = find_terminal(t1s);
 			core_terminal_t *t2 = find_terminal(t2s);
 
 			if (connect(*t1, *t2))
-				m_links.remove_at(li);
+				li = m_links.erase(li);
 			else
 				li++;
 		}
diff --git a/src/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h
index ebf989cb20f..90ef1fe422c 100644
--- a/src/lib/netlist/nl_setup.h
+++ b/src/lib/netlist/nl_setup.h
@@ -91,7 +91,7 @@ namespace netlist
 		class source_t
 		{
 		public:
-			using list_t = plib::pvector_t<std::shared_ptr<source_t>>;
+			using list_t = std::vector<std::shared_ptr<source_t>>;
 
 			source_t()
 			{}
@@ -167,7 +167,7 @@ namespace netlist
 		factory_list_t &factory() { return m_factory; }
 		const factory_list_t &factory() const { return m_factory; }
 
-		bool is_library_item(const pstring &name) const { return m_lib.contains(name); }
+		bool is_library_item(const pstring &name) const { return plib::container::contains(m_lib, name); }
 
 		/* model / family related */
 
@@ -180,7 +180,7 @@ namespace netlist
 		plib::plog_base<NL_DEBUG> &log() { return netlist().log(); }
 		const plib::plog_base<NL_DEBUG> &log() const { return netlist().log(); }
 
-		plib::pvector_t<std::pair<pstring, base_factory_t *>> m_device_factory;
+		std::vector<std::pair<pstring, base_factory_t *>> m_device_factory;
 
 	protected:
 
@@ -208,7 +208,7 @@ namespace netlist
 		plib::hashmap_t<pstring, pstring> m_param_values;
 		plib::hashmap_t<pstring, core_terminal_t *> m_terminals;
 
-		plib::pvector_t<link_t> m_links;
+		std::vector<link_t> m_links;
 
 		factory_list_t m_factory;
 
@@ -219,7 +219,7 @@ namespace netlist
 
 		std::stack<pstring> m_namespace_stack;
 		source_t::list_t m_sources;
-		plib::pvector_t<pstring> m_lib;
+		std::vector<pstring> m_lib;
 
 	};
 
diff --git a/src/lib/netlist/plib/plists.h b/src/lib/netlist/plib/plists.h
index 66b48e3ab94..ab4b06ce74d 100644
--- a/src/lib/netlist/plib/plists.h
+++ b/src/lib/netlist/plib/plists.h
@@ -14,8 +14,6 @@
 #include <vector>
 #include <type_traits>
 #include <cmath>
-//#include <cstring>
-//#include <array>
 
 #include "palloc.h"
 #include "pstring.h"
diff --git a/src/lib/netlist/plib/poptions.h b/src/lib/netlist/plib/poptions.h
index 8a66000053c..d153d08e604 100644
--- a/src/lib/netlist/plib/poptions.h
+++ b/src/lib/netlist/plib/poptions.h
@@ -224,7 +224,7 @@ private:
 		return nullptr;
 	}
 
-	pvector_t<option *> m_opts;
+	std::vector<option *> m_opts;
 	pstring m_app;
 };
 
diff --git a/src/lib/netlist/plib/pparser.cpp b/src/lib/netlist/plib/pparser.cpp
index 359e4415d72..72a7ee36cf9 100644
--- a/src/lib/netlist/plib/pparser.cpp
+++ b/src/lib/netlist/plib/pparser.cpp
@@ -197,7 +197,7 @@ ptokenizer::token_t ptokenizer::get_token_internal()
 			c = getc();
 		}
 		ungetc();
-		token_id_t id = token_id_t(m_tokens.indexof(tokstr));
+		token_id_t id(plib::container::indexof(m_tokens, tokstr));
 		if (id.id() >= 0)
 			return token_t(id, tokstr);
 		else
@@ -225,14 +225,14 @@ ptokenizer::token_t ptokenizer::get_token_internal()
 			/* expensive, check for single char tokens */
 			if (tokstr.len() == 1)
 			{
-				token_id_t id = token_id_t(m_tokens.indexof(tokstr));
+				token_id_t id(plib::container::indexof(m_tokens, tokstr));
 				if (id.id() >= 0)
 					return token_t(id, tokstr);
 			}
 			c = getc();
 		}
 		ungetc();
-		token_id_t id = token_id_t(m_tokens.indexof(tokstr));
+		token_id_t id(plib::container::indexof(m_tokens, tokstr));
 		if (id.id() >= 0)
 			return token_t(id, tokstr);
 		else
diff --git a/src/lib/netlist/plib/pparser.h b/src/lib/netlist/plib/pparser.h
index 610f524b5e3..aabf327dfb5 100644
--- a/src/lib/netlist/plib/pparser.h
+++ b/src/lib/netlist/plib/pparser.h
@@ -139,7 +139,7 @@ private:
 	pstring m_identifier_chars;
 	pstring m_number_chars;
 	pstring m_number_chars_start;
-	pvector_t<pstring> m_tokens;
+	std::vector<pstring> m_tokens;
 	pstring m_whitespace;
 	pstring::code_t  m_string;
 
diff --git a/src/lib/netlist/plib/pstate.cpp b/src/lib/netlist/plib/pstate.cpp
index c8c4c5725c6..9fe995ec1f5 100644
--- a/src/lib/netlist/plib/pstate.cpp
+++ b/src/lib/netlist/plib/pstate.cpp
@@ -44,11 +44,10 @@ void pstate_manager_t::save_state_ptr(const void *owner, const pstring &stname,
 
 void pstate_manager_t::remove_save_items(const void *owner)
 {
-	unsigned i = 0;
-	while (i < m_save.size())
+	for (auto i = m_save.begin(); i != m_save.end(); )
 	{
-		if (m_save[i]->m_owner == owner)
-			m_save.remove_at(i);
+		if (i->get()->m_owner == owner)
+			i = m_save.erase(i);
 		else
 			i++;
 	}
diff --git a/src/lib/netlist/plib/pstate.h b/src/lib/netlist/plib/pstate.h
index 12115678b3a..4bc92aab3eb 100644
--- a/src/lib/netlist/plib/pstate.h
+++ b/src/lib/netlist/plib/pstate.h
@@ -75,7 +75,7 @@ class pstate_manager_t;
 class pstate_callback_t
 {
 public:
-	using list_t = pvector_t<pstate_callback_t *>;
+	using list_t = std::vector<pstate_callback_t *>;
 
 	virtual ~pstate_callback_t() { };
 
@@ -87,7 +87,7 @@ protected:
 
 struct pstate_entry_t
 {
-	using list_t = pvector_t<std::unique_ptr<pstate_entry_t>>;
+	using list_t = std::vector<std::unique_ptr<pstate_entry_t>>;
 
 	pstate_entry_t(const pstring &stname, const pstate_data_type_e dt, const void *owner,
 			const int size, const int count, void *ptr, bool is_ptr)
diff --git a/src/lib/netlist/plib/putil.h b/src/lib/netlist/plib/putil.h
index db5510178c0..9d1a644b8ca 100644
--- a/src/lib/netlist/plib/putil.h
+++ b/src/lib/netlist/plib/putil.h
@@ -19,6 +19,25 @@ namespace plib
 	{
 		const pstring buildpath(std::initializer_list<pstring> list );
 		const pstring environment(const pstring &var, const pstring &default_val = "");
+
+	}
+	namespace container
+	{
+		template <class C>
+		const bool contains(C &con, const typename C::value_type &elem)
+		{
+			return std::find(con.begin(), con.end(), elem) != con.end();
+		}
+
+		template <class C>
+		int indexof(C &con, const typename C::value_type &elem)
+		{
+			auto it = std::find(con.begin(), con.end(), elem);
+			if (it != con.end())
+				return it - con.begin();
+			return -1;
+		}
+
 	}
 
 	// ----------------------------------------------------------------------------------------
diff --git a/src/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp
index 302f1d12184..db837fef71b 100644
--- a/src/lib/netlist/prg/nltool.cpp
+++ b/src/lib/netlist/prg/nltool.cpp
@@ -191,9 +191,9 @@ struct input_t
 
 };
 
-plib::pvector_t<input_t> *read_input(netlist::netlist_t *netlist, pstring fname)
+std::vector<input_t> *read_input(netlist::netlist_t *netlist, pstring fname)
 {
-	plib::pvector_t<input_t> *ret = plib::palloc<plib::pvector_t<input_t>>();
+	std::vector<input_t> *ret = plib::palloc<std::vector<input_t>>();
 	if (fname != "")
 	{
 		plib::pifilestream f(fname);
@@ -225,7 +225,7 @@ static void run(tool_options_t &opts)
 
 	nt.read_netlist(opts.opt_file(), opts.opt_name());
 
-	plib::pvector_t<input_t> *inps = read_input(&nt, opts.opt_inp());
+	std::vector<input_t> *inps = read_input(&nt, opts.opt_inp());
 
 	double ttr = opts.opt_ttr();
 
@@ -245,7 +245,7 @@ static void run(tool_options_t &opts)
 	}
 	nt.process_queue(netlist::netlist_time(ttr) - nlt);
 	nt.stop();
-	pfree(inps);
+	plib::pfree(inps);
 
 	double emutime = (double) (plib::ticks() - t) / (double) plib::ticks_per_second();
 	pout("{1:f} seconds emulation took {2:f} real time ==> {3:5.2f}%\n", ttr, emutime, ttr/emutime*100.0);

From c1c56b22e9ffbcc46fcace76685b4eb85d65d19b Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Thu, 9 Jun 2016 21:10:52 +0200
Subject: [PATCH 02/39] Simplify main processing loop. As a nice side-effect
 that squeezed out some cycles. (nw)

---
 src/lib/netlist/nl_base.cpp | 36 +++++++++++++-----------------------
 src/lib/netlist/nl_base.h   |  4 +---
 src/lib/netlist/nl_lists.h  | 13 +++++++++----
 3 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index 6c1df62290d..f6b7e61cd8f 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -187,7 +187,6 @@ device_object_t::device_object_t(core_device_t &dev, const pstring &aname, const
 
 netlist_t::netlist_t(const pstring &aname)
 	:   pstate_manager_t(),
-		m_stop(netlist_time::zero()),
 		m_time(netlist_time::zero()),
 		m_use_deactivate(0),
 		m_queue(*this),
@@ -331,51 +330,42 @@ void netlist_t::reset()
 
 void netlist_t::process_queue(const netlist_time &delta)
 {
-	m_stop = m_time + delta;
+	netlist_time stop(m_time + delta);
+
+	m_queue.push(stop, nullptr);
 
 	if (m_mainclock == nullptr)
 	{
-		while ( (m_time < m_stop) & (!m_queue.empty()))
+		while (1)
 		{
 			const queue_t::entry_t e(m_queue.pop());
 			m_time = e.m_exec_time;
+			if (e.m_object == nullptr)
+				break;
 			e.m_object->update_devs();
-
 			add_to_stat(m_perf_out_processed, 1);
 		}
-		if (m_queue.empty())
-			m_time = m_stop;
 
 	} else {
 		logic_net_t &mc_net = m_mainclock->m_Q.net();
 		const netlist_time inc = m_mainclock->m_inc;
 		netlist_time mc_time(mc_net.time());
 
-		while (m_time < m_stop)
+		while (1)
 		{
-			if (!m_queue.empty())
+			while (m_queue.top().m_exec_time > mc_time)
 			{
-				while (m_queue.top().m_exec_time > mc_time)
-				{
-					m_time = mc_time;
-					mc_time += inc;
-					mc_net.toggle_new_Q();
-					mc_net.update_devs();
-					//devices::NETLIB_NAME(mainclock)::mc_update(mc_net);
-				}
-
-				const queue_t::entry_t &e = m_queue.pop();
-				m_time = e.m_exec_time;
-				e.m_object->update_devs();
-
-			} else {
 				m_time = mc_time;
 				mc_time += inc;
 				mc_net.toggle_new_Q();
 				mc_net.update_devs();
-				//devices::NETLIB_NAME(mainclock)::mc_update(mc_net);
 			}
 
+			const queue_t::entry_t e(m_queue.pop());
+			m_time = e.m_exec_time;
+			if (e.m_object == nullptr)
+				break;
+			e.m_object->update_devs();
 			add_to_stat(m_perf_out_processed, 1);
 		}
 		mc_net.set_time(mc_time);
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 5dd6a8095f4..2f587aa85e5 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -1052,7 +1052,7 @@ namespace netlist
 		void remove_from_queue(net_t &out);
 
 		void process_queue(const netlist_time &delta);
-		void abort_current_queue_slice() { m_stop = netlist_time::zero(); }
+		void abort_current_queue_slice() { m_queue.retime(m_time, nullptr); }
 
 		bool use_deactivate() const { return m_use_deactivate; }
 
@@ -1121,8 +1121,6 @@ protected:
 	#endif
 
 	private:
-		netlist_time                m_stop;     // target time for current queue processing
-
 		netlist_time                m_time;
 		bool                        m_use_deactivate;
 		queue_t                     m_queue;
diff --git a/src/lib/netlist/nl_lists.h b/src/lib/netlist/nl_lists.h
index b3443ed2297..475e0e285c2 100644
--- a/src/lib/netlist/nl_lists.h
+++ b/src/lib/netlist/nl_lists.h
@@ -68,13 +68,12 @@ namespace netlist
 	#if HAS_OPENMP && USE_OPENMP
 			m_lock = 0;
 	#endif
-			//nl_assert(m_end - m_list < Size);
 		}
 
-		 entry_t pop() NOEXCEPT       { return *(--m_end); }
-		 entry_t top() const NOEXCEPT { return *(m_end-1); }
+		entry_t pop() NOEXCEPT       { return *(--m_end); }
+		const entry_t &top() const NOEXCEPT { return *(m_end-1); }
 
-		 void remove(const Element &elem) NOEXCEPT
+		void remove(const Element &elem) NOEXCEPT
 		{
 			/* Lock */
 	#if HAS_OPENMP && USE_OPENMP
@@ -101,6 +100,12 @@ namespace netlist
 	#endif
 		}
 
+		void retime(const Time t, const Element &elem) NOEXCEPT
+		{
+			remove(elem);
+			push(t, elem);
+		}
+
 		void clear()
 		{
 			m_end = &m_list[0];

From fd593a270c63a66ad20565c7db9799bec31ba426 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Thu, 9 Jun 2016 21:32:38 +0200
Subject: [PATCH 03/39] More cycle squeezing. (nw)

---
 src/lib/netlist/nl_base.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index f6b7e61cd8f..b065c84d6d3 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -336,17 +336,18 @@ void netlist_t::process_queue(const netlist_time &delta)
 
 	if (m_mainclock == nullptr)
 	{
-		while (1)
+		queue_t::entry_t e(m_queue.pop());
+		m_time = e.m_exec_time;
+		while (e.m_object != nullptr)
 		{
-			const queue_t::entry_t e(m_queue.pop());
-			m_time = e.m_exec_time;
-			if (e.m_object == nullptr)
-				break;
 			e.m_object->update_devs();
 			add_to_stat(m_perf_out_processed, 1);
+			e = m_queue.pop();
+			m_time = e.m_exec_time;
 		}
-
-	} else {
+	}
+	else
+	{
 		logic_net_t &mc_net = m_mainclock->m_Q.net();
 		const netlist_time inc = m_mainclock->m_inc;
 		netlist_time mc_time(mc_net.time());

From 4ff5a6418b871a2038c238314cc6722e6500539c Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Thu, 9 Jun 2016 23:11:36 +0200
Subject: [PATCH 04/39] Removed pvector_t. (nw)

---
 src/lib/netlist/devices/nld_truthtable.h   |  2 +-
 src/lib/netlist/nl_base.cpp                |  8 ++--
 src/lib/netlist/nl_base.h                  | 28 +++++---------
 src/lib/netlist/nl_setup.cpp               | 21 ++++-------
 src/lib/netlist/plib/plists.h              | 44 +---------------------
 src/lib/netlist/plib/poptions.h            |  2 +-
 src/lib/netlist/plib/putil.cpp             |  4 +-
 src/lib/netlist/plib/putil.h               | 10 ++++-
 src/lib/netlist/solver/nld_matrix_solver.h | 31 ++++++++-------
 src/lib/netlist/solver/nld_ms_direct.h     |  2 +-
 src/lib/netlist/solver/nld_ms_gcr.h        |  2 +-
 src/lib/netlist/solver/nld_ms_gmres.h      |  2 +-
 src/lib/netlist/solver/nld_solver.cpp      | 33 ++++++++--------
 src/lib/netlist/tools/nl_convert.cpp       |  6 +--
 src/lib/netlist/tools/nl_convert.h         |  4 +-
 15 files changed, 73 insertions(+), 126 deletions(-)

diff --git a/src/lib/netlist/devices/nld_truthtable.h b/src/lib/netlist/devices/nld_truthtable.h
index d5772907df6..200e00554c4 100644
--- a/src/lib/netlist/devices/nld_truthtable.h
+++ b/src/lib/netlist/devices/nld_truthtable.h
@@ -235,7 +235,7 @@ namespace netlist
 			for (std::size_t i=0; i < m_NO; i++)
 			{
 				pstring tmp = "_" + out[i];
-				const int idx = inout.indexof(tmp);
+				const int idx = plib::container::indexof(inout, tmp);
 				if (idx>=0)
 				{
 					connect_late(m_Q[i], m_I[idx]);
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index b065c84d6d3..02e137d689e 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -761,19 +761,19 @@ analog_net_t::analog_net_t(netlist_t &nl, const pstring &aname, core_terminal_t
 {
 }
 
-bool analog_net_t::already_processed(plib::pvector_t<list_t> &groups)
+bool analog_net_t::already_processed(std::vector<list_t> &groups)
 {
 	if (isRailNet())
 		return true;
 	for (auto & grp : groups)
 	{
-		if (grp.contains(this))
+		if (plib::container::contains(grp, this))
 			return true;
 	}
 	return false;
 }
 
-void analog_net_t::process_net(plib::pvector_t<list_t> &groups)
+void analog_net_t::process_net(std::vector<list_t> &groups)
 {
 	if (num_cons() == 0)
 		return;
@@ -813,7 +813,7 @@ void core_terminal_t::reset()
 		set_state(STATE_INP_ACTIVE);
 }
 
-void core_terminal_t::set_net(net_t::ptr_t anet)
+void core_terminal_t::set_net(net_t *anet)
 {
 	m_net = anet;
 }
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 2f587aa85e5..6dbbdc17d28 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -475,8 +475,6 @@ namespace netlist
 		P_PREVENT_COPYING(terminal_t)
 	public:
 
-		using list_t = plib::pvector_t<terminal_t *>;
-
 		terminal_t(core_device_t &dev, const pstring &aname);
 
 		terminal_t *m_otherterm;
@@ -594,9 +592,6 @@ namespace netlist
 		P_PREVENT_COPYING(net_t)
 	public:
 
-		using ptr_t = net_t *;
-		using list_t = plib::pvector_t<std::shared_ptr<net_t>>;
-
 		net_t(netlist_t &nl, const pstring &aname, core_terminal_t *mr = nullptr);
 		virtual ~net_t();
 
@@ -631,7 +626,7 @@ namespace netlist
 
 		void move_connections(net_t *new_net);
 
-		plib::pvector_t<core_terminal_t *> m_core_terms; // save post-start m_list ...
+		std::vector<core_terminal_t *> m_core_terms; // save post-start m_list ...
 
 	protected:
 		netlist_sig_t m_new_Q;
@@ -656,8 +651,6 @@ namespace netlist
 		P_PREVENT_COPYING(logic_net_t)
 	public:
 
-		using list_t = plib::pvector_t<logic_net_t *>;
-
 		logic_net_t(netlist_t &nl, const pstring &aname, core_terminal_t *mr = nullptr);
 		virtual ~logic_net_t() { };
 
@@ -699,7 +692,7 @@ namespace netlist
 		P_PREVENT_COPYING(analog_net_t)
 	public:
 
-		using list_t =  plib::pvector_t<analog_net_t *>;
+		using list_t =  std::vector<analog_net_t *>;
 
 		analog_net_t(netlist_t &nl, const pstring &aname, core_terminal_t *mr = nullptr);
 
@@ -712,8 +705,8 @@ namespace netlist
 		devices::matrix_solver_t *solver() { return m_solver; }
 		void set_solver(devices::matrix_solver_t *solver) { m_solver = solver; }
 
-		bool already_processed(plib::pvector_t<list_t> &groups);
-		void process_net(plib::pvector_t<list_t> &groups);
+		bool already_processed(std::vector<list_t> &groups);
+		void process_net(std::vector<list_t> &groups);
 
 	private:
 		devices::matrix_solver_t *m_solver;
@@ -835,9 +828,6 @@ namespace netlist
 	{
 		P_PREVENT_COPYING(core_device_t)
 	public:
-
-		using list_t = plib::pvector_t<core_device_t *>;
-
 		core_device_t(netlist_t &owner, const pstring &name);
 		core_device_t(core_device_t &owner, const pstring &name);
 
@@ -966,7 +956,7 @@ namespace netlist
 		void connect_late(core_terminal_t &t1, core_terminal_t &t2);
 		void connect_post_start(core_terminal_t &t1, core_terminal_t &t2);
 
-		plib::pvector_t<pstring> m_terminals;
+		std::vector<pstring> m_terminals;
 
 	protected:
 
@@ -1064,9 +1054,9 @@ namespace netlist
 		net_t *find_net(const pstring &name);
 
 		template<class device_class>
-		plib::pvector_t<device_class *> get_device_list()
+		std::vector<device_class *> get_device_list()
 		{
-			plib::pvector_t<device_class *> tmp;
+			std::vector<device_class *> tmp;
 			for (auto &d : m_devices)
 			{
 				device_class *dev = dynamic_cast<device_class *>(d.get());
@@ -1103,10 +1093,10 @@ namespace netlist
 
 		void print_stats() const;
 
-		plib::pvector_t<plib::owned_ptr<core_device_t>> m_devices;
+		std::vector<plib::owned_ptr<core_device_t>> m_devices;
 
 		/* sole use is to manage lifetime of net objects */
-		net_t::list_t m_nets;
+		std::vector<std::shared_ptr<net_t>> m_nets;
 
 		/* sole use is to manage lifetime of family objects */
 		std::vector<std::pair<pstring, std::unique_ptr<logic_family_desc_t>>> m_family_cache;
diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp
index e4c4949b2a9..14543de2c55 100644
--- a/src/lib/netlist/nl_setup.cpp
+++ b/src/lib/netlist/nl_setup.cpp
@@ -589,7 +589,7 @@ void setup_t::connect_terminals(core_terminal_t &t1, core_terminal_t &t2)
 	{
 		log().debug("adding analog net ...\n");
 		// FIXME: Nets should have a unique name
-		analog_net_t::ptr_t anet = plib::palloc<analog_net_t>(netlist(),"net." + t1.name());
+		auto anet = plib::palloc<analog_net_t>(netlist(),"net." + t1.name());
 		t1.set_net(anet);
 		anet->register_con(t2);
 		anet->register_con(t1);
@@ -734,20 +734,15 @@ void setup_t::resolve_inputs()
 
 	// delete empty nets ... and save m_list ...
 
-	net_t::list_t todelete;
-
-	for (auto & net : netlist().m_nets)
+	for (auto net = netlist().m_nets.begin(); net != netlist().m_nets.end();)
 	{
-		if (net->num_cons() == 0)
-			todelete.push_back(net);
+		if (net->get()->num_cons() == 0)
+		{
+			log().verbose("Deleting net {1} ...", net->get()->name());
+			net = netlist().m_nets.erase(net);
+		}
 		else
-			net->rebuild_list();
-	}
-
-	for (auto & net : todelete)
-	{
-		log().verbose("Deleting net {1} ...", net->name());
-		netlist().m_nets.remove(net);
+			++net;
 	}
 
 	pstring errstr("");
diff --git a/src/lib/netlist/plib/plists.h b/src/lib/netlist/plib/plists.h
index ab4b06ce74d..4d6074b92ee 100644
--- a/src/lib/netlist/plib/plists.h
+++ b/src/lib/netlist/plib/plists.h
@@ -69,48 +69,6 @@ private:
 	typename std::aligned_storage<sizeof(C), alignof(C)>::type m_buf[N];
 };
 
-// ----------------------------------------------------------------------------------------
-// plist_t: a simple list
-// ----------------------------------------------------------------------------------------
-
-template <typename LC>
-class pvector_t : public std::vector<LC>
-{
-public:
-	pvector_t() : std::vector<LC>() {}
-
-	bool contains(const LC &elem) const
-	{
-		return (std::find(this->begin(), this->end(), elem) != this->end());
-	}
-
-	void remove(const LC &elem)
-	{
-		this->erase(std::remove(this->begin(), this->end(), elem), this->end());
-	}
-
-	void insert_at(const std::size_t index, const LC &elem)
-	{
-		this->insert(this->begin() + index, elem);
-	}
-
-	 void remove_at(const std::size_t pos)
-	{
-		this->erase(this->begin() + pos);
-	}
-
-	int indexof(const LC &elem) const
-	{
-		for (std::size_t i = 0; i < this->size(); i++)
-		{
-			if (this->at(i) == elem)
-				return i;
-		}
-		return -1;
-	}
-
-};
-
 // ----------------------------------------------------------------------------------------
 // plinkedlist_t: a simple linked list
 //                the list allows insertions / deletions if used properly
@@ -407,7 +365,7 @@ private:
 		}
 
 	}
-	pvector_t<element_t> m_values;
+	std::vector<element_t> m_values;
 	std::vector<int> m_hash;
 };
 
diff --git a/src/lib/netlist/plib/poptions.h b/src/lib/netlist/plib/poptions.h
index d153d08e604..3ab1adb78c6 100644
--- a/src/lib/netlist/plib/poptions.h
+++ b/src/lib/netlist/plib/poptions.h
@@ -71,7 +71,7 @@ public:
 
 	virtual int parse(pstring argument) override
 	{
-		if (m_limit.contains(argument))
+		if (plib::container::contains(m_limit, argument))
 		{
 			m_val = argument;
 			return 0;
diff --git a/src/lib/netlist/plib/putil.cpp b/src/lib/netlist/plib/putil.cpp
index 3e5cecc0081..79cea5bcf88 100644
--- a/src/lib/netlist/plib/putil.cpp
+++ b/src/lib/netlist/plib/putil.cpp
@@ -41,7 +41,7 @@ namespace plib
 	}
 
 	pstring_vector_t::pstring_vector_t(const pstring &str, const pstring &onstr, bool ignore_empty)
-	: pvector_t<pstring>()
+	: std::vector<pstring>()
 	{
 		int p = 0;
 		int pn;
@@ -64,7 +64,7 @@ namespace plib
 	}
 
 	pstring_vector_t::pstring_vector_t(const pstring &str, const pstring_vector_t &onstrl)
-	: pvector_t<pstring>()
+	: std::vector<pstring>()
 	{
 		pstring col = "";
 
diff --git a/src/lib/netlist/plib/putil.h b/src/lib/netlist/plib/putil.h
index 9d1a644b8ca..3b71ba35368 100644
--- a/src/lib/netlist/plib/putil.h
+++ b/src/lib/netlist/plib/putil.h
@@ -38,16 +38,22 @@ namespace plib
 			return -1;
 		}
 
+		template <class C>
+		void insert_at(C &con, const std::size_t index, const typename C::value_type &elem)
+		{
+			con.insert(con.begin() + index, elem);
+		}
+
 	}
 
 	// ----------------------------------------------------------------------------------------
 	// string list
 	// ----------------------------------------------------------------------------------------
 
-	class pstring_vector_t : public pvector_t<pstring>
+	class pstring_vector_t : public std::vector<pstring>
 	{
 	public:
-		pstring_vector_t() : pvector_t<pstring>() { }
+		pstring_vector_t() : std::vector<pstring>() { }
 		pstring_vector_t(const pstring &str, const pstring &onstr, bool ignore_empty = false);
 		pstring_vector_t(const pstring &str, const pstring_vector_t &onstrl);
 	};
diff --git a/src/lib/netlist/solver/nld_matrix_solver.h b/src/lib/netlist/solver/nld_matrix_solver.h
index 7504191a356..9433c42a114 100644
--- a/src/lib/netlist/solver/nld_matrix_solver.h
+++ b/src/lib/netlist/solver/nld_matrix_solver.h
@@ -74,9 +74,9 @@ public:
 
 	unsigned m_railstart;
 
-	plib::pvector_t<unsigned> m_nz;   /* all non zero for multiplication */
-	plib::pvector_t<unsigned> m_nzrd; /* non zero right of the diagonal for elimination, may include RHS element */
-	plib::pvector_t<unsigned> m_nzbd; /* non zero below of the diagonal for elimination */
+	std::vector<unsigned> m_nz;   /* all non zero for multiplication */
+	std::vector<unsigned> m_nzrd; /* non zero right of the diagonal for elimination, may include RHS element */
+	std::vector<unsigned> m_nzbd; /* non zero below of the diagonal for elimination */
 
 	/* state */
 	nl_double m_last_V;
@@ -84,12 +84,12 @@ public:
 	nl_double m_h_n_m_1;
 
 private:
-	plib::pvector_t<int> m_net_other;
-	plib::pvector_t<nl_double> m_go;
-	plib::pvector_t<nl_double> m_gt;
-	plib::pvector_t<nl_double> m_Idr;
-	plib::pvector_t<nl_double *> m_other_curanalog;
-	plib::pvector_t<terminal_t *> m_term;
+	std::vector<int> m_net_other;
+	std::vector<nl_double> m_go;
+	std::vector<nl_double> m_gt;
+	std::vector<nl_double> m_Idr;
+	std::vector<nl_double *> m_other_curanalog;
+	std::vector<terminal_t *> m_term;
 
 };
 
@@ -109,8 +109,7 @@ public:
 class matrix_solver_t : public device_t
 {
 public:
-	using list_t = plib::pvector_t<matrix_solver_t *>;
-	using dev_list_t = core_device_t::list_t;
+	using list_t = std::vector<matrix_solver_t *>;
 
 	enum eSortType
 	{
@@ -200,11 +199,11 @@ protected:
 	template <typename T>
 	void build_LE_RHS();
 
-	plib::pvector_t<terms_t *> m_terms;
-	plib::pvector_t<analog_net_t *> m_nets;
+	std::vector<terms_t *> m_terms;
+	std::vector<analog_net_t *> m_nets;
 	std::vector<std::unique_ptr<proxied_analog_output_t>> m_inps;
 
-	plib::pvector_t<terms_t *> m_rails_temp;
+	std::vector<terms_t *> m_rails_temp;
 
 	int m_stat_calculations;
 	int m_stat_newton_raphson;
@@ -219,8 +218,8 @@ private:
 
 	netlist_time m_last_step;
 	nl_double m_cur_ts;
-	dev_list_t m_step_devices;
-	dev_list_t m_dynamic_devices;
+	std::vector<core_device_t *> m_step_devices;
+	std::vector<core_device_t *> m_dynamic_devices;
 
 	logic_input_t m_fb_sync;
 	logic_output_t m_Q_sync;
diff --git a/src/lib/netlist/solver/nld_ms_direct.h b/src/lib/netlist/solver/nld_ms_direct.h
index f8514867f6e..87b5b4e7a5c 100644
--- a/src/lib/netlist/solver/nld_ms_direct.h
+++ b/src/lib/netlist/solver/nld_ms_direct.h
@@ -206,7 +206,7 @@ void matrix_solver_direct_t<m_N, storage_N>::vsetup(analog_net_t::list_t &nets)
 	{
 		terms_t * t = m_terms[k];
 
-		if (!t->m_nzrd.contains(N()))
+		if (!plib::container::contains(t->m_nzrd, N()))
 			t->m_nzrd.push_back(N());
 	}
 
diff --git a/src/lib/netlist/solver/nld_ms_gcr.h b/src/lib/netlist/solver/nld_ms_gcr.h
index f963c59be01..aa31a53cce4 100644
--- a/src/lib/netlist/solver/nld_ms_gcr.h
+++ b/src/lib/netlist/solver/nld_ms_gcr.h
@@ -68,7 +68,7 @@ private:
 	}
 
 	unsigned m_dim;
-	plib::pvector_t<int> m_term_cr[storage_N];
+	std::vector<int> m_term_cr[storage_N];
 	mat_cr_t<storage_N> mat;
 	nl_double m_A[storage_N * storage_N];
 
diff --git a/src/lib/netlist/solver/nld_ms_gmres.h b/src/lib/netlist/solver/nld_ms_gmres.h
index e4c42b2e098..30761623611 100644
--- a/src/lib/netlist/solver/nld_ms_gmres.h
+++ b/src/lib/netlist/solver/nld_ms_gmres.h
@@ -48,7 +48,7 @@ private:
 
 	int solve_ilu_gmres(nl_double * RESTRICT x, const nl_double * RESTRICT rhs, const unsigned restart_max, const unsigned mr, nl_double accuracy);
 
-	plib::pvector_t<int> m_term_cr[storage_N];
+	std::vector<int> m_term_cr[storage_N];
 
 	bool m_use_iLU_preconditioning;
 	bool m_use_more_precise_stop_condition;
diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp
index 0a9d6360dc8..dd347309688 100644
--- a/src/lib/netlist/solver/nld_solver.cpp
+++ b/src/lib/netlist/solver/nld_solver.cpp
@@ -67,12 +67,12 @@ void terms_t::add(terminal_t *term, int net_other, bool sorted)
 		{
 			if (m_net_other[i] > net_other)
 			{
-				m_term.insert_at(i, term);
-				m_net_other.insert_at(i, net_other);
-				m_gt.insert_at(i, 0.0);
-				m_go.insert_at(i, 0.0);
-				m_Idr.insert_at(i, 0.0);
-				m_other_curanalog.insert_at(i, nullptr);
+				plib::container::insert_at(m_term, i, term);
+				plib::container::insert_at(m_net_other, i, net_other);
+				plib::container::insert_at(m_gt, i, 0.0);
+				plib::container::insert_at(m_go, i, 0.0);
+				plib::container::insert_at(m_Idr, i, 0.0);
+				plib::container::insert_at(m_other_curanalog, i, nullptr);
 				return;
 			}
 		}
@@ -135,10 +135,10 @@ void matrix_solver_t::setup_base(analog_net_t::list_t &nets)
 			{
 				case terminal_t::TERMINAL:
 					if (p->device().is_timestep())
-						if (!m_step_devices.contains(&p->device()))
+						if (!plib::container::contains(m_step_devices, &p->device()))
 							m_step_devices.push_back(&p->device());
 					if (p->device().is_dynamic())
-						if (!m_dynamic_devices.contains(&p->device()))
+						if (!plib::container::contains(m_dynamic_devices, &p->device()))
 							m_dynamic_devices.push_back(&p->device());
 					{
 						terminal_t *pterm = dynamic_cast<terminal_t *>(p);
@@ -257,7 +257,7 @@ void matrix_solver_t::setup_matrix()
 		t->m_nz.clear();
 
 		for (unsigned i = 0; i < t->m_railstart; i++)
-			if (!t->m_nz.contains(other[i]))
+			if (!plib::container::contains(t->m_nz, other[i]))
 				t->m_nz.push_back(other[i]);
 
 		t->m_nz.push_back(k);     // add diagonal
@@ -281,18 +281,17 @@ void matrix_solver_t::setup_matrix()
 		else
 		{
 			t->m_nzrd = m_terms[k-1]->m_nzrd;
-			unsigned j=0;
-			while(j < t->m_nzrd.size())
+			for (auto j = t->m_nzrd.begin(); j != t->m_nzrd.end(); )
 			{
-				if (t->m_nzrd[j] < k + 1)
-					t->m_nzrd.remove_at(j);
+				if (*j < k + 1)
+					j = t->m_nzrd.erase(j);
 				else
-					j++;
+					++j;
 			}
 		}
 
 		for (unsigned i = 0; i < t->m_railstart; i++)
-			if (!t->m_nzrd.contains(other[i]) && other[i] >= (int) (k + 1))
+			if (!plib::container::contains(t->m_nzrd, other[i]) && other[i] >= (int) (k + 1))
 				t->m_nzrd.push_back(other[i]);
 
 		/* and sort */
@@ -324,7 +323,7 @@ void matrix_solver_t::setup_matrix()
 			if (touched[row][k])
 			{
 				ops++;
-				if (!m_terms[k]->m_nzbd.contains(row))
+				if (!plib::container::contains(m_terms[k]->m_nzbd, row))
 					m_terms[k]->m_nzbd.push_back(row);
 				for (unsigned col = k + 1; col < iN; col++)
 					if (touched[k][col])
@@ -698,7 +697,7 @@ std::unique_ptr<matrix_solver_t> NETLIB_NAME(solver)::create_solver(int size, co
 
 void NETLIB_NAME(solver)::post_start()
 {
-	plib::pvector_t<analog_net_t::list_t> groups;
+	std::vector<analog_net_t::list_t> groups;
 	const bool use_specific = true;
 
 	m_params.m_pivot = m_pivot.Value();
diff --git a/src/lib/netlist/tools/nl_convert.cpp b/src/lib/netlist/tools/nl_convert.cpp
index 145de96aa38..6b9846ea8ef 100644
--- a/src/lib/netlist/tools/nl_convert.cpp
+++ b/src/lib/netlist/tools/nl_convert.cpp
@@ -12,9 +12,9 @@
 
 
 template<typename Class>
-static plib::pvector_t<int> bubble(const plib::pvector_t<Class> &sl)
+static std::vector<int> bubble(const std::vector<Class> &sl)
 {
-	plib::pvector_t<int> ret;
+	std::vector<int> ret;
 	for (unsigned i=0; i<sl.size(); i++)
 		ret.push_back(i);
 
@@ -102,7 +102,7 @@ void nl_convert_base_t::dump_nl()
 		if (net->terminals().size() == 1)
 			net->set_no_export();
 	}
-	plib::pvector_t<int> sorted = bubble(m_devs);
+	std::vector<int> sorted = bubble(m_devs);
 	for (std::size_t i=0; i<m_devs.size(); i++)
 	{
 		std::size_t j = sorted[i];
diff --git a/src/lib/netlist/tools/nl_convert.h b/src/lib/netlist/tools/nl_convert.h
index 40d339e0934..01ccd038e5c 100644
--- a/src/lib/netlist/tools/nl_convert.h
+++ b/src/lib/netlist/tools/nl_convert.h
@@ -130,9 +130,9 @@ private:
 
 	plib::postringstream m_buf;
 
-	plib::pvector_t<std::shared_ptr<dev_t>> m_devs;
+	std::vector<std::shared_ptr<dev_t>> m_devs;
 	plib::hashmap_t<pstring, std::shared_ptr<net_t> > m_nets;
-	plib::pvector_t<pstring> m_ext_alias;
+	std::vector<pstring> m_ext_alias;
 	plib::hashmap_t<pstring, std::shared_ptr<pin_alias_t>> m_pins;
 
 	static unit_t m_units[];

From 63d11f399f016fecdc1bd08a92e982f901624c67 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Fri, 10 Jun 2016 00:36:04 +0200
Subject: [PATCH 05/39] Use std::sort. (nw)

---
 src/lib/netlist/plib/plists.h             | 19 +---------------
 src/lib/netlist/plib/putil.h              | 12 +++++++++-
 src/lib/netlist/solver/nld_ms_direct_lu.h |  5 +++--
 src/lib/netlist/solver/nld_solver.cpp     |  4 ++--
 src/lib/netlist/tools/nl_convert.cpp      | 27 +++++------------------
 5 files changed, 23 insertions(+), 44 deletions(-)

diff --git a/src/lib/netlist/plib/plists.h b/src/lib/netlist/plib/plists.h
index 4d6074b92ee..7c5ed69957f 100644
--- a/src/lib/netlist/plib/plists.h
+++ b/src/lib/netlist/plib/plists.h
@@ -143,7 +143,7 @@ public:
 	void clear() { m_head = nullptr; }
 	bool empty() const { return (m_head == nullptr); }
 
-//private:
+private:
 	LC *m_head;
 };
 
@@ -369,23 +369,6 @@ private:
 	std::vector<int> m_hash;
 };
 
-// ----------------------------------------------------------------------------------------
-// sort a list ... slow, I am lazy
-// elements must support ">" operator.
-// ----------------------------------------------------------------------------------------
-
-template<typename T>
-static inline void sort_list(T &sl)
-{
-	for(unsigned i = 0; i < sl.size(); i++)
-	{
-		for(unsigned j = i + 1; j < sl.size(); j++)
-			if(sl[i] > sl[j])
-				std::swap(sl[i], sl[j]);
-
-	}
-}
-
 }
 
 #endif /* PLISTS_H_ */
diff --git a/src/lib/netlist/plib/putil.h b/src/lib/netlist/plib/putil.h
index 3b71ba35368..3636e0be217 100644
--- a/src/lib/netlist/plib/putil.h
+++ b/src/lib/netlist/plib/putil.h
@@ -19,8 +19,8 @@ namespace plib
 	{
 		const pstring buildpath(std::initializer_list<pstring> list );
 		const pstring environment(const pstring &var, const pstring &default_val = "");
-
 	}
+
 	namespace container
 	{
 		template <class C>
@@ -46,6 +46,16 @@ namespace plib
 
 	}
 
+	template <class C>
+	struct indexed_compare
+	{
+	    indexed_compare(const C& target): m_target(target) {}
+
+	    bool operator()(int a, int b) const { return m_target[a] < m_target[b]; }
+
+	    const C& m_target;
+	};
+
 	// ----------------------------------------------------------------------------------------
 	// string list
 	// ----------------------------------------------------------------------------------------
diff --git a/src/lib/netlist/solver/nld_ms_direct_lu.h b/src/lib/netlist/solver/nld_ms_direct_lu.h
index 47bb95c2855..e5ede1e4a69 100644
--- a/src/lib/netlist/solver/nld_ms_direct_lu.h
+++ b/src/lib/netlist/solver/nld_ms_direct_lu.h
@@ -334,10 +334,11 @@ void matrix_solver_direct_t<m_N, storage_N>::vsetup(analog_net_t::list_t &nets)
 					t->m_nz.add(other[i]);
 			}
 		}
-		psort_list(t->m_nzrd);
+		std::sort(t->m_nzrd.begin(), t->m_nzrd.end());
 
 		t->m_nz.add(k);     // add diagonal
-		psort_list(t->m_nz);
+
+		std::sort(t->m_nz.begin(), t->m_nz.end());
 	}
 
 	if(0)
diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp
index dd347309688..f69905be565 100644
--- a/src/lib/netlist/solver/nld_solver.cpp
+++ b/src/lib/netlist/solver/nld_solver.cpp
@@ -263,7 +263,7 @@ void matrix_solver_t::setup_matrix()
 		t->m_nz.push_back(k);     // add diagonal
 
 		/* and sort */
-		plib::sort_list(t->m_nz);
+		std::sort(t->m_nz.begin(), t->m_nz.end());
 	}
 
 	/* create a list of non zero elements right of the diagonal
@@ -295,7 +295,7 @@ void matrix_solver_t::setup_matrix()
 				t->m_nzrd.push_back(other[i]);
 
 		/* and sort */
-		plib::sort_list(t->m_nzrd);
+		std::sort(t->m_nzrd.begin(), t->m_nzrd.end());
 	}
 
 	/* create a list of non zero elements below diagonal k
diff --git a/src/lib/netlist/tools/nl_convert.cpp b/src/lib/netlist/tools/nl_convert.cpp
index 6b9846ea8ef..1da5f75c0d0 100644
--- a/src/lib/netlist/tools/nl_convert.cpp
+++ b/src/lib/netlist/tools/nl_convert.cpp
@@ -11,26 +11,6 @@
 #include "nl_convert.h"
 
 
-template<typename Class>
-static std::vector<int> bubble(const std::vector<Class> &sl)
-{
-	std::vector<int> ret;
-	for (unsigned i=0; i<sl.size(); i++)
-		ret.push_back(i);
-
-	for(unsigned i=0; i < sl.size(); i++)
-	{
-		for(unsigned j=i+1; j < sl.size(); j++)
-		{
-			if(sl[ret[i]]->name() > sl[ret[j]]->name())
-			{
-				std::swap(ret[i], ret[j]);
-			}
-		}
-	}
-	return ret;
-}
-
 /*-------------------------------------------------
     convert - convert a spice netlist
 -------------------------------------------------*/
@@ -102,7 +82,12 @@ void nl_convert_base_t::dump_nl()
 		if (net->terminals().size() == 1)
 			net->set_no_export();
 	}
-	std::vector<int> sorted = bubble(m_devs);
+
+	std::vector<int> sorted;
+	for (unsigned i=0; i < m_devs.size(); i++)
+		sorted.push_back(i);
+	std::sort(sorted.begin(), sorted.end(), plib::indexed_compare<std::vector<std::shared_ptr<dev_t>>>(m_devs));
+
 	for (std::size_t i=0; i<m_devs.size(); i++)
 	{
 		std::size_t j = sorted[i];

From 8b9ed6589e04b075284c89ba47ff6c55ef2116e7 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Fri, 10 Jun 2016 18:59:54 +0200
Subject: [PATCH 06/39] Minor changes. (nw)

---
 src/lib/netlist/devices/nld_system.cpp |  2 +-
 src/lib/netlist/devices/nlid_system.h  |  4 ++--
 src/lib/netlist/nl_base.cpp            |  2 +-
 src/lib/netlist/nl_base.h              | 21 +++++++++------------
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/lib/netlist/devices/nld_system.cpp b/src/lib/netlist/devices/nld_system.cpp
index c7467f7e3cc..8cb2b89dd0e 100644
--- a/src/lib/netlist/devices/nld_system.cpp
+++ b/src/lib/netlist/devices/nld_system.cpp
@@ -30,7 +30,7 @@ namespace netlist
 
 	NETLIB_UPDATE(clock)
 	{
-		OUTLOGIC(m_Q, !m_Q.net().new_Q(), m_inc  );
+		OUTLOGIC(m_Q, !INPLOGIC(m_feedback), m_inc  );
 	}
 
 	// ----------------------------------------------------------------------------------------
diff --git a/src/lib/netlist/devices/nlid_system.h b/src/lib/netlist/devices/nlid_system.h
index b28d7ff342f..17d9d820de4 100644
--- a/src/lib/netlist/devices/nlid_system.h
+++ b/src/lib/netlist/devices/nlid_system.h
@@ -158,10 +158,10 @@ namespace netlist
 
 		logic_input_t m_feedback;
 		logic_output_t m_Q;
-		unsigned m_cnt;
-		unsigned m_size;
 		netlist_time m_inc[32];
+		unsigned m_cnt;
 		netlist_time m_off;
+		unsigned m_size;
 	};
 
 	// -----------------------------------------------------------------------------
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index 02e137d689e..40d9e54bab5 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -188,8 +188,8 @@ device_object_t::device_object_t(core_device_t &dev, const pstring &aname, const
 netlist_t::netlist_t(const pstring &aname)
 	:   pstate_manager_t(),
 		m_time(netlist_time::zero()),
-		m_use_deactivate(0),
 		m_queue(*this),
+		m_use_deactivate(0),
 		m_mainclock(nullptr),
 		m_solver(nullptr),
 		m_gnd(nullptr),
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 6dbbdc17d28..6cd3414f1a2 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -158,6 +158,7 @@
 #include <vector>
 #include <memory>
 #include <cmath>
+#include <cstdint>
 
 #include "nl_lists.h"
 #include "nl_time.h"
@@ -169,11 +170,6 @@
 // Type definitions
 // ----------------------------------------------------------------------------------------
 
-/*
- *  unsigned int would be a 20% speed increase over UINT8 for pong.
- *  For breakout it causes a slight decrease.
- *
- */
 using netlist_sig_t = std::uint32_t;
 
  //============================================================
@@ -617,7 +613,7 @@ namespace netlist
 		bool isRailNet() const { return !(m_railterminal == nullptr); }
 		core_terminal_t & railterminal() const { return *m_railterminal; }
 
-		int num_cons() const { return m_core_terms.size(); }
+		std::size_t num_cons() const { return m_core_terms.size(); }
 
 		void inc_active(core_terminal_t &term);
 		void dec_active(core_terminal_t &term);
@@ -632,9 +628,9 @@ namespace netlist
 		netlist_sig_t m_new_Q;
 		netlist_sig_t m_cur_Q;
 
-		netlist_time m_time;
-		INT32        m_active;
-		UINT8	     m_in_queue;    /* 0: not in queue, 1: in queue, 2: last was taken */
+		netlist_time  m_time;
+		INT32         m_active;
+		UINT8    	  m_in_queue;    /* 0: not in queue, 1: in queue, 2: last was taken */
 
 	private:
 		plib::linkedlist_t<core_terminal_t> m_list_active;
@@ -1111,14 +1107,15 @@ protected:
 	#endif
 
 	private:
+		/* mostly rw */
 		netlist_time                m_time;
-		bool                        m_use_deactivate;
 		queue_t                     m_queue;
+		/* mostly rw */
+		bool                        m_use_deactivate;
 
 		devices::NETLIB_NAME(mainclock) *    m_mainclock;
 		devices::NETLIB_NAME(solver) *       m_solver;
 		devices::NETLIB_NAME(gnd) *          m_gnd;
-
 		devices::NETLIB_NAME(netlistparams) *m_params;
 
 		pstring m_name;
@@ -1226,7 +1223,7 @@ protected:
 
 	inline void net_t::push_to_queue(const netlist_time delay) NOEXCEPT
 	{
-		if (!is_queued() && (num_cons() > 0))
+		if (!is_queued() && (num_cons() != 0))
 		{
 			m_time = netlist().time() + delay;
 			m_in_queue = (m_active > 0);     /* queued ? */

From 3c476beeaa73ce10a0226c9e5feeef9185c01d6c Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Sat, 11 Jun 2016 01:09:31 +0200
Subject: [PATCH 07/39] Refactored netlist state manager. (nw)

---
 src/devices/machine/netlist.cpp |  75 ++++++-------
 src/lib/netlist/nl_base.cpp     |   4 +-
 src/lib/netlist/nl_base.h       |   4 +-
 src/lib/netlist/nl_time.h       |   6 +-
 src/lib/netlist/plib/pstate.cpp |  30 ++----
 src/lib/netlist/plib/pstate.h   | 186 ++++++++++++++------------------
 6 files changed, 124 insertions(+), 181 deletions(-)

diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp
index 637a1225891..ef925d7632f 100644
--- a/src/devices/machine/netlist.cpp
+++ b/src/devices/machine/netlist.cpp
@@ -402,50 +402,43 @@ ATTR_COLD void netlist_mame_device_t::save_state()
 	for (auto const & s : netlist().save_list())
 	{
 		netlist().log().debug("saving state for {1}\n", s->m_name.cstr());
-		switch (s->m_dt)
+		if (s->m_dt.is_float)
 		{
-			case pstate_data_type_e::DT_DOUBLE:
-				{
-					double *td = s->resolved<double>();
-					if (td != nullptr) save_pointer(td, s->m_name.cstr(), s->m_count);
-				}
-				break;
-			case pstate_data_type_e::DT_FLOAT:
-				{
-					float *td = s->resolved<float>();
-					if (td != nullptr) save_pointer(td, s->m_name.cstr(), s->m_count);
-				}
-				break;
-#if (PHAS_INT128)
-			case pstate_data_type_e::DT_INT128:
-				// FIXME: we are cheating here
-				save_pointer((char *) s->m_ptr, s->m_name.cstr(), s->m_count * sizeof(INT128));
-				break;
-#endif
-			case pstate_data_type_e::DT_INT64:
-				save_pointer((INT64 *) s->m_ptr, s->m_name.cstr(), s->m_count);
-				break;
-			case pstate_data_type_e::DT_INT16:
-				save_pointer((INT16 *) s->m_ptr, s->m_name.cstr(), s->m_count);
-				break;
-			case pstate_data_type_e::DT_INT8:
-				save_pointer((INT8 *) s->m_ptr, s->m_name.cstr(), s->m_count);
-				break;
-			case pstate_data_type_e::DT_INT:
-				save_pointer((int *) s->m_ptr, s->m_name.cstr(), s->m_count);
-				break;
-			case pstate_data_type_e::DT_BOOLEAN:
-				save_pointer((bool *) s->m_ptr, s->m_name.cstr(), s->m_count);
-				break;
-			case pstate_data_type_e::DT_CUSTOM:
-				break;
-			case pstate_data_type_e::NOT_SUPPORTED:
-			default:
-				netlist().log().fatal("found unsupported save element %s\n", s->m_name);
-				break;
+			if (s->m_dt.size == sizeof(double))
+			{
+				double *td = s->resolved<double>();
+				if (td != nullptr) save_pointer(td, s->m_name.cstr(), s->m_count);
+			}
+			else if (s->m_dt.size == sizeof(float))
+			{
+				float *td = s->resolved<float>();
+				if (td != nullptr) save_pointer(td, s->m_name.cstr(), s->m_count);
+			}
+			else
+				netlist().log().fatal("Unknown floating type for {1}\n", s->m_name.cstr());
 		}
+		else if (s->m_dt.is_integral)
+		{
+			if (s->m_dt.size == sizeof(long long int))
+				save_pointer((long long int *) s->m_ptr, s->m_name.cstr(), s->m_count);
+			else if (s->m_dt.size == sizeof(long int))
+				save_pointer((long int *) s->m_ptr, s->m_name.cstr(), s->m_count);
+			else if (s->m_dt.size == sizeof(int))
+				save_pointer((int *) s->m_ptr, s->m_name.cstr(), s->m_count);
+			else if (s->m_dt.size == sizeof(short))
+				save_pointer((short *) s->m_ptr, s->m_name.cstr(), s->m_count);
+			else if (s->m_dt.size == sizeof(char))
+				save_pointer((char *) s->m_ptr, s->m_name.cstr(), s->m_count);
+			else
+				netlist().log().fatal("Unknown integral type for {1}\n", s->m_name.cstr());
+		}
+		else if (s->m_dt.is_custom)
+		{
+			/* do nothing */
+		}
+		else
+			netlist().log().fatal("found unsupported save element %s\n", s->m_name);
 	}
-
 }
 
 // ----------------------------------------------------------------------------------------
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index 40d9e54bab5..718c9592771 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -105,7 +105,7 @@ const logic_family_desc_t *family_CD4XXX()
 queue_t::queue_t(netlist_t &nl)
 	: timed_queue<net_t *, netlist_time>(512)
 	, object_t(nl, "QUEUE", QUEUE)
-	, plib::pstate_callback_t()
+	, plib::pstate_manager_t::callback_t()
 	, m_qsize(0)
 	, m_times(512)
 	, m_names(512)
@@ -199,7 +199,7 @@ netlist_t::netlist_t(const pstring &aname)
 		m_log(this),
 		m_lib(nullptr)
 {
-	save_item(this, static_cast<plib::pstate_callback_t &>(m_queue), "m_queue");
+	save_item(this, static_cast<plib::pstate_manager_t::callback_t &>(m_queue), "m_queue");
 	save_item(this, m_time, "m_time");
 }
 
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 6cd3414f1a2..39be8878198 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -991,7 +991,7 @@ namespace netlist
 
 	class queue_t : public timed_queue<net_t *, netlist_time>,
 							public object_t,
-							public plib::pstate_callback_t
+							public plib::pstate_manager_t::callback_t
 	{
 	public:
 		queue_t(netlist_t &nl);
@@ -1305,7 +1305,5 @@ protected:
 
 }
 
-NETLIST_SAVE_TYPE(netlist::core_terminal_t::state_e, pstate_data_type_e::DT_INT);
-
 
 #endif /* NLBASE_H_ */
diff --git a/src/lib/netlist/nl_time.h b/src/lib/netlist/nl_time.h
index ed28cedc932..384b12bf583 100644
--- a/src/lib/netlist/nl_time.h
+++ b/src/lib/netlist/nl_time.h
@@ -31,10 +31,8 @@ namespace netlist
 
 #if (PHAS_INT128)
 		using INTERNALTYPE = UINT128;
-		static const pstate_data_type_e STATETYPE = DT_INT128;
 #else
 		using INTERNALTYPE = UINT64;
-		static constexpr pstate_data_type_e STATETYPE = pstate_data_type_e::DT_INT64;
 #endif
 		static constexpr INTERNALTYPE RESOLUTION = NETLIST_INTERNAL_RES;
 
@@ -125,14 +123,12 @@ namespace netlist
 		INTERNALTYPE m_time;
 	};
 
-
-
 }
 
 namespace plib {
 template<> inline void pstate_manager_t::save_item(const void *owner, netlist::netlist_time &nlt, const pstring &stname)
 {
-	save_state_ptr(owner, stname, netlist::netlist_time::STATETYPE, sizeof(netlist::netlist_time::INTERNALTYPE), 1, nlt.get_internaltype_ptr(), false);
+	save_state_ptr(owner, stname, datatype_t(sizeof(netlist::netlist_time::INTERNALTYPE), false, true, false), 1, nlt.get_internaltype_ptr());
 }
 }
 
diff --git a/src/lib/netlist/plib/pstate.cpp b/src/lib/netlist/plib/pstate.cpp
index 9fe995ec1f5..23371ed0ae8 100644
--- a/src/lib/netlist/plib/pstate.cpp
+++ b/src/lib/netlist/plib/pstate.cpp
@@ -20,25 +20,9 @@ pstate_manager_t::~pstate_manager_t()
 
 
 
-void pstate_manager_t::save_state_ptr(const void *owner, const pstring &stname, const pstate_data_type_e dt, const int size, const int count, void *ptr, bool is_ptr)
+void pstate_manager_t::save_state_ptr(const void *owner, const pstring &stname, const datatype_t dt, const int count, void *ptr)
 {
-	pstring fullname = stname;
-	ATTR_UNUSED  pstring ts[] = {
-			"NOT_SUPPORTED",
-			"DT_CUSTOM",
-			"DT_DOUBLE",
-#if (PHAS_INT128)
-			"DT_INT128",
-#endif
-			"DT_INT64",
-			"DT_INT16",
-			"DT_INT8",
-			"DT_INT",
-			"DT_BOOLEAN",
-			"DT_FLOAT"
-	};
-
-	auto p = plib::make_unique<pstate_entry_t>(stname, dt, owner, size, count, ptr, is_ptr);
+	auto p = plib::make_unique<entry_t>(stname, dt, owner, count, ptr);
 	m_save.push_back(std::move(p));
 }
 
@@ -56,22 +40,22 @@ void pstate_manager_t::remove_save_items(const void *owner)
 void pstate_manager_t::pre_save()
 {
 	for (auto & s : m_save)
-		if (s->m_dt == DT_CUSTOM)
+		if (s->m_dt.is_custom)
 			s->m_callback->on_pre_save();
 }
 
 void pstate_manager_t::post_load()
 {
 	for (auto & s : m_save)
-		if (s->m_dt == DT_CUSTOM)
+		if (s->m_dt.is_custom)
 			s->m_callback->on_post_load();
 }
 
-template<> void pstate_manager_t::save_item(const void *owner, pstate_callback_t &state, const pstring &stname)
+template<> void pstate_manager_t::save_item(const void *owner, callback_t &state, const pstring &stname)
 {
 	//save_state_ptr(stname, DT_CUSTOM, 0, 1, &state);
-	pstate_callback_t *state_p = &state;
-	auto p = plib::make_unique<pstate_entry_t>(stname, owner, state_p);
+	callback_t *state_p = &state;
+	auto p = plib::make_unique<entry_t>(stname, owner, state_p);
 	m_save.push_back(std::move(p));
 	state.register_state(*this, stname);
 }
diff --git a/src/lib/netlist/plib/pstate.h b/src/lib/netlist/plib/pstate.h
index 4bc92aab3eb..fc8bfaaafb0 100644
--- a/src/lib/netlist/plib/pstate.h
+++ b/src/lib/netlist/plib/pstate.h
@@ -9,6 +9,7 @@
 #define PSTATE_H_
 
 #include <memory>
+#include <type_traits>
 
 #include "plists.h"
 #include "pstring.h"
@@ -17,126 +18,97 @@
 // state saving ...
 // ----------------------------------------------------------------------------------------
 
-enum pstate_data_type_e {
-	NOT_SUPPORTED,
-	DT_CUSTOM,
-	DT_DOUBLE,
-#if (PHAS_INT128)
-	DT_INT128,
-#endif
-	DT_INT64,
-	DT_INT16,
-	DT_INT8,
-	DT_INT,
-	DT_BOOLEAN,
-	DT_FLOAT
-};
-
-template<typename ItemType> struct pstate_datatype
-{
-	static const pstate_data_type_e type = pstate_data_type_e(NOT_SUPPORTED);
-	static const bool is_ptr = false;
-};
-
-template<typename ItemType> struct pstate_datatype<ItemType *>
-{
-	static const pstate_data_type_e type = pstate_data_type_e(NOT_SUPPORTED);
-	static const bool is_ptr = true;
-};
-
-//template<typename ItemType> struct type_checker<ItemType*> { static const bool is_atom = false; static const bool is_pointer = true; };
-
-#define NETLIST_SAVE_TYPE(TYPE, TYPEDESC) \
-		template<> struct pstate_datatype<TYPE>{ static const pstate_data_type_e type = pstate_data_type_e(TYPEDESC); static const bool is_ptr = false;}; \
-		template<> struct pstate_datatype<TYPE *>{ static const pstate_data_type_e type = pstate_data_type_e(TYPEDESC); static const bool is_ptr = true;}
-
-NETLIST_SAVE_TYPE(char, DT_INT8);
-NETLIST_SAVE_TYPE(double, DT_DOUBLE);
-NETLIST_SAVE_TYPE(float, DT_FLOAT);
-NETLIST_SAVE_TYPE(INT8, DT_INT8);
-NETLIST_SAVE_TYPE(UINT8, DT_INT8);
-#if (PHAS_INT128)
-NETLIST_SAVE_TYPE(INT128, DT_INT128);
-NETLIST_SAVE_TYPE(UINT128, DT_INT128);
-#endif
-NETLIST_SAVE_TYPE(INT64, DT_INT64);
-NETLIST_SAVE_TYPE(UINT64, DT_INT64);
-NETLIST_SAVE_TYPE(bool, DT_BOOLEAN);
-NETLIST_SAVE_TYPE(UINT32, DT_INT);
-NETLIST_SAVE_TYPE(INT32, DT_INT);
-NETLIST_SAVE_TYPE(UINT16, DT_INT16);
-NETLIST_SAVE_TYPE(INT16, DT_INT16);
-//NETLIST_SAVE_TYPE(std::size_t, DT_INT64);
-
 namespace plib {
 
-class pstate_manager_t;
-
-class pstate_callback_t
-{
-public:
-	using list_t = std::vector<pstate_callback_t *>;
-
-	virtual ~pstate_callback_t() { };
-
-	virtual void register_state(pstate_manager_t &manager, const pstring &module) = 0;
-	virtual void on_pre_save() = 0;
-	virtual void on_post_load() = 0;
-protected:
-};
-
-struct pstate_entry_t
-{
-	using list_t = std::vector<std::unique_ptr<pstate_entry_t>>;
-
-	pstate_entry_t(const pstring &stname, const pstate_data_type_e dt, const void *owner,
-			const int size, const int count, void *ptr, bool is_ptr)
-	: m_name(stname), m_dt(dt), m_owner(owner), m_callback(nullptr), m_size(size), m_count(count), m_ptr(ptr), m_is_ptr(is_ptr) { }
-
-	pstate_entry_t(const pstring &stname, const void *owner, pstate_callback_t *callback)
-	: m_name(stname), m_dt(DT_CUSTOM), m_owner(owner), m_callback(callback), m_size(0), m_count(0), m_ptr(nullptr), m_is_ptr(false) { }
-
-	~pstate_entry_t() { }
-
-	pstring m_name;
-	const pstate_data_type_e m_dt;
-	const void *m_owner;
-	pstate_callback_t *m_callback;
-	const int m_size;
-	const int m_count;
-	void *m_ptr;
-	bool m_is_ptr;
-
-	template<typename T>
-	T *resolved()
-	{
-		if (m_is_ptr)
-			return *static_cast<T **>(m_ptr);
-		else
-			return static_cast<T *>(m_ptr);
-	}
-};
-
 class pstate_manager_t
 {
 public:
 
+	struct datatype_t
+	{
+		datatype_t(std::size_t bsize, bool bptr, bool bintegral, bool bfloat)
+		: size(bsize), is_ptr(bptr), is_integral(bintegral), is_float(bfloat), is_custom(false)
+		{}
+		datatype_t(bool bcustom)
+		: size(0), is_ptr(false), is_integral(false), is_float(false), is_custom(true)
+		{}
+
+		const std::size_t size;
+		const bool is_ptr;
+		const bool is_integral;
+		const bool is_float;
+		const bool is_custom;
+	};
+
+	template<typename T> struct datatype_f
+	{
+		static inline const datatype_t f() { return datatype_t(false, sizeof(T), std::is_integral<T>::value, std::is_floating_point<T>::value); }
+	};
+
+	template<typename T> struct datatype_f<T *>
+	{
+		static inline const datatype_t f() { return datatype_t(true, sizeof(T), std::is_integral<T>::value, std::is_floating_point<T>::value); }
+	};
+
+	class callback_t
+	{
+	public:
+		using list_t = std::vector<callback_t *>;
+
+		virtual ~callback_t() { };
+
+		virtual void register_state(pstate_manager_t &manager, const pstring &module) = 0;
+		virtual void on_pre_save() = 0;
+		virtual void on_post_load() = 0;
+	protected:
+	};
+
+	struct entry_t
+	{
+		using list_t = std::vector<std::unique_ptr<entry_t>>;
+
+		entry_t(const pstring &stname, const datatype_t dt, const void *owner,
+				const std::size_t count, void *ptr)
+		: m_name(stname), m_dt(dt), m_owner(owner), m_callback(nullptr), m_count(count), m_ptr(ptr) { }
+
+		entry_t(const pstring &stname, const void *owner, callback_t *callback)
+		: m_name(stname), m_dt(datatype_t(true)), m_owner(owner), m_callback(callback), m_count(0), m_ptr(nullptr) { }
+
+		~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;
+
+		template<typename T>
+		T *resolved()
+		{
+			if (m_dt.is_ptr)
+				return *static_cast<T **>(m_ptr);
+			else
+				return static_cast<T *>(m_ptr);
+		}
+	};
+
 	pstate_manager_t();
 	~pstate_manager_t();
 
 	template<typename C> void save_item(const void *owner, C &state, const pstring &stname)
 	{
-		save_state_ptr( owner, stname, pstate_datatype<C>::type, sizeof(C), 1, &state, pstate_datatype<C>::is_ptr);
+		save_state_ptr( owner, stname, datatype_f<C>::f(), 1, &state);
 	}
 
 	template<typename C, std::size_t N> void save_item(const void *owner, C (&state)[N], const pstring &stname)
 	{
-		save_state_ptr(owner, stname, pstate_datatype<C>::type, sizeof(state[0]), N, &(state[0]), false);
+		save_state_ptr(owner, stname, datatype_f<C>::f(), N, &(state[0]));
 	}
 
 	template<typename C> void save_item(const void *owner, C *state, const pstring &stname, const int count)
 	{
-		save_state_ptr(owner, stname, pstate_datatype<C>::type, sizeof(C), count, state, false);
+		save_state_ptr(owner, stname, datatype_f<C>::f(), count, state);
 	}
 
 	template<typename C>
@@ -149,17 +121,17 @@ public:
 	void post_load();
 	void remove_save_items(const void *owner);
 
-	const pstate_entry_t::list_t &save_list() const { return m_save; }
+	const entry_t::list_t &save_list() const { return m_save; }
 
-	void save_state_ptr(const void *owner, const pstring &stname, const pstate_data_type_e, const int size, const int count, void *ptr, bool is_ptr);
+	void save_state_ptr(const void *owner, const pstring &stname, const datatype_t dt, const int count, void *ptr);
 
 protected:
 
 private:
-	pstate_entry_t::list_t m_save;
+	entry_t::list_t m_save;
 };
 
-template<> void pstate_manager_t::save_item(const void *owner, pstate_callback_t &state, const pstring &stname);
+template<> void pstate_manager_t::save_item(const void *owner, callback_t &state, const pstring &stname);
 
 template <typename T>
 class pstate_interface_t
@@ -177,13 +149,13 @@ public:
 	{
 		pstate_manager_t &manager = static_cast<T*>(this)->state_manager();
 		pstring module = static_cast<T*>(this)->name();
-		manager.save_state_ptr(this, module + "." + stname, pstate_datatype<C>::type, sizeof(state[0]), N, &(state[0]), false);
+		manager.save_state_ptr(this, module + "." + stname, pstate_manager_t::datatype_f<C>::f(), N, &(state[0]));
 	}
 	template<typename C> void save(C *state, const pstring &stname, const int count)
 	{
 		pstate_manager_t &manager = static_cast<T*>(this)->state_manager();
 		pstring module = static_cast<T*>(this)->name();
-		manager.save_state_ptr(this, module + "." + stname, pstate_datatype<C>::type, sizeof(C), count, state, false);
+		manager.save_state_ptr(this, module + "." + stname, pstate_manager_t::datatype_f<C>::f(), count, state);
 	}
 };
 

From 3c0ae459794ec2b03fcb986b822478a128a603cd Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Sat, 11 Jun 2016 12:15:49 +0200
Subject: [PATCH 08/39] Introduction of state_var object template to be used on
 device state members. (nw)

---
 src/devices/machine/netlist.cpp          | 22 ++++++++++------------
 src/lib/netlist/devices/nld_7490.cpp     | 15 ++++++---------
 src/lib/netlist/devices/nld_7493.cpp     |  9 ++++-----
 src/lib/netlist/devices/nld_9310.cpp     | 15 ++++++---------
 src/lib/netlist/devices/nld_9316.cpp     | 16 ++++++----------
 src/lib/netlist/devices/nld_legacy.cpp   |  5 ++---
 src/lib/netlist/devices/nld_mm5837.cpp   | 11 ++++-------
 src/lib/netlist/devices/nld_ne555.cpp    | 11 ++++-------
 src/lib/netlist/devices/nld_truthtable.h | 21 +++++++++------------
 src/lib/netlist/devices/nlid_system.h    | 20 ++++++++------------
 src/lib/netlist/nl_base.h                | 24 ++++++++++++++++++++++++
 src/lib/netlist/nl_time.h                |  1 -
 src/lib/netlist/plib/pstate.h            | 13 ++++++++++---
 13 files changed, 93 insertions(+), 90 deletions(-)

diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp
index ef925d7632f..7696c2197f3 100644
--- a/src/devices/machine/netlist.cpp
+++ b/src/devices/machine/netlist.cpp
@@ -419,25 +419,23 @@ ATTR_COLD void netlist_mame_device_t::save_state()
 		}
 		else if (s->m_dt.is_integral)
 		{
-			if (s->m_dt.size == sizeof(long long int))
-				save_pointer((long long int *) s->m_ptr, s->m_name.cstr(), s->m_count);
-			else if (s->m_dt.size == sizeof(long int))
-				save_pointer((long int *) s->m_ptr, s->m_name.cstr(), s->m_count);
-			else if (s->m_dt.size == sizeof(int))
-				save_pointer((int *) s->m_ptr, s->m_name.cstr(), s->m_count);
-			else if (s->m_dt.size == sizeof(short))
-				save_pointer((short *) s->m_ptr, s->m_name.cstr(), s->m_count);
-			else if (s->m_dt.size == sizeof(char))
-				save_pointer((char *) s->m_ptr, s->m_name.cstr(), s->m_count);
+			if (s->m_dt.size == sizeof(INT64))
+				save_pointer((INT64 *) s->m_ptr, s->m_name.cstr(), s->m_count);
+			else if (s->m_dt.size == sizeof(INT32))
+				save_pointer((INT32 *) s->m_ptr, s->m_name.cstr(), s->m_count);
+			else if (s->m_dt.size == sizeof(INT16))
+				save_pointer((INT16 *) s->m_ptr, s->m_name.cstr(), s->m_count);
+			else if (s->m_dt.size == sizeof(INT8))
+				save_pointer((INT8 *) s->m_ptr, s->m_name.cstr(), s->m_count);
 			else
-				netlist().log().fatal("Unknown integral type for {1}\n", s->m_name.cstr());
+				netlist().log().fatal("Unknown integral type size {1} for {2}\n", s->m_dt.size, s->m_name.cstr());
 		}
 		else if (s->m_dt.is_custom)
 		{
 			/* do nothing */
 		}
 		else
-			netlist().log().fatal("found unsupported save element %s\n", s->m_name);
+			netlist().log().fatal("found unsupported save element {1}\n", s->m_name);
 	}
 }
 
diff --git a/src/lib/netlist/devices/nld_7490.cpp b/src/lib/netlist/devices/nld_7490.cpp
index c47cc1d94a9..709a7920d3f 100644
--- a/src/lib/netlist/devices/nld_7490.cpp
+++ b/src/lib/netlist/devices/nld_7490.cpp
@@ -21,14 +21,11 @@ namespace netlist
 		, m_R2(*this, "R2")
 		, m_R91(*this, "R91")
 		, m_R92(*this, "R92")
-		, m_cnt(0)
-		, m_last_A(0)
-		, m_last_B(0)
+		, m_cnt(*this, "m_cnt", 0)
+		, m_last_A(*this, "m_last_A", 0)
+		, m_last_B(*this, "m_last_B", 0)
 		, m_Q(*this, {{"QA", "QB", "QC", "QD"}})
 		{
-			save(NLNAME(m_cnt));
-			save(NLNAME(m_last_A));
-			save(NLNAME(m_last_B));
 		}
 
 		NETLIB_UPDATEI();
@@ -44,9 +41,9 @@ namespace netlist
 		logic_input_t m_R91;
 		logic_input_t m_R92;
 
-		UINT8 m_cnt;
-		UINT8 m_last_A;
-		UINT8 m_last_B;
+		state_var<UINT8> m_cnt;
+		state_var<UINT8> m_last_A;
+		state_var<UINT8> m_last_B;
 
 		object_array_t<logic_output_t, 4> m_Q;
 	};
diff --git a/src/lib/netlist/devices/nld_7493.cpp b/src/lib/netlist/devices/nld_7493.cpp
index b60972d8dad..138e65dded1 100644
--- a/src/lib/netlist/devices/nld_7493.cpp
+++ b/src/lib/netlist/devices/nld_7493.cpp
@@ -19,10 +19,9 @@ namespace netlist
 		NETLIB_CONSTRUCTOR(7493ff)
 		, m_I(*this, "CLK")
 		, m_Q(*this, "Q")
+		, m_reset(*this, "m_reset", 0)
+		, m_state(*this, "m_state", 0)
 		{
-
-			save(NLNAME(m_reset));
-			save(NLNAME(m_state));
 		}
 
 		NETLIB_RESETI();
@@ -32,8 +31,8 @@ namespace netlist
 		logic_input_t m_I;
 		logic_output_t m_Q;
 
-		UINT8 m_reset;
-		UINT8 m_state;
+		state_var<UINT8> m_reset;
+		state_var<UINT8> m_state;
 	};
 
 	NETLIB_OBJECT(7493)
diff --git a/src/lib/netlist/devices/nld_9310.cpp b/src/lib/netlist/devices/nld_9310.cpp
index 97c2d2b0a7f..3bacf460892 100644
--- a/src/lib/netlist/devices/nld_9310.cpp
+++ b/src/lib/netlist/devices/nld_9310.cpp
@@ -50,13 +50,10 @@ namespace netlist
 		, m_QC(*this, "QC")
 		, m_QD(*this, "QD")
 		, m_RC(*this, "RC")
-		, m_cnt(0)
-		, m_loadq(0)
-		, m_ent(0)
+		, m_cnt(*this, "m_cnt", 0)
+		, m_loadq(*this, "m_loadq", 0)
+		, m_ent(*this, "m_ent", 0)
 		{
-			save(NLNAME(m_cnt));
-			save(NLNAME(m_loadq));
-			save(NLNAME(m_ent));
 		}
 		NETLIB_RESETI();
 		NETLIB_UPDATEI();
@@ -73,9 +70,9 @@ namespace netlist
 		logic_output_t m_QC;
 		logic_output_t m_QD;
 		logic_output_t m_RC;
-		UINT8 m_cnt;
-		netlist_sig_t m_loadq;
-		netlist_sig_t m_ent;
+		state_var<UINT8> m_cnt;
+		state_var<netlist_sig_t> m_loadq;
+		state_var<netlist_sig_t> m_ent;
 	};
 
 	NETLIB_OBJECT(9310)
diff --git a/src/lib/netlist/devices/nld_9316.cpp b/src/lib/netlist/devices/nld_9316.cpp
index 287a9b6669d..3083b77ba6a 100644
--- a/src/lib/netlist/devices/nld_9316.cpp
+++ b/src/lib/netlist/devices/nld_9316.cpp
@@ -49,15 +49,11 @@ namespace netlist
 		, m_QC(*this, "QC")
 		, m_QD(*this, "QD")
 		, m_RC(*this, "RC")
-		, m_cnt(0)
 		, m_ABCD(nullptr)
-		, m_loadq(0)
-		, m_ent(0)
+		, m_cnt(*this, "m_cnt", 0)
+		, m_loadq(*this, "m_loadq", 0)
+		, m_ent(*this, "m_ent", 0)
 		{
-
-			save(NLNAME(m_cnt));
-			save(NLNAME(m_loadq));
-			save(NLNAME(m_ent));
 		}
 
 		NETLIB_RESETI();
@@ -75,10 +71,10 @@ namespace netlist
 		logic_output_t m_QD;
 		logic_output_t m_RC;
 
-		UINT8 m_cnt;
 		NETLIB_NAME(9316_subABCD) *m_ABCD;
-		netlist_sig_t m_loadq;
-		netlist_sig_t m_ent;
+		state_var<UINT8> m_cnt;
+		state_var<netlist_sig_t> m_loadq;
+		state_var<netlist_sig_t> m_ent;
 	};
 
 	NETLIB_OBJECT(9316)
diff --git a/src/lib/netlist/devices/nld_legacy.cpp b/src/lib/netlist/devices/nld_legacy.cpp
index aaf7c9e25a3..f3675468513 100644
--- a/src/lib/netlist/devices/nld_legacy.cpp
+++ b/src/lib/netlist/devices/nld_legacy.cpp
@@ -42,9 +42,8 @@ namespace netlist
 		, m_Q(*this, "2")
 		, m_L_to_H(*this, "L_TO_H", 10)
 		, m_H_to_L(*this, "H_TO_L", 10)
-		, m_last(0)
+		, m_last(*this, "m_last", 0)
 		{
-			save(NLNAME(m_last));
 		}
 
 		//NETLIB_UPDATE_PARAMI();
@@ -58,7 +57,7 @@ namespace netlist
 		param_int_t m_L_to_H;
 		param_int_t m_H_to_L;
 
-		UINT8 m_last;
+		state_var<UINT8> m_last;
 	};
 
 	NETLIB_RESET(nicRSFF)
diff --git a/src/lib/netlist/devices/nld_mm5837.cpp b/src/lib/netlist/devices/nld_mm5837.cpp
index 9624bec2621..c41c58adbae 100644
--- a/src/lib/netlist/devices/nld_mm5837.cpp
+++ b/src/lib/netlist/devices/nld_mm5837.cpp
@@ -28,10 +28,10 @@ namespace netlist
 		/* clock */
 		, m_feedback(*this, "FB")
 		, m_Q(*this, "Q")
-		, m_inc(0, 1)
+		, m_inc(netlist_time::from_hz(56000))
+		, m_shift(*this, "m_shift", 0)
 		, m_is_timestep(false)
 		{
-			m_inc = netlist_time::from_hz(56000);
 			connect_late(m_feedback, m_Q);
 
 			/* output */
@@ -41,9 +41,6 @@ namespace netlist
 
 			/* device */
 			register_subalias("3", m_RV.m_P);
-
-			save(NLNAME(m_shift));
-
 		}
 
 		NETLIB_RESETI();
@@ -61,10 +58,10 @@ namespace netlist
 		/* clock stage */
 		logic_input_t m_feedback;
 		logic_output_t m_Q;
-		netlist_time m_inc;
+		const netlist_time m_inc;
 
 		/* state */
-		UINT32 m_shift;
+		state_var<UINT32> m_shift;
 
 		/* cache */
 		bool m_is_timestep;
diff --git a/src/lib/netlist/devices/nld_ne555.cpp b/src/lib/netlist/devices/nld_ne555.cpp
index 2197beea776..e2553099cbd 100644
--- a/src/lib/netlist/devices/nld_ne555.cpp
+++ b/src/lib/netlist/devices/nld_ne555.cpp
@@ -28,8 +28,8 @@ namespace netlist
 		, m_THRES(*this, "THRESH")    // Pin 6
 		, m_TRIG(*this, "TRIG")       // Pin 2
 		, m_OUT(*this, "OUT")         // Pin 3
-		, m_last_out(false)
-		, m_ff(false)
+		, m_last_out(*this, "m_last_out", false)
+		, m_ff(*this, "m_ff", false)
 		{
 
 			register_subalias("GND",  m_R3.m_N);    // Pin 1
@@ -40,9 +40,6 @@ namespace netlist
 			connect_late(m_R1.m_N, m_R2.m_P);
 			connect_late(m_R2.m_N, m_R3.m_P);
 			connect_late(m_RDIS.m_N, m_R3.m_N);
-
-			save(NLNAME(m_last_out));
-			save(NLNAME(m_ff));
 		}
 
 		NETLIB_UPDATEI();
@@ -60,8 +57,8 @@ namespace netlist
 		analog_output_t m_OUT;
 
 	private:
-		bool m_last_out;
-		bool m_ff;
+		state_var<bool> m_last_out;
+		state_var<bool> m_ff;
 
 		inline nl_double clamp(const nl_double v, const nl_double a, const nl_double b);
 
diff --git a/src/lib/netlist/devices/nld_truthtable.h b/src/lib/netlist/devices/nld_truthtable.h
index 200e00554c4..2d439de4f6b 100644
--- a/src/lib/netlist/devices/nld_truthtable.h
+++ b/src/lib/netlist/devices/nld_truthtable.h
@@ -180,9 +180,9 @@ namespace netlist
 				truthtable_t *ttp, const char *desc[])
 		: device_t(owner, name)
 		, m_fam(*this, fam)
-		, m_last_state(0)
-		, m_ign(0)
-		, m_active(1)
+		, m_last_state(*this, "m_last_state", 0)
+		, m_ign(*this, "m_ign", 0)
+		, m_active(*this, "m_active", 1)
 		, m_ttp(ttp)
 		{
 			while (*desc != nullptr && **desc != 0 )
@@ -198,9 +198,9 @@ namespace netlist
 				truthtable_t *ttp, const plib::pstring_vector_t &desc)
 		: device_t(owner, name)
 		, m_fam(*this, fam)
-		, m_last_state(0)
-		, m_ign(0)
-		, m_active(1)
+		, m_last_state(*this, "m_last_state", 0)
+		, m_ign(*this, "m_ign", 0)
+		, m_active(*this, "m_active", 1)
 		, m_ttp(ttp)
 		{
 			m_desc = desc;
@@ -260,9 +260,6 @@ namespace netlist
 			for (int k=0; m_ttp.m_timing_nt[k] != netlist_time::zero(); k++)
 				printf("%d %f\n", k, m_ttp.m_timing_nt[k].as_double() * 1000000.0);
 	#endif
-			save(NLNAME(m_last_state));
-			save(NLNAME(m_ign));
-			save(NLNAME(m_active));
 		}
 
 		NETLIB_RESETI()
@@ -389,9 +386,9 @@ namespace netlist
 			}
 		}
 
-		UINT32 m_last_state;
-		UINT32 m_ign;
-		INT32 m_active;
+		state_var<UINT32> m_last_state;
+		state_var<UINT32> m_ign;
+		state_var<INT32> m_active;
 
 		truthtable_t *m_ttp;
 		plib::pstring_vector_t m_desc;
diff --git a/src/lib/netlist/devices/nlid_system.h b/src/lib/netlist/devices/nlid_system.h
index 17d9d820de4..938d14c7d3f 100644
--- a/src/lib/netlist/devices/nlid_system.h
+++ b/src/lib/netlist/devices/nlid_system.h
@@ -119,6 +119,8 @@ namespace netlist
 		, m_offset(*this, "OFFSET", 0.0)
 		, m_feedback(*this, "FB")
 		, m_Q(*this, "Q")
+		, m_cnt(*this, "m_cnt", 0)
+		, m_off(*this, "m_off", netlist_time::zero())
 		{
 			m_inc[0] = netlist_time::from_hz(m_freq.Value()*2);
 
@@ -144,8 +146,6 @@ namespace netlist
 				}
 				m_inc[m_size - 1] = base * total - ttotal;
 			}
-			save(NLNAME(m_cnt));
-			save(NLNAME(m_off));
 		}
 		NETLIB_UPDATEI();
 		NETLIB_RESETI();
@@ -159,8 +159,8 @@ namespace netlist
 		logic_input_t m_feedback;
 		logic_output_t m_Q;
 		netlist_time m_inc[32];
-		unsigned m_cnt;
-		netlist_time m_off;
+		state_var<unsigned> m_cnt;
+		state_var<netlist_time> m_off;
 		unsigned m_size;
 	};
 
@@ -392,12 +392,10 @@ namespace netlist
 		, m_I(*this, "I")
 		, m_RON(*this, "RON", 1.0)
 		, m_ROFF(*this, "ROFF", 1.0E20)
-		, m_last_state(0)
+		, m_last_state(*this, "m_last_state", 0)
 		{
 			register_subalias("1", m_R.m_P);
 			register_subalias("2", m_R.m_N);
-
-			save(NLNAME(m_last_state));
 		}
 
 		NETLIB_SUB(R) m_R;
@@ -415,7 +413,7 @@ namespace netlist
 
 	private:
 
-		UINT8 m_last_state;
+		state_var<UINT8> m_last_state;
 	};
 
 	// -----------------------------------------------------------------------------
@@ -518,7 +516,7 @@ namespace netlist
 		: nld_base_d_to_a_proxy(anetlist, name, out_proxied, m_RV.m_P)
 		, m_GNDHack(*this, "_Q")
 		, m_RV(*this, "RV")
-		, m_last_state(-1)
+		, m_last_state(*this, "m_last_var", -1)
 		, m_is_timestep(false)
 		{
 			//register_sub(m_RV);
@@ -528,8 +526,6 @@ namespace netlist
 			register_subalias("Q", m_RV.m_P);
 
 			connect_late(m_RV.m_N, m_GNDHack);
-
-			save(NLNAME(m_last_state));
 		}
 
 		virtual ~nld_d_to_a_proxy() {}
@@ -542,7 +538,7 @@ namespace netlist
 	private:
 		analog_output_t m_GNDHack;  // FIXME: Long term, we need to connect proxy gnd to device gnd
 		NETLIB_SUB(twoterm) m_RV;
-		int m_last_state;
+		state_var<int> m_last_state;
 		bool m_is_timestep;
 	};
 
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 39be8878198..0af818d6206 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -1124,6 +1124,30 @@ protected:
 		plib::dynlib *m_lib;                 // external lib needs to be loaded as long as netlist exists
 	};
 
+	template <typename T>
+	struct state_var
+	{
+	public:
+		state_var(device_t &d, const pstring name, T value)
+		: m_value(value)
+		{
+			d.save(m_value, name);
+		}
+
+		state_var(const state_var &rhs) NOEXCEPT = default;
+		state_var(state_var &&rhs) NOEXCEPT = default;
+		state_var &operator=(const state_var rhs) { m_value = rhs.m_value; return *this; }
+		state_var &operator=(const T rhs) { m_value = rhs; return *this; }
+
+
+		operator T &() { return m_value; }
+		operator const T &() const { return m_value; }
+	private:
+		T m_value;
+	};
+
+
+
 	// -----------------------------------------------------------------------------
 	// Support classes for devices
 	// -----------------------------------------------------------------------------
diff --git a/src/lib/netlist/nl_time.h b/src/lib/netlist/nl_time.h
index 384b12bf583..90182d66b54 100644
--- a/src/lib/netlist/nl_time.h
+++ b/src/lib/netlist/nl_time.h
@@ -45,7 +45,6 @@ namespace netlist
 		constexpr explicit netlist_time(const INTERNALTYPE nom, const INTERNALTYPE den)
 		: m_time(nom * (RESOLUTION / den)) { }
 
-
 		netlist_time &operator=(const netlist_time rhs) { m_time = rhs.m_time; return *this; }
 
 		netlist_time &operator+=(const netlist_time &rhs) { m_time += rhs.m_time; return *this; }
diff --git a/src/lib/netlist/plib/pstate.h b/src/lib/netlist/plib/pstate.h
index fc8bfaaafb0..3c101a00823 100644
--- a/src/lib/netlist/plib/pstate.h
+++ b/src/lib/netlist/plib/pstate.h
@@ -30,7 +30,7 @@ public:
 		: size(bsize), is_ptr(bptr), is_integral(bintegral), is_float(bfloat), is_custom(false)
 		{}
 		datatype_t(bool bcustom)
-		: size(0), is_ptr(false), is_integral(false), is_float(false), is_custom(true)
+		: size(0), is_ptr(false), is_integral(false), is_float(false), is_custom(bcustom)
 		{}
 
 		const std::size_t size;
@@ -42,12 +42,19 @@ public:
 
 	template<typename T> struct datatype_f
 	{
-		static inline const datatype_t f() { return datatype_t(false, sizeof(T), std::is_integral<T>::value, std::is_floating_point<T>::value); }
+		static inline const datatype_t f()
+		{
+			return datatype_t(sizeof(T), false, std::is_integral<T>::value || std::is_enum<T>::value,
+					std::is_floating_point<T>::value); }
 	};
 
 	template<typename T> struct datatype_f<T *>
 	{
-		static inline const datatype_t f() { return datatype_t(true, sizeof(T), std::is_integral<T>::value, std::is_floating_point<T>::value); }
+		static inline const datatype_t f()
+		{
+			return datatype_t(sizeof(T), true, std::is_integral<T>::value || std::is_enum<T>::value,
+					std::is_floating_point<T>::value);
+		}
 	};
 
 	class callback_t

From 217b67c5f2e78e37417189fe1e18f34df99823f3 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Sat, 11 Jun 2016 15:20:49 +0200
Subject: [PATCH 09/39] Changed remaining save occurrences to state_var. (nw)

---
 src/lib/netlist/analog/nld_bjt.h           | 21 ++++------
 src/lib/netlist/analog/nld_twoterm.cpp     | 21 +++++-----
 src/lib/netlist/analog/nld_twoterm.h       | 13 +++---
 src/lib/netlist/devices/nld_4020.cpp       |  5 +--
 src/lib/netlist/devices/nld_74107.cpp      | 16 +++-----
 src/lib/netlist/devices/nld_74123.cpp      | 13 +++---
 src/lib/netlist/devices/nld_74153.cpp      |  5 +--
 src/lib/netlist/devices/nld_74175.cpp      |  9 ++--
 src/lib/netlist/devices/nld_74192.cpp      | 13 +++---
 src/lib/netlist/devices/nld_74193.cpp      | 16 +++-----
 src/lib/netlist/devices/nld_7448.cpp       |  5 +--
 src/lib/netlist/devices/nld_7474.cpp       |  6 +--
 src/lib/netlist/devices/nld_7483.cpp       |  5 +--
 src/lib/netlist/devices/nld_74ls629.cpp    | 16 +++-----
 src/lib/netlist/devices/nld_82S16.cpp      |  4 +-
 src/lib/netlist/nl_base.h                  | 32 ++++++++++++---
 src/lib/netlist/solver/nld_matrix_solver.h | 48 +++++++++-------------
 src/lib/netlist/solver/nld_ms_direct.h     |  8 +---
 src/lib/netlist/solver/nld_ms_sm.h         |  9 +---
 src/lib/netlist/solver/nld_ms_sor.h        |  5 +--
 src/lib/netlist/solver/nld_ms_sor_mat.h    | 24 +++++------
 src/lib/netlist/solver/nld_ms_w.h          |  9 +---
 src/lib/netlist/solver/nld_solver.cpp      | 10 ++---
 23 files changed, 139 insertions(+), 174 deletions(-)

diff --git a/src/lib/netlist/analog/nld_bjt.h b/src/lib/netlist/analog/nld_bjt.h
index e8b80b94b4c..bb9f6863ec1 100644
--- a/src/lib/netlist/analog/nld_bjt.h
+++ b/src/lib/netlist/analog/nld_bjt.h
@@ -105,7 +105,7 @@ NETLIB_OBJECT_DERIVED(QBJT_switch, QBJT)
 		, m_gB(NETLIST_GMIN_DEFAULT)
 		, m_gC(NETLIST_GMIN_DEFAULT)
 		, m_V(0.0)
-		, m_state_on(0)
+		, m_state_on(*this, "m_state_on", 0)
 	{
 		register_subalias("B", m_RB.m_P);
 		register_subalias("E", m_RB.m_N);
@@ -119,8 +119,6 @@ NETLIB_OBJECT_DERIVED(QBJT_switch, QBJT)
 
 		connect_late(m_RB.m_P, m_BC_dummy.m_P);
 		connect_late(m_RC.m_P, m_BC_dummy.m_N);
-
-		save(NLNAME(m_state_on));
 	}
 
 	NETLIB_RESETI();
@@ -141,7 +139,7 @@ protected:
 	nl_double m_gB; // base conductance / switch on
 	nl_double m_gC; // collector conductance / switch on
 	nl_double m_V; // internal voltage source
-	UINT8 m_state_on;
+	state_var<unsigned> m_state_on;
 
 private:
 };
@@ -155,11 +153,13 @@ NETLIB_OBJECT_DERIVED(QBJT_EB, QBJT)
 {
 public:
 	NETLIB_CONSTRUCTOR_DERIVED(QBJT_EB, QBJT)
-		,   m_D_CB(*this, "m_D_CB", true)
-		,   m_D_EB(*this, "m_D_EB", true)
-		,   m_D_EC(*this, "m_D_EC", true)
-		,   m_alpha_f(0)
-		,   m_alpha_r(0)
+	, m_gD_BC(*this, "m_D_BC")
+	, m_gD_BE(*this, "m_D_BE")
+	, m_D_CB(*this, "m_D_CB", true)
+	, m_D_EB(*this, "m_D_EB", true)
+	, m_D_EC(*this, "m_D_EC", true)
+	, m_alpha_f(0)
+	, m_alpha_r(0)
 	{
 		register_subalias("E", m_D_EB.m_P);   // Cathode
 		register_subalias("B", m_D_EB.m_N);   // Anode
@@ -173,9 +173,6 @@ public:
 		connect_late(m_D_EB.m_P, m_D_EC.m_P);
 		connect_late(m_D_EB.m_N, m_D_CB.m_N);
 		connect_late(m_D_CB.m_P, m_D_EC.m_N);
-
-		m_gD_BE.save("m_D_BE", *this);
-		m_gD_BC.save("m_D_BC", *this);
 	}
 
 protected:
diff --git a/src/lib/netlist/analog/nld_twoterm.cpp b/src/lib/netlist/analog/nld_twoterm.cpp
index 9a526c4c174..0460d6f2e71 100644
--- a/src/lib/netlist/analog/nld_twoterm.cpp
+++ b/src/lib/netlist/analog/nld_twoterm.cpp
@@ -19,12 +19,18 @@ namespace netlist
 // generic_diode
 // ----------------------------------------------------------------------------------------
 
-generic_diode::generic_diode()
+generic_diode::generic_diode(device_t &dev, pstring name)
+	: m_Vd(dev, name + ".m_Vd", 0.7)
+	, m_Id(dev, name + ".m_Id", 0.0)
+	, m_G(dev,  name + ".m_G", 1e-15)
+	, m_Vt(0.0)
+	, m_Is(0.0)
+	, m_n(0.0)
+	, m_gmin(1e-15)
+	, m_VtInv(0.0)
+	, m_Vcrit(0.0)
 {
-	m_Vd = 0.7;
 	set_param(1e-15, 1, 1e-15);
-	m_G = m_gmin;
-	m_Id = 0.0;
 }
 
 void generic_diode::set_param(const nl_double Is, const nl_double n, nl_double gmin)
@@ -40,13 +46,6 @@ void generic_diode::set_param(const nl_double Is, const nl_double n, nl_double g
 	m_VtInv = 1.0 / m_Vt;
 }
 
-void generic_diode::save(pstring name, object_t &parent)
-{
-	parent.save(m_Vd, name + ".m_Vd");
-	parent.save(m_Id, name + ".m_Id");
-	parent.save(m_G, name + ".m_G");
-}
-
 // ----------------------------------------------------------------------------------------
 // nld_twoterm
 // ----------------------------------------------------------------------------------------
diff --git a/src/lib/netlist/analog/nld_twoterm.h b/src/lib/netlist/analog/nld_twoterm.h
index d94b1498a53..0b9f68b7fdd 100644
--- a/src/lib/netlist/analog/nld_twoterm.h
+++ b/src/lib/netlist/analog/nld_twoterm.h
@@ -311,7 +311,7 @@ private:
 class generic_diode
 {
 public:
-	generic_diode();
+	generic_diode(device_t &dev, pstring name);
 
 	inline void update_diode(const nl_double nVd)
 	{
@@ -360,12 +360,10 @@ public:
 
 	/* owning object must save those ... */
 
-	void save(pstring name, object_t &parent);
-
 private:
-	nl_double m_Vd;
-	nl_double m_Id;
-	nl_double m_G;
+	state_var<nl_double> m_Vd;
+	state_var<nl_double> m_Id;
+	state_var<nl_double> m_G;
 
 	nl_double m_Vt;
 	nl_double m_Is;
@@ -385,11 +383,10 @@ NETLIB_OBJECT_DERIVED(D, twoterm)
 public:
 	NETLIB_CONSTRUCTOR_DERIVED(D, twoterm)
 	, m_model(*this, "MODEL", "")
+	, m_D(*this, "m_D")
 	{
 		register_subalias("A", m_P);
 		register_subalias("K", m_N);
-
-		m_D.save("m_D", *this);
 	}
 
 	NETLIB_DYNAMIC()
diff --git a/src/lib/netlist/devices/nld_4020.cpp b/src/lib/netlist/devices/nld_4020.cpp
index 93916c344bc..f0e79ece754 100644
--- a/src/lib/netlist/devices/nld_4020.cpp
+++ b/src/lib/netlist/devices/nld_4020.cpp
@@ -22,9 +22,8 @@ namespace netlist
 		, m_IP(*this, "IP")
 		, m_Q(*this, {{"Q1", "_Q2", "_Q3", "Q4", "Q5", "Q6", "Q7", "Q8", "Q9",
 				"Q10", "Q11", "Q12", "Q13", "Q14"}})
-		, m_cnt(0)
+		, m_cnt(*this, "m_cnt", 0)
 		{
-			save(NLNAME(m_cnt));
 		}
 
 		NETLIB_RESETI()
@@ -41,7 +40,7 @@ namespace netlist
 		logic_input_t m_IP;
 		object_array_t<logic_output_t, 14> m_Q;
 
-		UINT16 m_cnt;
+		state_var<unsigned> m_cnt;
 	};
 
 	NETLIB_OBJECT(CD4020)
diff --git a/src/lib/netlist/devices/nld_74107.cpp b/src/lib/netlist/devices/nld_74107.cpp
index 4dfa8b9aa8a..c6adf487db9 100644
--- a/src/lib/netlist/devices/nld_74107.cpp
+++ b/src/lib/netlist/devices/nld_74107.cpp
@@ -18,14 +18,10 @@ namespace netlist
 		, m_clk(*this, "CLK")
 		, m_Q(*this, "Q")
 		, m_QQ(*this, "QQ")
-		, m_Q1(0)
-		, m_Q2(0)
-		, m_F(0)
-
+		, m_Q1(*this, "m_Q1", 0)
+		, m_Q2(*this, "m_Q2", 0)
+		, m_F(*this, "m_F", 0)
 		{
-			save(NLNAME(m_Q1));
-			save(NLNAME(m_Q2));
-			save(NLNAME(m_F));
 		}
 
 		NETLIB_RESETI();
@@ -37,9 +33,9 @@ namespace netlist
 		logic_output_t m_Q;
 		logic_output_t m_QQ;
 
-		netlist_sig_t m_Q1;
-		netlist_sig_t m_Q2;
-		netlist_sig_t m_F;
+		state_var<netlist_sig_t> m_Q1;
+		state_var<netlist_sig_t> m_Q2;
+		state_var<netlist_sig_t> m_F;
 
 		void newstate(const netlist_sig_t state);
 
diff --git a/src/lib/netlist/devices/nld_74123.cpp b/src/lib/netlist/devices/nld_74123.cpp
index 943fd3e14df..29cd3cd97ac 100644
--- a/src/lib/netlist/devices/nld_74123.cpp
+++ b/src/lib/netlist/devices/nld_74123.cpp
@@ -32,6 +32,9 @@ namespace netlist
 		, m_Q(*this, "Q")
 		, m_QQ(*this, "QQ")
 		, m_CV(*this, "_CV") // internal
+		, m_last_trig(*this, "m_last_trig", 0)
+		, m_state(*this, "m_state", 0)
+		, m_KP(*this, "m_KP", 0)
 		, m_K(*this, "K", (m_dev_type == 4538) ? 0.4 : 0.4)
 		, m_RI(*this, "RI", 400.0) // around 250 for HC series, 400 on LS/TTL, estimated from datasheets
 		{
@@ -49,10 +52,6 @@ namespace netlist
 
 			connect_late(m_RN.m_R.m_P, m_RP.m_R.m_N);
 			connect_late(m_CV, m_RN.m_R.m_P);
-
-			save(NLNAME(m_last_trig));
-			save(NLNAME(m_state));
-			save(NLNAME(m_KP));
 		}
 
 		NETLIB_RESETI();
@@ -75,9 +74,9 @@ namespace netlist
 
 		analog_input_t m_CV;
 
-		netlist_sig_t m_last_trig;
-		UINT8         m_state;
-		double        m_KP;
+		state_var<netlist_sig_t> m_last_trig;
+		state_var<unsigned>      m_state;
+		state_var<double>        m_KP;
 
 		param_double_t m_K;
 		param_double_t m_RI;
diff --git a/src/lib/netlist/devices/nld_74153.cpp b/src/lib/netlist/devices/nld_74153.cpp
index 32497c627e3..bd95659e76a 100644
--- a/src/lib/netlist/devices/nld_74153.cpp
+++ b/src/lib/netlist/devices/nld_74153.cpp
@@ -23,9 +23,8 @@ namespace netlist
 		, m_C(*this, {{"C0", "C1", "C2", "C3"}})
 		, m_G(*this, "G")
 		, m_Y(*this, "AY") //FIXME: Change netlists
-		, m_chan(0)
+		, m_chan(*this, "m_chan", 0)
 		{
-			save(NLNAME(m_chan));
 		}
 
 		NETLIB_RESETI();
@@ -37,7 +36,7 @@ namespace netlist
 
 		logic_output_t m_Y;
 
-		int m_chan;
+		state_var<unsigned> m_chan;
 	};
 
 	NETLIB_OBJECT(74153)
diff --git a/src/lib/netlist/devices/nld_74175.cpp b/src/lib/netlist/devices/nld_74175.cpp
index 79c4fb85d1a..66d98451ad4 100644
--- a/src/lib/netlist/devices/nld_74175.cpp
+++ b/src/lib/netlist/devices/nld_74175.cpp
@@ -18,10 +18,9 @@ namespace netlist
 		, m_CLK(*this, "CLK")
 		, m_Q(*this, {{"Q1", "Q2", "Q3", "Q4"}})
 		, m_QQ(*this, {{"Q1Q", "Q2Q", "Q3Q", "Q4Q"}})
-		, m_data(0)
+		, m_clrq(*this, "m_clr", 0)
+		, m_data(*this, "m_data", 0)
 		{
-			save(NLNAME(m_clrq));
-			save(NLNAME(m_data));
 		}
 
 		NETLIB_RESETI();
@@ -32,8 +31,8 @@ namespace netlist
 		object_array_t<logic_output_t, 4> m_Q;
 		object_array_t<logic_output_t, 4> m_QQ;
 
-		netlist_sig_t m_clrq;
-		UINT8 m_data;
+		state_var<netlist_sig_t> m_clrq;
+		state_var<unsigned>      m_data;
 	};
 
 	NETLIB_OBJECT(74175)
diff --git a/src/lib/netlist/devices/nld_74192.cpp b/src/lib/netlist/devices/nld_74192.cpp
index cc0260fd99a..216fc75224c 100644
--- a/src/lib/netlist/devices/nld_74192.cpp
+++ b/src/lib/netlist/devices/nld_74192.cpp
@@ -48,6 +48,9 @@ namespace netlist
 		, m_LOADQ(*this, "LOADQ")
 		, m_CU(*this, "CU")
 		, m_CD(*this, "CD")
+		, m_cnt(*this, "m_cnt", 0)
+		, m_last_CU(*this, "m_last_CU", 0)
+		, m_last_CD(*this, "m_last_CD", 0)
 		, m_Q(*this, {{"QA", "QB", "QC", "QD"}})
 		, m_BORROWQ(*this, "BORROWQ")
 		, m_CARRYQ(*this, "CARRYQ")
@@ -56,10 +59,6 @@ namespace netlist
 			register_subalias("B", m_ABCD.m_B);
 			register_subalias("C", m_ABCD.m_C);
 			register_subalias("D", m_ABCD.m_D);
-
-			save(NLNAME(m_cnt));
-			save(NLNAME(m_last_CU));
-			save(NLNAME(m_last_CD));
 		}
 
 		NETLIB_RESETI();
@@ -72,9 +71,9 @@ namespace netlist
 		logic_input_t m_CU;
 		logic_input_t m_CD;
 
-		INT8 m_cnt;
-		UINT8 m_last_CU;
-		UINT8 m_last_CD;
+		state_var<int> m_cnt;
+		state_var<unsigned> m_last_CU;
+		state_var<unsigned> m_last_CD;
 
 		object_array_t<logic_output_t, 4> m_Q;
 		logic_output_t m_BORROWQ;
diff --git a/src/lib/netlist/devices/nld_74193.cpp b/src/lib/netlist/devices/nld_74193.cpp
index 0742ff1ce54..264c348e656 100644
--- a/src/lib/netlist/devices/nld_74193.cpp
+++ b/src/lib/netlist/devices/nld_74193.cpp
@@ -25,17 +25,13 @@ namespace netlist
 		, m_LOADQ(*this, "LOADQ")
 		, m_CU(*this, "CU")
 		, m_CD(*this, "CD")
-		, m_cnt(0)
-		, m_last_CU(0)
-		, m_last_CD(0)
+		, m_cnt(*this, "m_cnt", 0)
+		, m_last_CU(*this, "m_last_CU", 0)
+		, m_last_CD(*this, "m_last_CD", 0)
 		, m_Q(*this, {{"QA", "QB", "QC", "QD"}})
 		, m_BORROWQ(*this, "BORROWQ")
 		, m_CARRYQ(*this, "CARRYQ")
 		{
-
-			save(NLNAME(m_cnt));
-			save(NLNAME(m_last_CU));
-			save(NLNAME(m_last_CD));
 		}
 
 		NETLIB_RESETI();
@@ -51,9 +47,9 @@ namespace netlist
 		logic_input_t m_CU;
 		logic_input_t m_CD;
 
-		INT8 m_cnt;
-		UINT8 m_last_CU;
-		UINT8 m_last_CD;
+		state_var<int> m_cnt;
+		state_var<unsigned> m_last_CU;
+		state_var<unsigned> m_last_CD;
 
 		object_array_t<logic_output_t, 4> m_Q;
 		logic_output_t m_BORROWQ;
diff --git a/src/lib/netlist/devices/nld_7448.cpp b/src/lib/netlist/devices/nld_7448.cpp
index edb11783d2e..88ccaffe83d 100644
--- a/src/lib/netlist/devices/nld_7448.cpp
+++ b/src/lib/netlist/devices/nld_7448.cpp
@@ -37,10 +37,9 @@ namespace netlist
 		, m_LTQ(*this, "LTQ")
 		, m_BIQ(*this, "BIQ")
 		, m_RBIQ(*this, "RBIQ")
-		, m_state(0)
+		, m_state(*this, "m_state", 0)
 		, m_Q(*this, {{"a", "b", "c", "d", "e", "f", "g"}})
 		{
-			save(NLNAME(m_state));
 		}
 
 		NETLIB_RESETI();
@@ -58,7 +57,7 @@ namespace netlist
 		logic_input_t m_BIQ;
 		logic_input_t m_RBIQ;
 
-		UINT8 m_state;
+		state_var<unsigned> m_state;
 
 		object_array_t<logic_output_t, 7> m_Q;  /* a .. g */
 
diff --git a/src/lib/netlist/devices/nld_7474.cpp b/src/lib/netlist/devices/nld_7474.cpp
index 55355d83cad..2d662ab73db 100644
--- a/src/lib/netlist/devices/nld_7474.cpp
+++ b/src/lib/netlist/devices/nld_7474.cpp
@@ -18,10 +18,8 @@ namespace netlist
 		, m_CLK(*this, "CLK")
 		, m_Q(*this, "Q")
 		, m_QQ(*this, "QQ")
-		, m_nextD(0)
+		, m_nextD(*this, "m_nextD", 0)
 		{
-
-			save(NLNAME(m_nextD));
 		}
 
 		NETLIB_RESETI();
@@ -31,7 +29,7 @@ namespace netlist
 		logic_input_t m_CLK;
 		logic_output_t m_Q;
 		logic_output_t m_QQ;
-		INT8 m_nextD;
+		state_var<unsigned> m_nextD;
 
 		inline void newstate(const UINT8 stateQ, const UINT8 stateQQ);
 
diff --git a/src/lib/netlist/devices/nld_7483.cpp b/src/lib/netlist/devices/nld_7483.cpp
index db23f26d563..a34c2b832c8 100644
--- a/src/lib/netlist/devices/nld_7483.cpp
+++ b/src/lib/netlist/devices/nld_7483.cpp
@@ -24,14 +24,13 @@ namespace netlist
 		, m_B2(*this, "B2")
 		, m_B3(*this, "B3")
 		, m_B4(*this, "B4")
-		, m_lastr(0)
+		, m_lastr(*this, "m_lastr", 0)
 		, m_S1(*this, "S1")
 		, m_S2(*this, "S2")
 		, m_S3(*this, "S3")
 		, m_S4(*this, "S4")
 		, m_C4(*this, "C4")
 		{
-			save(NLNAME(m_lastr));
 		}
 		NETLIB_RESETI();
 		NETLIB_UPDATEI();
@@ -47,7 +46,7 @@ namespace netlist
 		logic_input_t m_B3;
 		logic_input_t m_B4;
 
-		UINT8 m_lastr;
+		state_var<unsigned> m_lastr;
 
 		logic_output_t m_S1;
 		logic_output_t m_S2;
diff --git a/src/lib/netlist/devices/nld_74ls629.cpp b/src/lib/netlist/devices/nld_74ls629.cpp
index eb9fbd7f712..bd8127f068c 100644
--- a/src/lib/netlist/devices/nld_74ls629.cpp
+++ b/src/lib/netlist/devices/nld_74ls629.cpp
@@ -52,15 +52,11 @@ namespace netlist
 		NETLIB_CONSTRUCTOR(SN74LS629clk)
 		, m_FB(*this, "FB")
 		, m_Y(*this, "Y")
-		, m_enableq(1)
-		, m_out(0)
-		, m_inc(netlist_time::zero())
+		, m_enableq(*this, "m_enableq", 1)
+		, m_out(*this, "m_out", 0)
+		, m_inc(*this, "m_inc", netlist_time::zero())
 		{
 			connect_late(m_FB, m_Y);
-
-			save(NLNAME(m_enableq));
-			save(NLNAME(m_inc));
-			save(NLNAME(m_out));
 		}
 
 		NETLIB_RESETI()
@@ -76,9 +72,9 @@ namespace netlist
 		logic_input_t m_FB;
 		logic_output_t m_Y;
 
-		netlist_sig_t m_enableq;
-		netlist_sig_t m_out;
-		netlist_time m_inc;
+		state_var<netlist_sig_t> m_enableq;
+		state_var<netlist_sig_t> m_out;
+		state_var<netlist_time> m_inc;
 	};
 
 	NETLIB_OBJECT(SN74LS629)
diff --git a/src/lib/netlist/devices/nld_82S16.cpp b/src/lib/netlist/devices/nld_82S16.cpp
index 9b3e32cd291..aa7e2da3765 100644
--- a/src/lib/netlist/devices/nld_82S16.cpp
+++ b/src/lib/netlist/devices/nld_82S16.cpp
@@ -22,8 +22,8 @@ namespace netlist
 		, m_WEQ(*this, "WEQ")
 		, m_DIN(*this, "DIN")
 		, m_DOUTQ(*this, "DOUTQ")
+		, m_ram(*this, "m_ram", 0)
 		{
-			save(NLNAME(m_ram));
 		}
 
 		NETLIB_RESETI();
@@ -39,7 +39,7 @@ namespace netlist
 		logic_output_t m_DOUTQ;
 
 		//netlist_state_t<UINT8[256]> m_ram;
-		UINT64 m_ram[4]; // 256 bits
+		state_var<UINT64[4]> m_ram; // 256 bits
 	};
 
 	NETLIB_OBJECT_DERIVED(82S16_dip, 82S16)
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 0af818d6206..612603827b9 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -1128,24 +1128,44 @@ protected:
 	struct state_var
 	{
 	public:
-		state_var(device_t &d, const pstring name, T value)
+		state_var(device_t &dev, const pstring name, const T &value)
 		: m_value(value)
 		{
-			d.save(m_value, name);
+			dev.save(m_value, name);
 		}
 
 		state_var(const state_var &rhs) NOEXCEPT = default;
 		state_var(state_var &&rhs) NOEXCEPT = default;
 		state_var &operator=(const state_var rhs) { m_value = rhs.m_value; return *this; }
 		state_var &operator=(const T rhs) { m_value = rhs; return *this; }
-
-
-		operator T &() { return m_value; }
-		operator const T &() const { return m_value; }
+		operator T & () { return m_value; }
+		T & operator()() { return m_value; }
+		operator const T & () const { return m_value; }
+		const T & operator()() const { return m_value; }
 	private:
 		T m_value;
 	};
 
+	template <typename T, std::size_t N>
+	struct state_var<T[N]>
+	{
+	public:
+		state_var(device_t &d, const pstring name, const T & value)
+		{
+			d.save(m_value, name);
+			for (int i=0; i<N; i++)
+				m_value[i] = value;
+		}
+
+		state_var(const state_var &rhs) NOEXCEPT = default;
+		state_var(state_var &&rhs) NOEXCEPT = default;
+		state_var &operator=(const state_var rhs) { m_value = rhs.m_value; return *this; }
+		state_var &operator=(const T rhs) { m_value = rhs; return *this; }
+		T & operator[](const std::size_t i) { return m_value[i]; }
+		const T & operator[](const std::size_t i) const { return m_value[i]; }
+	private:
+		T m_value[N];
+	};
 
 
 	// -----------------------------------------------------------------------------
diff --git a/src/lib/netlist/solver/nld_matrix_solver.h b/src/lib/netlist/solver/nld_matrix_solver.h
index 9433c42a114..de5e999e340 100644
--- a/src/lib/netlist/solver/nld_matrix_solver.h
+++ b/src/lib/netlist/solver/nld_matrix_solver.h
@@ -120,28 +120,20 @@ 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_newton_raphson(0),
-	m_stat_vsolver_calls(0),
-	m_iterative_fail(0),
-	m_iterative_total(0),
-	m_params(*params),
-	m_last_step(0, 1),
-	m_cur_ts(0),
-	m_fb_sync(*this, "FB_sync"),
-	m_Q_sync(*this, "Q_sync"),
-	m_sort(sort)
+	: device_t(anetlist, name)
+	, m_params(*params)
+	, m_stat_calculations(*this, "m_stat_calculations", 0)
+	, m_stat_newton_raphson(*this, "m_stat_newton_raphson", 0)
+	, m_stat_vsolver_calls(*this, "m_stat_vsolver_calls", 0)
+	, m_iterative_fail(*this, "m_iterative_fail", 0)
+	, m_iterative_total(*this, "m_iterative_total", 0)
+	, m_last_step(*this, "m_last_step", netlist_time::quantum())
+	, m_cur_ts(*this, "m_cur_ts", 0)
+	, m_fb_sync(*this, "FB_sync")
+	, m_Q_sync(*this, "Q_sync")
+	, m_sort(sort)
 	{
 		connect_post_start(m_fb_sync, m_Q_sync);
-
-		save(NLNAME(m_last_step));
-		save(NLNAME(m_cur_ts));
-		save(NLNAME(m_stat_calculations));
-		save(NLNAME(m_stat_newton_raphson));
-		save(NLNAME(m_stat_vsolver_calls));
-		save(NLNAME(m_iterative_fail));
-		save(NLNAME(m_iterative_total));
 	}
 
 	virtual ~matrix_solver_t();
@@ -205,19 +197,19 @@ protected:
 
 	std::vector<terms_t *> m_rails_temp;
 
-	int m_stat_calculations;
-	int m_stat_newton_raphson;
-	int m_stat_vsolver_calls;
-	int m_iterative_fail;
-	int m_iterative_total;
-
 	const solver_parameters_t &m_params;
 
+	state_var<int> m_stat_calculations;
+	state_var<int> m_stat_newton_raphson;
+	state_var<int> m_stat_vsolver_calls;
+	state_var<int> m_iterative_fail;
+	state_var<int> m_iterative_total;
+
 	inline nl_double current_timestep() { return m_cur_ts; }
 private:
 
-	netlist_time m_last_step;
-	nl_double m_cur_ts;
+	state_var<netlist_time> m_last_step;
+	state_var<nl_double> m_cur_ts;
 	std::vector<core_device_t *> m_step_devices;
 	std::vector<core_device_t *> m_dynamic_devices;
 
diff --git a/src/lib/netlist/solver/nld_ms_direct.h b/src/lib/netlist/solver/nld_ms_direct.h
index 87b5b4e7a5c..0e7ca0324a4 100644
--- a/src/lib/netlist/solver/nld_ms_direct.h
+++ b/src/lib/netlist/solver/nld_ms_direct.h
@@ -210,14 +210,10 @@ void matrix_solver_direct_t<m_N, storage_N>::vsetup(analog_net_t::list_t &nets)
 			t->m_nzrd.push_back(N());
 	}
 
-	save(NLNAME(m_last_RHS));
+	save(m_last_RHS, "m_last_RHS");
 
 	for (unsigned k = 0; k < N(); k++)
-	{
-		pstring num = plib::pfmt("{1}")(k);
-
-		save(RHS(k), "RHS." + num);
-	}
+		save(RHS(k), plib::pfmt("RHS.{1}")(k));
 }
 
 
diff --git a/src/lib/netlist/solver/nld_ms_sm.h b/src/lib/netlist/solver/nld_ms_sm.h
index 7ed72bcd575..a86a8172e05 100644
--- a/src/lib/netlist/solver/nld_ms_sm.h
+++ b/src/lib/netlist/solver/nld_ms_sm.h
@@ -128,15 +128,10 @@ void matrix_solver_sm_t<m_N, storage_N>::vsetup(analog_net_t::list_t &nets)
 
 	matrix_solver_t::setup_base(nets);
 
-
-	save(NLNAME(m_last_RHS));
+	save(m_last_RHS, "m_last_RHS");
 
 	for (unsigned k = 0; k < N(); k++)
-	{
-		pstring num = plib::pfmt("{1}")(k);
-
-		save(RHS(k), "RHS." + num);
-	}
+		save(RHS(k), plib::pfmt("RHS.{1}")(k));
 }
 
 
diff --git a/src/lib/netlist/solver/nld_ms_sor.h b/src/lib/netlist/solver/nld_ms_sor.h
index a198fa6bf57..34a6acefcef 100644
--- a/src/lib/netlist/solver/nld_ms_sor.h
+++ b/src/lib/netlist/solver/nld_ms_sor.h
@@ -29,7 +29,7 @@ public:
 
 	matrix_solver_SOR_t(netlist_t &anetlist, const pstring &name, const solver_parameters_t *params, int size)
 		: matrix_solver_direct_t<m_N, storage_N>(anetlist, name, matrix_solver_t::ASCENDING, params, size)
-		, m_lp_fact(0)
+		, m_lp_fact(*this, "m_lp_fact", 0)
 		{
 		}
 
@@ -39,7 +39,7 @@ public:
 	virtual int vsolve_non_dynamic(const bool newton_raphson) override;
 
 private:
-	nl_double m_lp_fact;
+	state_var<nl_double> m_lp_fact;
 };
 
 // ----------------------------------------------------------------------------------------
@@ -51,7 +51,6 @@ template <unsigned m_N, unsigned storage_N>
 void matrix_solver_SOR_t<m_N, storage_N>::vsetup(analog_net_t::list_t &nets)
 {
 	matrix_solver_direct_t<m_N, storage_N>::vsetup(nets);
-	this->save(NLNAME(m_lp_fact));
 }
 
 template <unsigned m_N, unsigned 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 8fa871d83f4..2ea00212164 100644
--- a/src/lib/netlist/solver/nld_ms_sor_mat.h
+++ b/src/lib/netlist/solver/nld_ms_sor_mat.h
@@ -32,10 +32,11 @@ public:
 
 	matrix_solver_SOR_mat_t(netlist_t &anetlist, const pstring &name, const solver_parameters_t *params, int size)
 		: matrix_solver_direct_t<m_N, storage_N>(anetlist, name, matrix_solver_t::DESCENDING, params, size)
-		, m_omega(params->m_sor)
-		, m_lp_fact(0)
-		, m_gs_fail(0)
-		, m_gs_total(0)
+		, m_Vdelta(*this, "m_Vdelta", 0.0)
+		, m_omega(*this, "m_omega", params->m_sor)
+		, m_lp_fact(*this, "m_lp_fact", 0)
+		, m_gs_fail(*this, "m_gs_fail", 0)
+		, m_gs_total(*this, "m_gs_total", 0)
 		{
 		}
 
@@ -46,12 +47,12 @@ public:
 	virtual int vsolve_non_dynamic(const bool newton_raphson) override;
 
 private:
-	nl_double m_Vdelta[storage_N];
+	state_var<nl_double[storage_N]> m_Vdelta;
 
-	nl_double m_omega;
-	nl_double m_lp_fact;
-	int m_gs_fail;
-	int m_gs_total;
+	state_var<nl_double> m_omega;
+	state_var<nl_double> m_lp_fact;
+	state_var<int> m_gs_fail;
+	state_var<int> m_gs_total;
 };
 
 // ----------------------------------------------------------------------------------------
@@ -62,11 +63,6 @@ template <unsigned m_N, unsigned storage_N>
 void matrix_solver_SOR_mat_t<m_N, storage_N>::vsetup(analog_net_t::list_t &nets)
 {
 	matrix_solver_direct_t<m_N, storage_N>::vsetup(nets);
-	this->save(NLNAME(m_omega));
-	this->save(NLNAME(m_lp_fact));
-	this->save(NLNAME(m_gs_fail));
-	this->save(NLNAME(m_gs_total));
-	this->save(NLNAME(m_Vdelta));
 }
 
 #if 0
diff --git a/src/lib/netlist/solver/nld_ms_w.h b/src/lib/netlist/solver/nld_ms_w.h
index 19c84ef80bc..0bbc21ab860 100644
--- a/src/lib/netlist/solver/nld_ms_w.h
+++ b/src/lib/netlist/solver/nld_ms_w.h
@@ -137,15 +137,10 @@ void matrix_solver_w_t<m_N, storage_N>::vsetup(analog_net_t::list_t &nets)
 
 	matrix_solver_t::setup_base(nets);
 
-
-	save(NLNAME(m_last_RHS));
+	save(m_last_RHS, "m_last_RHS");
 
 	for (unsigned k = 0; k < N(); k++)
-	{
-		pstring num = plib::pfmt("{1}")(k);
-
-		save(RHS(k), "RHS." + num);
-	}
+		save(RHS(k), plib::pfmt("RHS.{1}")(k));
 }
 
 
diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp
index f69905be565..d5cfee83b4e 100644
--- a/src/lib/netlist/solver/nld_solver.cpp
+++ b/src/lib/netlist/solver/nld_solver.cpp
@@ -551,11 +551,11 @@ void matrix_solver_t::log_stats()
 		log().verbose("       has {1} elements", this->has_timestep_devices() ? "timestep" : "no timestep");
 		log().verbose("       {1:6.3} average newton raphson loops", (double) this->m_stat_newton_raphson / (double) this->m_stat_vsolver_calls);
 		log().verbose("       {1:10} invocations ({2:6} Hz)  {3:10} gs fails ({4:6.2} %) {5:6.3} average",
-				this->m_stat_calculations,
-				this->m_stat_calculations * 10 / (int) (this->netlist().time().as_double() * 10.0),
-				this->m_iterative_fail,
-				100.0 * (double) this->m_iterative_fail / (double) this->m_stat_calculations,
-				(double) this->m_iterative_total / (double) this->m_stat_calculations);
+				this->m_stat_calculations(),
+				this->m_stat_calculations() * 10 / (int) (this->netlist().time().as_double() * 10.0),
+				this->m_iterative_fail(),
+				100.0 * (double) this->m_iterative_fail() / (double) this->m_stat_calculations(),
+				(double) this->m_iterative_total() / (double) this->m_stat_calculations());
 	}
 }
 

From 07e19954bca13195aa88bf0c4e6faf86ce94b06a Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Sat, 11 Jun 2016 19:25:58 +0200
Subject: [PATCH 10/39] MOre save state simplification. (nw)

---
 src/devices/machine/netlist.cpp        | 12 +++---
 src/devices/machine/netlist.h          | 11 +++--
 src/lib/netlist/nl_base.cpp            | 56 +++++++++++++-------------
 src/lib/netlist/nl_base.h              | 43 +++++++++++---------
 src/lib/netlist/nl_time.h              |  2 +-
 src/lib/netlist/plib/pstate.cpp        | 14 +++----
 src/lib/netlist/plib/pstate.h          | 23 ++++++-----
 src/lib/netlist/plib/pstring.h         |  1 -
 src/lib/netlist/solver/nld_ms_direct.h |  4 +-
 src/lib/netlist/solver/nld_ms_sm.h     |  4 +-
 src/lib/netlist/solver/nld_ms_w.h      |  4 +-
 src/lib/netlist/solver/nld_solver.cpp  | 12 +++---
 12 files changed, 95 insertions(+), 91 deletions(-)

diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp
index 7696c2197f3..b193492c5f6 100644
--- a/src/devices/machine/netlist.cpp
+++ b/src/devices/machine/netlist.cpp
@@ -322,9 +322,9 @@ void netlist_mame_device_t::device_start()
 	m_setup->start_devices();
 	m_setup->resolve_inputs();
 
-	netlist().save_item(this, m_rem, "m_rem");
-	netlist().save_item(this, m_div, "m_div");
-	netlist().save_item(this, m_old, "m_old");
+	netlist().save(*this, m_rem, "m_rem");
+	netlist().save(*this, m_div, "m_div");
+	netlist().save(*this, m_old, "m_old");
 
 	save_state();
 
@@ -366,7 +366,7 @@ ATTR_COLD void netlist_mame_device_t::device_post_load()
 {
 	LOG_DEV_CALLS(("device_post_load\n"));
 
-	netlist().post_load();
+	netlist().state().post_load();
 	netlist().rebuild_lists();
 }
 
@@ -374,7 +374,7 @@ ATTR_COLD void netlist_mame_device_t::device_pre_save()
 {
 	LOG_DEV_CALLS(("device_pre_save\n"));
 
-	netlist().pre_save();
+	netlist().state().pre_save();
 }
 
 void netlist_mame_device_t::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
@@ -399,7 +399,7 @@ ATTR_HOT ATTR_ALIGN void netlist_mame_device_t::check_mame_abort_slice()
 
 ATTR_COLD void netlist_mame_device_t::save_state()
 {
-	for (auto const & s : netlist().save_list())
+	for (auto const & s : netlist().state().save_list())
 	{
 		netlist().log().debug("saving state for {1}\n", s->m_name.cstr());
 		if (s->m_dt.is_float)
diff --git a/src/devices/machine/netlist.h b/src/devices/machine/netlist.h
index 8eba71f8ba1..81e8f036d93 100644
--- a/src/devices/machine/netlist.h
+++ b/src/devices/machine/netlist.h
@@ -507,10 +507,9 @@ public:
 	: device_t(anetlist, name)
 	, m_in(*this, "IN")
 	, m_cpu_device(nullptr)
-	, m_last(0)
+	, m_last(*this, "m_last", 0)
 	{
 		m_cpu_device = downcast<netlist_mame_cpu_device_t *>(&downcast<netlist_mame_t &>(netlist()).parent());
-		save(NLNAME(m_last));
 	}
 
 	ATTR_COLD void reset() override
@@ -542,7 +541,7 @@ private:
 	netlist::analog_input_t m_in;
 	netlist_analog_output_delegate m_callback;
 	netlist_mame_cpu_device_t *m_cpu_device;
-	nl_double m_last;
+	netlist::state_var<nl_double> m_last;
 };
 
 // ----------------------------------------------------------------------------------------
@@ -557,10 +556,10 @@ public:
 		, m_channel(*this, "CHAN", 0)
 		, m_mult(*this, "MULT", 1000.0)
 		, m_offset(*this, "OFFSET", 0.0)
+		, m_sample(netlist::netlist_time::from_hz(1)) //sufficiently big enough
 		, m_in(*this, "IN")
+		, m_last_buffer(*this, "m_last_buffer", netlist::netlist_time::zero())
 	{
-		m_sample = netlist::netlist_time::from_hz(1); //sufficiently big enough
-		save(NAME(m_last_buffer));
 	}
 
 	static const int BUFSIZE = 2048;
@@ -615,7 +614,7 @@ private:
 	netlist::analog_input_t m_in;
 	double m_cur;
 	int m_last_pos;
-	netlist::netlist_time m_last_buffer;
+	netlist::state_var<netlist::netlist_time> m_last_buffer;
 };
 
 // ----------------------------------------------------------------------------------------
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index 718c9592771..86b660d09c4 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -105,14 +105,14 @@ const logic_family_desc_t *family_CD4XXX()
 queue_t::queue_t(netlist_t &nl)
 	: timed_queue<net_t *, netlist_time>(512)
 	, object_t(nl, "QUEUE", QUEUE)
-	, plib::pstate_manager_t::callback_t()
+	, plib::state_manager_t::callback_t()
 	, m_qsize(0)
 	, m_times(512)
 	, m_names(512)
 {
 }
 
-void queue_t::register_state(plib::pstate_manager_t &manager, const pstring &module)
+void queue_t::register_state(plib::state_manager_t &manager, const pstring &module)
 {
 	netlist().log().debug("register_state\n");
 	manager.save_item(this, m_qsize, module + "." + "qsize");
@@ -186,21 +186,21 @@ device_object_t::device_object_t(core_device_t &dev, const pstring &aname, const
 // ----------------------------------------------------------------------------------------
 
 netlist_t::netlist_t(const pstring &aname)
-	:   pstate_manager_t(),
-		m_time(netlist_time::zero()),
-		m_queue(*this),
-		m_use_deactivate(0),
-		m_mainclock(nullptr),
-		m_solver(nullptr),
-		m_gnd(nullptr),
-		m_params(nullptr),
-		m_name(aname),
-		m_setup(nullptr),
-		m_log(this),
-		m_lib(nullptr)
+	: m_state()
+	, m_time(netlist_time::zero())
+	, m_queue(*this)
+	, m_use_deactivate(0)
+	, m_mainclock(nullptr)
+	, m_solver(nullptr)
+	, m_gnd(nullptr)
+	, m_params(nullptr)
+	, m_name(aname)
+	, m_setup(nullptr)
+	, m_log(this)
+	, m_lib(nullptr)
 {
-	save_item(this, static_cast<plib::pstate_manager_t::callback_t &>(m_queue), "m_queue");
-	save_item(this, m_time, "m_time");
+	state().save_item(this, static_cast<plib::state_manager_t::callback_t &>(m_queue), "m_queue");
+	state().save_item(this, m_time, "m_time");
 }
 
 netlist_t::~netlist_t()
@@ -401,7 +401,7 @@ param_template_t<C, T>::param_template_t(device_t &device, const pstring name, c
 {
 	/* pstrings not yet supported, these need special logic */
 	if (T != param_t::STRING && T != param_t::MODEL)
-		save(NLNAME(m_param));
+		netlist().save(*this, m_param, "m_param");
 	device.setup().register_and_set_param(device.name() + "." + name, *this);
 }
 
@@ -579,17 +579,17 @@ net_t::net_t(netlist_t &nl, const pstring &aname, core_terminal_t *mr)
 	else
 		nl.m_nets.push_back(std::shared_ptr<net_t>(this));
 
-	save(NLNAME(m_time));
-	save(NLNAME(m_active));
-	save(NLNAME(m_in_queue));
-	save(NLNAME(m_cur_Analog));
-	save(NLNAME(m_cur_Q));
-	save(NLNAME(m_new_Q));
+	netlist().save(*this, m_time, "m_time");
+	netlist().save(*this, m_active, "m_active");
+	netlist().save(*this, m_in_queue, "m_in_queue");
+	netlist().save(*this, m_cur_Analog, "m_cur_Analog");
+	netlist().save(*this, m_cur_Q, "m_cur_Q");
+	netlist().save(*this, m_new_Q, "m_new_Q");
 }
 
 net_t::~net_t()
 {
-	netlist().remove_save_items(this);
+	netlist().state().remove_save_items(this);
 }
 
 void net_t::inc_active(core_terminal_t &term)
@@ -802,7 +802,7 @@ core_terminal_t::core_terminal_t(core_device_t &dev, const pstring &aname, const
 , m_net(nullptr)
 , m_state(STATE_NONEX)
 {
-	save(NLNAME(m_state));
+	netlist().save(*this, m_state, "m_state");
 }
 
 void core_terminal_t::reset()
@@ -836,9 +836,9 @@ terminal_t::terminal_t(core_device_t &dev, const pstring &aname)
 , m_gt1(nullptr)
 {
 	netlist().setup().register_term(*this);
-	save(NLNAME(m_Idr1));
-	save(NLNAME(m_go1));
-	save(NLNAME(m_gt1));
+	netlist().save(*this, m_Idr1, "m_Idr1");
+	netlist().save(*this, m_go1, "m_go1");
+	netlist().save(*this, m_gt1, "m_gt1");
 }
 
 
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 612603827b9..d564c441fbb 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -341,7 +341,7 @@ namespace netlist
 	// object_t
 	// -----------------------------------------------------------------------------
 
-	class object_t : public plib::pstate_interface_t<object_t>
+	class object_t
 	{
 		P_PREVENT_COPYING(object_t)
 	public:
@@ -360,8 +360,6 @@ namespace netlist
 
 		const pstring &name() const;
 
-		plib::pstate_manager_t &state_manager();
-
 		type_t type() const { return m_objtype; }
 		bool is_type(const type_t atype) const { return (m_objtype == atype); }
 
@@ -991,14 +989,14 @@ namespace netlist
 
 	class queue_t : public timed_queue<net_t *, netlist_time>,
 							public object_t,
-							public plib::pstate_manager_t::callback_t
+							public plib::state_manager_t::callback_t
 	{
 	public:
 		queue_t(netlist_t &nl);
 
 	protected:
 
-		void register_state(plib::pstate_manager_t &manager, const pstring &module) override;
+		void register_state(plib::state_manager_t &manager, const pstring &module) override;
 		void on_pre_save() override;
 		void on_post_load() override;
 
@@ -1014,7 +1012,7 @@ namespace netlist
 	// -----------------------------------------------------------------------------
 
 
-	class netlist_t : public plib::pstate_manager_t, public plib::plog_dispatch_intf //, public device_owner_t
+	class netlist_t : public plib::plog_dispatch_intf //, public device_owner_t
 	{
 		P_PREVENT_COPYING(netlist_t)
 	public:
@@ -1027,11 +1025,11 @@ namespace netlist
 		void start();
 		void stop();
 
-		 const queue_t &queue() const { return m_queue; }
-		 queue_t &queue() { return m_queue; }
-		 const netlist_time time() const { return m_time; }
-		 devices::NETLIB_NAME(solver) *solver() const { return m_solver; }
-		 devices::NETLIB_NAME(gnd) *gnd() const { return m_gnd; }
+		const queue_t &queue() const { return m_queue; }
+		queue_t &queue() { return m_queue; }
+		const netlist_time time() const { return m_time; }
+		devices::NETLIB_NAME(solver) *solver() const { return m_solver; }
+		devices::NETLIB_NAME(gnd) *gnd() const { return m_gnd; }
 		nl_double gmin() const;
 
 		void push_to_queue(net_t &out, const netlist_time attime) NOEXCEPT;
@@ -1083,6 +1081,17 @@ namespace netlist
 		plib::plog_base<NL_DEBUG> &log() { return m_log; }
 		const plib::plog_base<NL_DEBUG> &log() const { return m_log; }
 
+		plib::state_manager_t &state() { return m_state; }
+
+		template<typename O, typename C> void save(O &owner, C &state, const pstring &stname)
+		{
+			this->state().save_item((void *)&owner, state, pstring(owner.name()) + "." + stname);
+		}
+		template<typename O, typename C> void save(O &owner, C *state, const pstring &stname, const int count)
+		{
+			this->state().save_state_ptr((void *)&owner, pstring(owner.name()) + "." + stname, plib::state_manager_t::datatype_f<C>::f(), count, state);
+		}
+
 		virtual void reset();
 
 		plib::dynlib &lib() { return *m_lib; }
@@ -1107,6 +1116,7 @@ protected:
 	#endif
 
 	private:
+		plib::state_manager_t 		m_state;
 		/* mostly rw */
 		netlist_time                m_time;
 		queue_t                     m_queue;
@@ -1131,7 +1141,7 @@ protected:
 		state_var(device_t &dev, const pstring name, const T &value)
 		: m_value(value)
 		{
-			dev.save(m_value, name);
+			dev.netlist().save(dev, m_value, name);
 		}
 
 		state_var(const state_var &rhs) NOEXCEPT = default;
@@ -1150,9 +1160,9 @@ protected:
 	struct state_var<T[N]>
 	{
 	public:
-		state_var(device_t &d, const pstring name, const T & value)
+		state_var(device_t &dev, const pstring name, const T & value)
 		{
-			d.save(m_value, name);
+			dev.netlist().save(dev, m_value, name);
 			for (int i=0; i<N; i++)
 				m_value[i] = value;
 		}
@@ -1191,11 +1201,6 @@ protected:
 	// inline implementations
 	// -----------------------------------------------------------------------------
 
-	inline plib::pstate_manager_t &object_t::state_manager()
-	{
-		return m_netlist;
-	}
-
 	template <class C, param_t::param_type_t T>
 	inline void param_template_t<C, T>::setTo(const C &param)
 	{
diff --git a/src/lib/netlist/nl_time.h b/src/lib/netlist/nl_time.h
index 90182d66b54..9330526018f 100644
--- a/src/lib/netlist/nl_time.h
+++ b/src/lib/netlist/nl_time.h
@@ -125,7 +125,7 @@ namespace netlist
 }
 
 namespace plib {
-template<> inline void pstate_manager_t::save_item(const void *owner, netlist::netlist_time &nlt, const pstring &stname)
+template<> inline void state_manager_t::save_item(const void *owner, netlist::netlist_time &nlt, const pstring &stname)
 {
 	save_state_ptr(owner, stname, datatype_t(sizeof(netlist::netlist_time::INTERNALTYPE), false, true, false), 1, nlt.get_internaltype_ptr());
 }
diff --git a/src/lib/netlist/plib/pstate.cpp b/src/lib/netlist/plib/pstate.cpp
index 23371ed0ae8..ee44eede27a 100644
--- a/src/lib/netlist/plib/pstate.cpp
+++ b/src/lib/netlist/plib/pstate.cpp
@@ -9,24 +9,24 @@
 
 namespace plib {
 
-pstate_manager_t::pstate_manager_t()
+state_manager_t::state_manager_t()
 {
 }
 
-pstate_manager_t::~pstate_manager_t()
+state_manager_t::~state_manager_t()
 {
 	m_save.clear();
 }
 
 
 
-void pstate_manager_t::save_state_ptr(const void *owner, const pstring &stname, const datatype_t dt, const int count, void *ptr)
+void state_manager_t::save_state_ptr(const void *owner, const pstring &stname, const datatype_t dt, const int count, void *ptr)
 {
 	auto p = plib::make_unique<entry_t>(stname, dt, owner, count, ptr);
 	m_save.push_back(std::move(p));
 }
 
-void pstate_manager_t::remove_save_items(const void *owner)
+void state_manager_t::remove_save_items(const void *owner)
 {
 	for (auto i = m_save.begin(); i != m_save.end(); )
 	{
@@ -37,21 +37,21 @@ void pstate_manager_t::remove_save_items(const void *owner)
 	}
 }
 
-void pstate_manager_t::pre_save()
+void state_manager_t::pre_save()
 {
 	for (auto & s : m_save)
 		if (s->m_dt.is_custom)
 			s->m_callback->on_pre_save();
 }
 
-void pstate_manager_t::post_load()
+void state_manager_t::post_load()
 {
 	for (auto & s : m_save)
 		if (s->m_dt.is_custom)
 			s->m_callback->on_post_load();
 }
 
-template<> void pstate_manager_t::save_item(const void *owner, callback_t &state, const pstring &stname)
+template<> void state_manager_t::save_item(const void *owner, callback_t &state, const pstring &stname)
 {
 	//save_state_ptr(stname, DT_CUSTOM, 0, 1, &state);
 	callback_t *state_p = &state;
diff --git a/src/lib/netlist/plib/pstate.h b/src/lib/netlist/plib/pstate.h
index 3c101a00823..ee170f981b1 100644
--- a/src/lib/netlist/plib/pstate.h
+++ b/src/lib/netlist/plib/pstate.h
@@ -20,7 +20,7 @@
 
 namespace plib {
 
-class pstate_manager_t
+class state_manager_t
 {
 public:
 
@@ -64,7 +64,7 @@ public:
 
 		virtual ~callback_t() { };
 
-		virtual void register_state(pstate_manager_t &manager, const pstring &module) = 0;
+		virtual void register_state(state_manager_t &manager, const pstring &module) = 0;
 		virtual void on_pre_save() = 0;
 		virtual void on_post_load() = 0;
 	protected:
@@ -100,8 +100,8 @@ public:
 		}
 	};
 
-	pstate_manager_t();
-	~pstate_manager_t();
+	state_manager_t();
+	~state_manager_t();
 
 	template<typename C> void save_item(const void *owner, C &state, const pstring &stname)
 	{
@@ -138,8 +138,9 @@ private:
 	entry_t::list_t m_save;
 };
 
-template<> void pstate_manager_t::save_item(const void *owner, callback_t &state, const pstring &stname);
+template<> void state_manager_t::save_item(const void *owner, callback_t &state, const pstring &stname);
 
+#if 0
 template <typename T>
 class pstate_interface_t
 {
@@ -148,24 +149,24 @@ public:
 
 	template<typename C> void save(C &state, const pstring &stname)
 	{
-		pstate_manager_t &manager = static_cast<T*>(this)->state_manager();
+		state_manager_t &manager = static_cast<T*>(this)->state_manager();
 		pstring module = static_cast<T*>(this)->name();
 		manager.save_item(this, state, module + "." + stname);
 	}
 	template<typename C, std::size_t N> void save(C (&state)[N], const pstring &stname)
 	{
-		pstate_manager_t &manager = static_cast<T*>(this)->state_manager();
+		state_manager_t &manager = static_cast<T*>(this)->state_manager();
 		pstring module = static_cast<T*>(this)->name();
-		manager.save_state_ptr(this, module + "." + stname, pstate_manager_t::datatype_f<C>::f(), N, &(state[0]));
+		manager.save_state_ptr(this, module + "." + stname, state_manager_t::datatype_f<C>::f(), N, &(state[0]));
 	}
 	template<typename C> void save(C *state, const pstring &stname, const int count)
 	{
-		pstate_manager_t &manager = static_cast<T*>(this)->state_manager();
+		state_manager_t &manager = static_cast<T*>(this)->state_manager();
 		pstring module = static_cast<T*>(this)->name();
-		manager.save_state_ptr(this, module + "." + stname, pstate_manager_t::datatype_f<C>::f(), count, state);
+		manager.save_state_ptr(this, module + "." + stname, state_manager_t::datatype_f<C>::f(), count, state);
 	}
 };
-
+#endif
 }
 
 #endif /* PSTATE_H_ */
diff --git a/src/lib/netlist/plib/pstring.h b/src/lib/netlist/plib/pstring.h
index 5cfe5945fcf..734ba090a56 100644
--- a/src/lib/netlist/plib/pstring.h
+++ b/src/lib/netlist/plib/pstring.h
@@ -306,7 +306,6 @@ public:
 	// construction with copy
 	pstring(const mem_t *string) : type_t(string) { }
 	pstring(const type_t &string) : type_t(string) { }
-
 };
 
 // ----------------------------------------------------------------------------------------
diff --git a/src/lib/netlist/solver/nld_ms_direct.h b/src/lib/netlist/solver/nld_ms_direct.h
index 0e7ca0324a4..5e4e016f6fd 100644
--- a/src/lib/netlist/solver/nld_ms_direct.h
+++ b/src/lib/netlist/solver/nld_ms_direct.h
@@ -210,10 +210,10 @@ void matrix_solver_direct_t<m_N, storage_N>::vsetup(analog_net_t::list_t &nets)
 			t->m_nzrd.push_back(N());
 	}
 
-	save(m_last_RHS, "m_last_RHS");
+	netlist().save(*this, m_last_RHS, "m_last_RHS");
 
 	for (unsigned k = 0; k < N(); k++)
-		save(RHS(k), plib::pfmt("RHS.{1}")(k));
+		netlist().save(*this, RHS(k), plib::pfmt("RHS.{1}")(k));
 }
 
 
diff --git a/src/lib/netlist/solver/nld_ms_sm.h b/src/lib/netlist/solver/nld_ms_sm.h
index a86a8172e05..3695d3b3b05 100644
--- a/src/lib/netlist/solver/nld_ms_sm.h
+++ b/src/lib/netlist/solver/nld_ms_sm.h
@@ -128,10 +128,10 @@ void matrix_solver_sm_t<m_N, storage_N>::vsetup(analog_net_t::list_t &nets)
 
 	matrix_solver_t::setup_base(nets);
 
-	save(m_last_RHS, "m_last_RHS");
+	netlist().save(*this, m_last_RHS, "m_last_RHS");
 
 	for (unsigned k = 0; k < N(); k++)
-		save(RHS(k), plib::pfmt("RHS.{1}")(k));
+		netlist().save(*this, RHS(k), plib::pfmt("RHS.{1}")(k));
 }
 
 
diff --git a/src/lib/netlist/solver/nld_ms_w.h b/src/lib/netlist/solver/nld_ms_w.h
index 0bbc21ab860..f0f1cddf96e 100644
--- a/src/lib/netlist/solver/nld_ms_w.h
+++ b/src/lib/netlist/solver/nld_ms_w.h
@@ -137,10 +137,10 @@ void matrix_solver_w_t<m_N, storage_N>::vsetup(analog_net_t::list_t &nets)
 
 	matrix_solver_t::setup_base(nets);
 
-	save(m_last_RHS, "m_last_RHS");
+	netlist().save(*this, m_last_RHS, "m_last_RHS");
 
 	for (unsigned k = 0; k < N(); k++)
-		save(RHS(k), plib::pfmt("RHS.{1}")(k));
+		netlist().save(*this, RHS(k), plib::pfmt("RHS.{1}")(k));
 }
 
 
diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp
index d5cfee83b4e..84e88623b7f 100644
--- a/src/lib/netlist/solver/nld_solver.cpp
+++ b/src/lib/netlist/solver/nld_solver.cpp
@@ -352,13 +352,13 @@ void matrix_solver_t::setup_matrix()
 	{
 		pstring num = plib::pfmt("{1}")(k);
 
-		save(m_terms[k]->m_last_V, "lastV." + num);
-		save(m_terms[k]->m_DD_n_m_1, "m_DD_n_m_1." + num);
-		save(m_terms[k]->m_h_n_m_1, "m_h_n_m_1." + num);
+		netlist().save(*this, m_terms[k]->m_last_V, "lastV." + num);
+		netlist().save(*this, m_terms[k]->m_DD_n_m_1, "m_DD_n_m_1." + num);
+		netlist().save(*this, m_terms[k]->m_h_n_m_1, "m_h_n_m_1." + num);
 
-		save(m_terms[k]->go(),"GO" + num, m_terms[k]->count());
-		save(m_terms[k]->gt(),"GT" + num, m_terms[k]->count());
-		save(m_terms[k]->Idr(),"IDR" + num , m_terms[k]->count());
+		netlist().save(*this, m_terms[k]->go(),"GO" + num, m_terms[k]->count());
+		netlist().save(*this, m_terms[k]->gt(),"GT" + num, m_terms[k]->count());
+		netlist().save(*this, m_terms[k]->Idr(),"IDR" + num , m_terms[k]->count());
 	}
 
 	for (unsigned k=0; k<iN; k++)

From 1ae92bae96893c2d3a95786a2edc6b6c1e2673dd Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Sat, 11 Jun 2016 23:11:53 +0200
Subject: [PATCH 11/39] Rewrote nltool's listdevices command. This allowed
 removal of one member from devices which served solely for listdevices. (nw)

---
 src/lib/netlist/analog/nld_opamps.h    |  2 +-
 src/lib/netlist/devices/nld_system.cpp |  2 +-
 src/lib/netlist/devices/nlid_system.h  | 10 +++++----
 src/lib/netlist/nl_base.cpp            |  7 ------
 src/lib/netlist/nl_base.h              |  3 ---
 src/lib/netlist/nl_setup.cpp           | 11 ----------
 src/lib/netlist/nl_setup.h             |  2 ++
 src/lib/netlist/plib/plists.h          |  2 ++
 src/lib/netlist/prg/nltool.cpp         | 30 ++++++++++++++++++++------
 9 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/src/lib/netlist/analog/nld_opamps.h b/src/lib/netlist/analog/nld_opamps.h
index 850886b7a0e..6bef8b0bbdc 100644
--- a/src/lib/netlist/analog/nld_opamps.h
+++ b/src/lib/netlist/analog/nld_opamps.h
@@ -44,7 +44,7 @@ NETLIB_OBJECT(OPAMP)
 	, m_G1(*this, "G1")
 	, m_VCC(*this, "VCC")
 	, m_GND(*this, "GND")
-	, m_model(*this, "MODEL", "")
+	, m_model(*this, "MODEL", "LM324")
 	, m_VH(*this, "VH")
 	, m_VL(*this, "VL")
 	, m_VREF(*this, "VREF")
diff --git a/src/lib/netlist/devices/nld_system.cpp b/src/lib/netlist/devices/nld_system.cpp
index 8cb2b89dd0e..dbbccb78a72 100644
--- a/src/lib/netlist/devices/nld_system.cpp
+++ b/src/lib/netlist/devices/nld_system.cpp
@@ -187,7 +187,7 @@ namespace netlist
 					stack[ptr-1] = stack[ptr-1] / stack[ptr];
 					break;
 				case PUSH_INPUT:
-					stack[ptr++] = INPANALOG(m_I[(int) rc.m_param]);
+					stack[ptr++] = INPANALOG((*m_I[(int) rc.m_param]));
 					break;
 				case PUSH_CONST:
 					stack[ptr++] = rc.m_param;
diff --git a/src/lib/netlist/devices/nlid_system.h b/src/lib/netlist/devices/nlid_system.h
index 938d14c7d3f..ff8925f7597 100644
--- a/src/lib/netlist/devices/nlid_system.h
+++ b/src/lib/netlist/devices/nlid_system.h
@@ -11,6 +11,8 @@
 #ifndef NLID_SYSTEM_H_
 #define NLID_SYSTEM_H_
 
+#include <vector>
+
 #include "nl_setup.h"
 #include "nl_base.h"
 #include "nl_factory.h"
@@ -258,8 +260,8 @@ namespace netlist
 	{
 	public:
 		NETLIB_CONSTRUCTOR_DERIVED(frontier, base_dummy)
-		, m_RIN(*this, "m_RIN")
-		, m_ROUT(*this, "m_ROUT", true)
+		, m_RIN(*this, "m_RIN", false)
+		, m_ROUT(*this, "m_ROUT", false)
 		, m_I(*this, "_I")
 		, m_Q(*this, "_Q")
 		, m_p_RIN(*this, "RIN", 1.0e6)
@@ -312,7 +314,7 @@ namespace netlist
 		{
 
 			for (std::size_t i=0; i < m_N; i++)
-				m_I.emplace(i, *this, plib::pfmt("A{1}")(i));
+				m_I.push_back(plib::make_unique<analog_input_t>(*this, plib::pfmt("A{1}")(i)));
 
 			plib::pstring_vector_t cmds(m_func.Value(), " ");
 			m_precompiled.clear();
@@ -375,7 +377,7 @@ namespace netlist
 		param_int_t m_N;
 		param_str_t m_func;
 		analog_output_t m_Q;
-		plib::uninitialised_array_t<analog_input_t, 10> m_I;
+		std::vector<std::unique_ptr<analog_input_t>> m_I;
 
 		std::vector<rpn_inst> m_precompiled;
 	};
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index 86b660d09c4..02dcbf1ee6d 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -500,9 +500,6 @@ void device_t::register_subalias(const pstring &name, core_terminal_t &term)
 
 	// everything already fully qualified
 	setup().register_alias_nofqn(alias, term.name());
-
-	if (term.is_type(terminal_t::INPUT) || term.is_type(terminal_t::TERMINAL))
-		m_terminals.push_back(alias);
 }
 
 void device_t::register_subalias(const pstring &name, const pstring &aliased)
@@ -512,10 +509,6 @@ void device_t::register_subalias(const pstring &name, const pstring &aliased)
 
 	// everything already fully qualified
 	setup().register_alias_nofqn(alias, aliased_fqn);
-
-	// FIXME: make this working again
-	//if (term.isType(terminal_t::INPUT) || term.isType(terminal_t::TERMINAL))
-	//  m_terminals.add(name);
 }
 
 void device_t::connect_late(core_terminal_t &t1, core_terminal_t &t2)
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index d564c441fbb..1db1bfde445 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -949,9 +949,6 @@ namespace netlist
 		void connect_late(const pstring &t1, const pstring &t2);
 		void connect_late(core_terminal_t &t1, core_terminal_t &t2);
 		void connect_post_start(core_terminal_t &t1, core_terminal_t &t2);
-
-		std::vector<pstring> m_terminals;
-
 	protected:
 
 		NETLIB_UPDATEI() { }
diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp
index 14543de2c55..e2e60eb021f 100644
--- a/src/lib/netlist/nl_setup.cpp
+++ b/src/lib/netlist/nl_setup.cpp
@@ -246,17 +246,6 @@ void setup_t::register_and_set_param(pstring name, param_t &param)
 
 void setup_t::register_term(core_terminal_t &term)
 {
-	if (term.is_type(terminal_t::OUTPUT))
-	{
-	}
-	else if (term.is_type(terminal_t::INPUT))
-	{
-		static_cast<device_t &>(term.device()).m_terminals.push_back(term.name());
-	}
-	else
-	{
-		static_cast<device_t &>(term.device()).m_terminals.push_back(term.name());
-	}
 	if (!m_terminals.add(term.name(), &term))
 		log().fatal("Error adding {1} {2} to terminal list\n", objtype_as_str(term), term.name());
 	log().debug("{1} {2}\n", objtype_as_str(term), term.name());
diff --git a/src/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h
index 90ef1fe422c..fb5f8fd8adf 100644
--- a/src/lib/netlist/nl_setup.h
+++ b/src/lib/netlist/nl_setup.h
@@ -203,10 +203,12 @@ namespace netlist
 
 		netlist_t &m_netlist;
 
+	public:
 		plib::hashmap_t<pstring, pstring> m_alias;
 		plib::hashmap_t<pstring, param_ref_t>  m_params;
 		plib::hashmap_t<pstring, pstring> m_param_values;
 		plib::hashmap_t<pstring, core_terminal_t *> m_terminals;
+	private:
 
 		std::vector<link_t> m_links;
 
diff --git a/src/lib/netlist/plib/plists.h b/src/lib/netlist/plib/plists.h
index 7c5ed69957f..3ec52195ace 100644
--- a/src/lib/netlist/plib/plists.h
+++ b/src/lib/netlist/plib/plists.h
@@ -340,6 +340,8 @@ public:
 	const V& value_at(const unsigned pos) const { return m_values[pos].m_value; }
 
 	V& key_at(const unsigned pos) { return m_values[pos].m_key; }
+
+	const std::vector<element_t> &values() { return m_values; }
 private:
 
 	int get_idx(const K &key) const
diff --git a/src/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp
index db837fef71b..2f32171e520 100644
--- a/src/lib/netlist/prg/nltool.cpp
+++ b/src/lib/netlist/prg/nltool.cpp
@@ -129,7 +129,7 @@ protected:
 	{
 		pout("{}: {}\n", l.name().cstr(), ls.cstr());
 		if (l == plib::plog_level::FATAL)
-			throw;
+			throw std::exception();
 	}
 
 private:
@@ -285,19 +285,34 @@ static void listdevices()
 	nt.setup().start_devices();
 	nt.setup().resolve_inputs();
 
+	std::vector<plib::owned_ptr<netlist::core_device_t>> devs;
+
 	for (auto & f : list)
 	{
 		pstring out = plib::pfmt("{1} {2}(<id>")(f->classname(),"-20")(f->name());
 		pstring terms("");
 
-		auto d = f->Create(nt.setup().netlist(), "dummy");
-
+		auto d = f->Create(nt.setup().netlist(), f->name() + "_lc");
 		// get the list of terminals ...
-		for (auto & inp :  d->m_terminals)
+
+		for (auto & t : nt.setup().m_terminals.values())
 		{
-			if (inp.startsWith(d->name() + "."))
-				inp = inp.substr(d->name().len() + 1);
-			terms += "," + inp;
+			if (t.m_value->name().startsWith(d->name()))
+			{
+				pstring tn(t.m_value->name().substr(d->name().len()+1));
+				if (tn.find(".")<0)
+					terms += ", " + tn;
+			}
+		}
+
+		for (auto & t : nt.setup().m_alias.values())
+		{
+			if (t.m_key.startsWith(d->name()))
+			{
+				pstring tn(t.m_key.substr(d->name().len()+1));
+				if (tn.find(".")<0)
+					terms += ", " + tn;
+			}
 		}
 
 		if (f->param_desc().startsWith("+"))
@@ -317,6 +332,7 @@ static void listdevices()
 		printf("%s\n", out.cstr());
 		if (terms != "")
 			printf("Terminals: %s\n", terms.substr(1).cstr());
+		devs.push_back(std::move(d));
 	}
 }
 

From 3db085a7d8aa43284d9c1219a817f6fdfd2c9389 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Sun, 12 Jun 2016 03:24:36 +0200
Subject: [PATCH 12/39] Remove hashmap_t. Fix kidniki regression. (nw)

---
 src/lib/netlist/devices/nlid_system.h |   4 +-
 src/lib/netlist/nl_base.h             |   3 +-
 src/lib/netlist/nl_setup.cpp          |  76 +++++----
 src/lib/netlist/nl_setup.h            |  12 +-
 src/lib/netlist/plib/plists.h         | 224 --------------------------
 src/lib/netlist/plib/pparser.cpp      |  10 +-
 src/lib/netlist/plib/pparser.h        |   4 +-
 src/lib/netlist/plib/pstring.h        |  18 +++
 src/lib/netlist/prg/nltool.cpp        |  12 +-
 src/lib/netlist/solver/nld_ms_gcr.h   |   4 +-
 src/lib/netlist/tools/nl_convert.cpp  |  11 +-
 src/lib/netlist/tools/nl_convert.h    |   4 +-
 12 files changed, 89 insertions(+), 293 deletions(-)

diff --git a/src/lib/netlist/devices/nlid_system.h b/src/lib/netlist/devices/nlid_system.h
index ff8925f7597..b7c2116cb54 100644
--- a/src/lib/netlist/devices/nlid_system.h
+++ b/src/lib/netlist/devices/nlid_system.h
@@ -260,8 +260,8 @@ namespace netlist
 	{
 	public:
 		NETLIB_CONSTRUCTOR_DERIVED(frontier, base_dummy)
-		, m_RIN(*this, "m_RIN", false)
-		, m_ROUT(*this, "m_ROUT", false)
+		, m_RIN(*this, "m_RIN", true)
+		, m_ROUT(*this, "m_ROUT", true)
 		, m_I(*this, "_I")
 		, m_Q(*this, "_Q")
 		, m_p_RIN(*this, "RIN", 1.0e6)
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 1db1bfde445..607e9f313fd 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -156,6 +156,7 @@
 #define NLBASE_H_
 
 #include <vector>
+#include <unordered_map>
 #include <memory>
 #include <cmath>
 #include <cstdint>
@@ -289,7 +290,7 @@ namespace netlist
 	// model_map_t
 	// -----------------------------------------------------------------------------
 
-	using model_map_t = plib::hashmap_t<pstring, pstring>;
+	using model_map_t = std::unordered_map<pstring, pstring>;
 
 	// -----------------------------------------------------------------------------
 	// logic_family_t
diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp
index e2e60eb021f..72fdac657d9 100644
--- a/src/lib/netlist/nl_setup.cpp
+++ b/src/lib/netlist/nl_setup.cpp
@@ -151,13 +151,13 @@ void setup_t::register_model(const pstring &model_in)
 		log().fatal("Unable to parse model: {1}", model_in);
 	pstring model = model_in.left(pos).trim().ucase();
 	pstring def = model_in.substr(pos + 1).trim();
-	if (!m_models.add(model, def))
+	if (!m_models.insert({model, def}).second)
 		log().fatal("Model already exists: {1}", model_in);
 }
 
 void setup_t::register_alias_nofqn(const pstring &alias, const pstring &out)
 {
-	if (!m_alias.add(alias, out))
+	if (!m_alias.insert({alias, out}).second)
 		log().fatal("Error adding alias {1} to alias list\n", alias);
 }
 
@@ -207,9 +207,10 @@ pstring setup_t::objtype_as_str(object_t &in) const
 
 void setup_t::register_and_set_param(pstring name, param_t &param)
 {
-	if (m_param_values.contains(name))
+	auto i = m_param_values.find(name);
+	if (i != m_param_values.end())
 	{
-		const pstring val = m_param_values[name];
+		const pstring val = i->second;
 		log().debug("Found parameter ... {1} : {1}\n", name, val);
 		switch (param.param_type())
 		{
@@ -240,13 +241,13 @@ void setup_t::register_and_set_param(pstring name, param_t &param)
 				log().fatal("Parameter is not supported {1} : {2}\n", name, val);
 		}
 	}
-	if (!m_params.add(param.name(), param_ref_t(param.name(), param.device(), param)))
+	if (!m_params.insert({param.name(), param_ref_t(param.name(), param.device(), param)}).second)
 		log().fatal("Error adding parameter {1} to parameter list\n", name);
 }
 
 void setup_t::register_term(core_terminal_t &term)
 {
-	if (!m_terminals.add(term.name(), &term))
+	if (!m_terminals.insert({term.name(), &term}).second)
 		log().fatal("Error adding {1} {2} to terminal list\n", objtype_as_str(term), term.name());
 	log().debug("{1} {2}\n", objtype_as_str(term), term.name());
 }
@@ -335,15 +336,15 @@ void setup_t::register_param(const pstring &param, const pstring &value)
 {
 	pstring fqn = build_fqn(param);
 
-	int idx = m_param_values.index_of(fqn);
-	if (idx < 0)
+	auto idx = m_param_values.find(fqn);
+	if (idx == m_param_values.end())
 	{
-		if (!m_param_values.add(fqn, value))
+		if (!m_param_values.insert({fqn, value}).second)
 			log().fatal("Unexpected error adding parameter {1} to parameter list\n", param);
 	}
 	else
 	{
-		log().warning("Overwriting {1} old <{2}> new <{3}>\n", fqn, m_param_values.value_at(idx), value);
+		log().warning("Overwriting {1} old <{2}> new <{3}>\n", fqn, idx->second, value);
 		m_param_values[fqn] = value;
 	}
 }
@@ -356,8 +357,8 @@ const pstring setup_t::resolve_alias(const pstring &name) const
 	/* FIXME: Detect endless loop */
 	do {
 		ret = temp;
-		int p = m_alias.index_of(ret);
-		temp = (p>=0 ? m_alias.value_at(p) : "");
+		auto p = m_alias.find(ret);
+		temp = (p != m_alias.end() ? p->second : "");
 	} while (temp != "");
 
 	log().debug("{1}==>{2}\n", name, ret);
@@ -367,17 +368,15 @@ const pstring setup_t::resolve_alias(const pstring &name) const
 core_terminal_t *setup_t::find_terminal(const pstring &terminal_in, bool required)
 {
 	const pstring &tname = resolve_alias(terminal_in);
-	int ret;
-
-	ret = m_terminals.index_of(tname);
+	auto ret = m_terminals.find(tname);
 	/* look for default */
-	if (ret < 0)
+	if (ret == m_terminals.end())
 	{
 		/* look for ".Q" std output */
-		ret = m_terminals.index_of(tname + ".Q");
+		ret = m_terminals.find(tname + ".Q");
 	}
 
-	core_terminal_t *term = (ret < 0 ? nullptr : m_terminals.value_at(ret));
+	core_terminal_t *term = (ret == m_terminals.end() ? nullptr : ret->second);
 
 	if (term == nullptr && required)
 		log().fatal("terminal {1}({2}) not found!\n", terminal_in, tname);
@@ -389,19 +388,17 @@ core_terminal_t *setup_t::find_terminal(const pstring &terminal_in, bool require
 core_terminal_t *setup_t::find_terminal(const pstring &terminal_in, object_t::type_t atype, bool required)
 {
 	const pstring &tname = resolve_alias(terminal_in);
-	int ret;
-
-	ret = m_terminals.index_of(tname);
+	auto ret = m_terminals.find(tname);
 	/* look for default */
-	if (ret < 0 && atype == object_t::OUTPUT)
+	if (ret == m_terminals.end() && atype == object_t::OUTPUT)
 	{
 		/* look for ".Q" std output */
-		ret = m_terminals.index_of(tname + ".Q");
+		ret = m_terminals.find(tname + ".Q");
 	}
-	if (ret < 0 && required)
+	if (ret == m_terminals.end() && required)
 		log().fatal("terminal {1}({2}) not found!\n", terminal_in, tname);
 
-	core_terminal_t *term = (ret < 0 ? nullptr : m_terminals.value_at(ret));
+	core_terminal_t *term = (ret == m_terminals.end() ? nullptr : ret->second);
 
 	if (term != nullptr && term->type() != atype)
 	{
@@ -421,14 +418,12 @@ param_t *setup_t::find_param(const pstring &param_in, bool required)
 	const pstring param_in_fqn = build_fqn(param_in);
 
 	const pstring &outname = resolve_alias(param_in_fqn);
-	int ret;
-
-	ret = m_params.index_of(outname);
-	if (ret < 0 && required)
+	auto ret = m_params.find(outname);
+	if (ret == m_params.end() && required)
 		log().fatal("parameter {1}({2}) not found!\n", param_in_fqn, outname);
-	if (ret != -1)
+	if (ret != m_params.end())
 		log().debug("Found parameter {1}\n", outname);
-	return (ret == -1 ? nullptr : &m_params.value_at(ret).m_param);
+	return (ret == m_params.end() ? nullptr : &ret->second.m_param);
 }
 
 // FIXME avoid dynamic cast here
@@ -737,9 +732,9 @@ void setup_t::resolve_inputs()
 	pstring errstr("");
 
 	log().verbose("looking for terminals not connected ...");
-	for (std::size_t i = 0; i < m_terminals.size(); i++)
+	for (auto & i : m_terminals)
 	{
-		core_terminal_t *term = m_terminals.value_at(i);
+		core_terminal_t *term = i.second;
 		if (!term->has_net() && dynamic_cast< devices::NETLIB_NAME(dummy_input) *>(&term->device()) != nullptr)
 			log().warning("Found dummy terminal {1} without connections", term->name());
 		else if (!term->has_net())
@@ -847,13 +842,12 @@ const logic_family_desc_t *setup_t::family_from_model(const pstring &model)
 static pstring model_string(model_map_t &map)
 {
 	pstring ret = map["COREMODEL"] + "(";
-	for (unsigned i=0; i<map.size(); i++)
-		ret = ret + map.key_at(i) + "=" + map.value_at(i) + " ";
+	for (auto & i : map)
+		ret = ret + i.first + "=" + i.second + " ";
 
 	return ret + ")";
 }
 
-
 void setup_t::model_parse(const pstring &model_in, model_map_t &map)
 {
 	pstring model = model_in;
@@ -866,9 +860,10 @@ void setup_t::model_parse(const pstring &model_in, model_map_t &map)
 		if (pos >= 0) break;
 
 		key = model.ucase();
-		if (!m_models.contains(key))
+		auto i = m_models.find(key);
+		if (i == m_models.end())
 			log().fatal("Model {1} not found\n", model);
-		model = m_models[key];
+		model = i->second;
 	}
 	pstring xmodel = model.left(pos);
 
@@ -876,7 +871,8 @@ void setup_t::model_parse(const pstring &model_in, model_map_t &map)
 		map["COREMODEL"] = key;
 	else
 	{
-		if (m_models.contains(xmodel))
+		auto i = m_models.find(xmodel);
+		if (i != m_models.end())
 			model_parse(xmodel, map);
 		else
 			log().fatal("Model doesn't exist: <{1}>\n", model_in);
@@ -903,7 +899,7 @@ const pstring setup_t::model_value_str(model_map_t &map, const pstring &entity)
 
 	if (entity != entity.ucase())
 		log().fatal("model parameters should be uppercase:{1} {2}\n", entity, model_string(map));
-	if (!map.contains(entity))
+	if (map.find(entity) == map.end())
 		log().fatal("Entity {1} not found in model {2}\n", entity, model_string(map));
 	else
 		ret = map[entity];
diff --git a/src/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h
index fb5f8fd8adf..109f58fb43b 100644
--- a/src/lib/netlist/nl_setup.h
+++ b/src/lib/netlist/nl_setup.h
@@ -10,6 +10,8 @@
 
 #include <memory>
 #include <stack>
+#include <unordered_map>
+
 #include "nl_base.h"
 #include "nl_factory.h"
 
@@ -204,17 +206,17 @@ namespace netlist
 		netlist_t &m_netlist;
 
 	public:
-		plib::hashmap_t<pstring, pstring> m_alias;
-		plib::hashmap_t<pstring, param_ref_t>  m_params;
-		plib::hashmap_t<pstring, pstring> m_param_values;
-		plib::hashmap_t<pstring, core_terminal_t *> m_terminals;
+		std::unordered_map<pstring, pstring> m_alias;
+		std::unordered_map<pstring, param_ref_t>  m_params;
+		std::unordered_map<pstring, pstring> m_param_values;
+		std::unordered_map<pstring, core_terminal_t *> m_terminals;
 	private:
 
 		std::vector<link_t> m_links;
 
 		factory_list_t m_factory;
 
-		plib::hashmap_t<pstring, pstring> m_models;
+		std::unordered_map<pstring, pstring> m_models;
 
 		int m_proxy_cnt;
 		int m_frontier_cnt;
diff --git a/src/lib/netlist/plib/plists.h b/src/lib/netlist/plib/plists.h
index 3ec52195ace..030b172f50e 100644
--- a/src/lib/netlist/plib/plists.h
+++ b/src/lib/netlist/plib/plists.h
@@ -147,230 +147,6 @@ private:
 	LC *m_head;
 };
 
-
-// ----------------------------------------------------------------------------------------
-// hashmap list
-// ----------------------------------------------------------------------------------------
-
-
-template <class C>
-struct hash_functor
-{
-	hash_functor()
-	: m_hash(0)
-	{}
-	hash_functor(const C &v)
-	: m_hash(v)
-	{
-	}
-	friend unsigned operator%(const hash_functor &lhs, const unsigned &rhs) { return lhs.m_hash % rhs; }
-	bool operator==(const hash_functor &lhs) const { return (m_hash == lhs.m_hash); }
-private:
-	unsigned m_hash;
-};
-
-template <>
-struct hash_functor<pstring>
-{
-	hash_functor()
-	: m_hash(0)
-	{}
-	hash_functor(const pstring &v)
-	{
-		/* modified djb2 */
-		const pstring::mem_t *string = v.cstr();
-		unsigned result = 5381;
-		for (pstring::mem_t c = *string; c != 0; c = *string++)
-			result = ((result << 5) + result ) ^ (result >> (32 - 5)) ^ c;
-			//result = (result*33) ^ c;
-		m_hash = result;
-	}
-	friend unsigned operator%(const hash_functor<pstring> &lhs, const unsigned &rhs) { return lhs.m_hash % rhs; }
-	unsigned operator()() { return m_hash; }
-	bool operator==(const hash_functor<pstring> &lhs) const { return (m_hash == lhs.m_hash); }
-private:
-	unsigned m_hash;
-};
-
-#if 0
-#if 0
-	unsigned hash(const pstring &v) const
-	{
-		/* Fowler???Noll???Vo hash - FNV-1 */
-		const char *string = v.cstr();
-		unsigned result = 2166136261;
-		for (UINT8 c = *string++; c != 0; c = *string++)
-			result = (result * 16777619) ^ c;
-			// result = (result ^ c) * 16777619; FNV 1a
-		return result;
-	}
-#else
-	unsigned hash(const pstring &v) const
-	{
-		/* jenkins one at a time algo */
-		unsigned result = 0;
-		const char *string = v.cstr();
-		while (*string)
-		{
-			result += *string;
-			string++;
-			result += (result << 10);
-			result ^= (result >> 6);
-		}
-		result += (result << 3);
-		result ^= (result >> 11);
-		result += (result << 15);
-		return result;
-	}
-#endif
-#endif
-
-template <class K, class V, class H = hash_functor<K> >
-class hashmap_t
-{
-public:
-	hashmap_t() : m_hash(37)
-	{
-		for (unsigned i=0; i<m_hash.size(); i++)
-			m_hash[i] = -1;
-	}
-
-	~hashmap_t()
-	{
-	}
-
-	struct element_t
-	{
-		element_t(const K &key, const H &hash, const V &value)
-		: m_key(key), m_hash(hash), m_value(value), m_next(-1)
-		{}
-		K m_key;
-		H m_hash;
-		V m_value;
-		int m_next;
-	};
-
-	void clear()
-	{
-#if 0
-		if (0)
-		{
-			unsigned cnt = 0;
-			for (unsigned i=0; i<m_hash.size(); i++)
-				if (m_hash[i] >= 0)
-					cnt++;
-			const unsigned s = m_values.size();
-			if (s>0)
-				printf("phashmap: %d elements %d hashsize, percent in overflow: %d\n", s, (unsigned) m_hash.size(),  (s - cnt) * 100 / s);
-			else
-				printf("phashmap: No elements .. \n");
-		}
-#endif
-		m_values.clear();
-		for (unsigned i=0; i<m_hash.size(); i++)
-			m_hash[i] = -1;
-	}
-
-	bool contains(const K &key) const
-	{
-		return (get_idx(key) >= 0);
-	}
-
-	int index_of(const K &key) const
-	{
-		return get_idx(key);
-	}
-
-	unsigned size() const { return m_values.size(); }
-
-	bool add(const K &key, const V &value)
-	{
-		/*
-		 * we are using the Euler prime function here
-		 *
-		 * n * n + n + 41 | 40 >= n >=0
-		 *
-		 * and accept that outside we will not have a prime
-		 *
-		 */
-		if (m_values.size() * 3 / 2 > m_hash.size())
-		{
-			unsigned n = std::sqrt( 2 * m_hash.size());
-			n = n * n + n + 41;
-			m_hash.resize(n);
-			rebuild();
-		}
-		const H hash(key);
-		const unsigned pos = hash % m_hash.size();
-		if (m_hash[pos] == -1)
-		{
-			unsigned vpos = m_values.size();
-			m_values.push_back(element_t(key, hash, value));
-			m_hash[pos] = vpos;
-		}
-		else
-		{
-			int ep = m_hash[pos];
-
-			for (; ep != -1; ep = m_values[ep].m_next)
-			{
-				if (m_values[ep].m_hash == hash && m_values[ep].m_key == key )
-					return false; /* duplicate */
-			}
-			unsigned vpos = m_values.size();
-			m_values.push_back(element_t(key, hash, value));
-			m_values[vpos].m_next = m_hash[pos];
-			m_hash[pos] = vpos;
-		}
-		return true;
-	}
-
-	V& operator[](const K &key)
-	{
-		int p = get_idx(key);
-		if (p == -1)
-		{
-			p = m_values.size();
-			add(key, V());
-		}
-		return m_values[p].m_value;
-	}
-
-	V& value_at(const unsigned pos) { return m_values[pos].m_value; }
-	const V& value_at(const unsigned pos) const { return m_values[pos].m_value; }
-
-	V& key_at(const unsigned pos) { return m_values[pos].m_key; }
-
-	const std::vector<element_t> &values() { return m_values; }
-private:
-
-	int get_idx(const K &key) const
-	{
-		H hash(key);
-		const unsigned pos = hash % m_hash.size();
-
-		for (int ep = m_hash[pos]; ep != -1; ep = m_values[ep].m_next)
-			if (m_values[ep].m_hash == hash && m_values[ep].m_key == key )
-				return ep;
-		return -1;
-	}
-
-	void rebuild()
-	{
-		for (unsigned i=0; i<m_hash.size(); i++)
-			m_hash[i] = -1;
-		for (unsigned i=0; i<m_values.size(); i++)
-		{
-			unsigned pos = m_values[i].m_hash % m_hash.size();
-			m_values[i].m_next = m_hash[pos];
-			m_hash[pos] = i;
-		}
-
-	}
-	std::vector<element_t> m_values;
-	std::vector<int> m_hash;
-};
-
 }
 
 #endif /* PLISTS_H_ */
diff --git a/src/lib/netlist/plib/pparser.cpp b/src/lib/netlist/plib/pparser.cpp
index 72a7ee36cf9..6c0fa79d7e4 100644
--- a/src/lib/netlist/plib/pparser.cpp
+++ b/src/lib/netlist/plib/pparser.cpp
@@ -267,7 +267,7 @@ ppreprocessor::ppreprocessor()
 	m_expr_sep.push_back(" ");
 	m_expr_sep.push_back("\t");
 
-	m_defines.add("__PLIB_PREPROCESSOR__", define_t("__PLIB_PREPROCESSOR__", "1"));
+	m_defines.insert({"__PLIB_PREPROCESSOR__", define_t("__PLIB_PREPROCESSOR__", "1")});
 }
 
 void ppreprocessor::error(const pstring &err)
@@ -349,9 +349,9 @@ double ppreprocessor::expr(const pstring_vector_t &sexpr, std::size_t &start, in
 
 ppreprocessor::define_t *ppreprocessor::get_define(const pstring &name)
 {
-	int idx = m_defines.index_of(name);
-	if (idx >= 0)
-		return &m_defines.value_at(idx);
+	auto idx = m_defines.find(name);
+	if (idx != m_defines.end())
+		return &idx->second;
 	else
 		return nullptr;
 }
@@ -440,7 +440,7 @@ pstring  ppreprocessor::process_line(const pstring &line)
 			{
 				if (lti.size() != 3)
 					error("PREPRO: only simple defines allowed: " + line);
-				m_defines.add(lti[1], define_t(lti[1], lti[2]));
+				m_defines.insert({lti[1], define_t(lti[1], lti[2])});
 			}
 		}
 		else
diff --git a/src/lib/netlist/plib/pparser.h b/src/lib/netlist/plib/pparser.h
index aabf327dfb5..ebf8d1630d1 100644
--- a/src/lib/netlist/plib/pparser.h
+++ b/src/lib/netlist/plib/pparser.h
@@ -8,6 +8,8 @@
 #ifndef PPARSER_H_
 #define PPARSER_H_
 
+#include <unordered_map>
+
 #include "pconfig.h"
 #include "pstring.h"
 #include "plists.h"
@@ -189,7 +191,7 @@ private:
 
 	pstring process_line(const pstring &line);
 
-	hashmap_t<pstring, define_t> m_defines;
+	std::unordered_map<pstring, define_t> m_defines;
 	plib::pstring_vector_t m_expr_sep;
 
 	//pstringbuffer m_ret;
diff --git a/src/lib/netlist/plib/pstring.h b/src/lib/netlist/plib/pstring.h
index 734ba090a56..72462f9992e 100644
--- a/src/lib/netlist/plib/pstring.h
+++ b/src/lib/netlist/plib/pstring.h
@@ -377,4 +377,22 @@ 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;
+        }
+    };
+}
+
 #endif /* PSTRING_H_ */
diff --git a/src/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp
index 2f32171e520..7c54f40f53a 100644
--- a/src/lib/netlist/prg/nltool.cpp
+++ b/src/lib/netlist/prg/nltool.cpp
@@ -295,21 +295,21 @@ static void listdevices()
 		auto d = f->Create(nt.setup().netlist(), f->name() + "_lc");
 		// get the list of terminals ...
 
-		for (auto & t : nt.setup().m_terminals.values())
+		for (auto & t : nt.setup().m_terminals)
 		{
-			if (t.m_value->name().startsWith(d->name()))
+			if (t.second->name().startsWith(d->name()))
 			{
-				pstring tn(t.m_value->name().substr(d->name().len()+1));
+				pstring tn(t.second->name().substr(d->name().len()+1));
 				if (tn.find(".")<0)
 					terms += ", " + tn;
 			}
 		}
 
-		for (auto & t : nt.setup().m_alias.values())
+		for (auto & t : nt.setup().m_alias)
 		{
-			if (t.m_key.startsWith(d->name()))
+			if (t.first.startsWith(d->name()))
 			{
-				pstring tn(t.m_key.substr(d->name().len()+1));
+				pstring tn(t.first.substr(d->name().len()+1));
 				if (tn.find(".")<0)
 					terms += ", " + tn;
 			}
diff --git a/src/lib/netlist/solver/nld_ms_gcr.h b/src/lib/netlist/solver/nld_ms_gcr.h
index aa31a53cce4..74733ac87ff 100644
--- a/src/lib/netlist/solver/nld_ms_gcr.h
+++ b/src/lib/netlist/solver/nld_ms_gcr.h
@@ -62,9 +62,9 @@ private:
 	{
 		plib::postringstream t;
 		csc_private(t);
-		plib::hash_functor<pstring> h(t.str());
+		std::hash<pstring> h;
 
-		return plib::pfmt("nl_gcr_{1:x}_{2}")(h())(mat.nz_num);
+		return plib::pfmt("nl_gcr_{1:x}_{2}")(h( t.str() ))(mat.nz_num);
 	}
 
 	unsigned m_dim;
diff --git a/src/lib/netlist/tools/nl_convert.cpp b/src/lib/netlist/tools/nl_convert.cpp
index 1da5f75c0d0..545377cc494 100644
--- a/src/lib/netlist/tools/nl_convert.cpp
+++ b/src/lib/netlist/tools/nl_convert.cpp
@@ -18,7 +18,7 @@
 void nl_convert_base_t::add_pin_alias(const pstring &devname, const pstring &name, const pstring &alias)
 {
 	pstring pname = devname + "." + name;
-	m_pins.add(pname, plib::make_unique<pin_alias_t>(pname, devname + "." + alias));
+	m_pins.insert({pname, plib::make_unique<pin_alias_t>(pname, devname + "." + alias)});
 }
 
 void nl_convert_base_t::add_ext_alias(const pstring &alias)
@@ -53,13 +53,14 @@ void nl_convert_base_t::add_device(const pstring &atype, const pstring &aname)
 void nl_convert_base_t::add_term(pstring netname, pstring termname)
 {
 	net_t * net = nullptr;
-	if (m_nets.contains(netname))
+	auto idx = m_nets.find(netname);
+	if (idx != m_nets.end())
 		net = m_nets[netname].get();
 	else
 	{
 		auto nets = std::make_shared<net_t>(netname);
 		net = nets.get();
-		m_nets.add(netname, nets);
+		m_nets.insert({netname, nets});
 	}
 
 	/* if there is a pin alias, translate ... */
@@ -103,9 +104,9 @@ void nl_convert_base_t::dump_nl()
 					m_devs[j]->name().cstr());
 	}
 	// print nets
-	for (std::size_t i=0; i<m_nets.size(); i++)
+	for (auto & i : m_nets)
 	{
-		net_t * net = m_nets.value_at(i).get();
+		net_t * net = i.second.get();
 		if (!net->is_no_export())
 		{
 			//printf("Net {}\n", net->name().cstr());
diff --git a/src/lib/netlist/tools/nl_convert.h b/src/lib/netlist/tools/nl_convert.h
index 01ccd038e5c..a2e0dc99ecb 100644
--- a/src/lib/netlist/tools/nl_convert.h
+++ b/src/lib/netlist/tools/nl_convert.h
@@ -131,9 +131,9 @@ private:
 	plib::postringstream m_buf;
 
 	std::vector<std::shared_ptr<dev_t>> m_devs;
-	plib::hashmap_t<pstring, std::shared_ptr<net_t> > m_nets;
+	std::unordered_map<pstring, std::shared_ptr<net_t> > m_nets;
 	std::vector<pstring> m_ext_alias;
-	plib::hashmap_t<pstring, std::shared_ptr<pin_alias_t>> m_pins;
+	std::unordered_map<pstring, std::shared_ptr<pin_alias_t>> m_pins;
 
 	static unit_t m_units[];
 

From 04c69f9aef70f4040bd58c054643a44b38cedab4 Mon Sep 17 00:00:00 2001
From: Ivan Vangelista <mesgnet@yahoo.it>
Date: Tue, 14 Jun 2016 18:13:58 +0200
Subject: [PATCH 13/39] - More c++. - Simplify main processing loop. As a nice
 side-effect that squeezed out some cycles. - More cycle squeezing. - Removed
 pvector_t. - Use std::sort. - Refactored netlist state manager. -
 Introduction of state_var object template to be used on device state members.
 - Changed remaining save occurrences to state_var. - Rewrote nltool's
 listdevices command. This allowed removal of one member from devices which
 served solely for listdevices. - Remove hashmap_t. Fix kidniki regression.
 (nw)

---
 scripts/src/machine.lua                    |  12 +
 scripts/target/mame/arcade.lua             |   1 +
 src/devices/machine/ldp1000.cpp            | 120 +++++++++
 src/devices/machine/ldp1000.h              |  67 +++++
 src/devices/machine/netlist.cpp            |  89 +++----
 src/devices/machine/netlist.h              |  11 +-
 src/lib/netlist/analog/nld_bjt.h           |  21 +-
 src/lib/netlist/analog/nld_opamps.h        |   2 +-
 src/lib/netlist/analog/nld_twoterm.cpp     |  21 +-
 src/lib/netlist/analog/nld_twoterm.h       |  13 +-
 src/lib/netlist/devices/nld_4020.cpp       |   5 +-
 src/lib/netlist/devices/nld_74107.cpp      |  16 +-
 src/lib/netlist/devices/nld_74123.cpp      |  13 +-
 src/lib/netlist/devices/nld_74153.cpp      |   5 +-
 src/lib/netlist/devices/nld_74175.cpp      |   9 +-
 src/lib/netlist/devices/nld_74192.cpp      |  13 +-
 src/lib/netlist/devices/nld_74193.cpp      |  16 +-
 src/lib/netlist/devices/nld_7448.cpp       |   5 +-
 src/lib/netlist/devices/nld_7474.cpp       |   6 +-
 src/lib/netlist/devices/nld_7483.cpp       |   5 +-
 src/lib/netlist/devices/nld_7490.cpp       |  15 +-
 src/lib/netlist/devices/nld_7493.cpp       |   9 +-
 src/lib/netlist/devices/nld_74ls629.cpp    |  16 +-
 src/lib/netlist/devices/nld_82S16.cpp      |   4 +-
 src/lib/netlist/devices/nld_9310.cpp       |  15 +-
 src/lib/netlist/devices/nld_9316.cpp       |  16 +-
 src/lib/netlist/devices/nld_legacy.cpp     |   5 +-
 src/lib/netlist/devices/nld_mm5837.cpp     |  11 +-
 src/lib/netlist/devices/nld_ne555.cpp      |  11 +-
 src/lib/netlist/devices/nld_system.cpp     |   4 +-
 src/lib/netlist/devices/nld_truthtable.h   |  23 +-
 src/lib/netlist/devices/nlid_system.h      |  32 ++-
 src/lib/netlist/nl_base.cpp                | 116 ++++-----
 src/lib/netlist/nl_base.h                  | 142 ++++++----
 src/lib/netlist/nl_factory.h               |   2 +-
 src/lib/netlist/nl_lists.h                 |  13 +-
 src/lib/netlist/nl_setup.cpp               | 133 +++++-----
 src/lib/netlist/nl_setup.h                 |  24 +-
 src/lib/netlist/nl_time.h                  |   9 +-
 src/lib/netlist/plib/plists.h              | 285 +--------------------
 src/lib/netlist/plib/poptions.h            |   4 +-
 src/lib/netlist/plib/pparser.cpp           |  16 +-
 src/lib/netlist/plib/pparser.h             |   6 +-
 src/lib/netlist/plib/pstate.cpp            |  47 ++--
 src/lib/netlist/plib/pstate.h              | 202 +++++++--------
 src/lib/netlist/plib/pstring.h             |  19 +-
 src/lib/netlist/plib/putil.cpp             |   4 +-
 src/lib/netlist/plib/putil.h               |  39 ++-
 src/lib/netlist/prg/nltool.cpp             |  38 ++-
 src/lib/netlist/solver/nld_matrix_solver.h |  79 +++---
 src/lib/netlist/solver/nld_ms_direct.h     |  10 +-
 src/lib/netlist/solver/nld_ms_direct_lu.h  |   5 +-
 src/lib/netlist/solver/nld_ms_gcr.h        |   6 +-
 src/lib/netlist/solver/nld_ms_gmres.h      |   2 +-
 src/lib/netlist/solver/nld_ms_sm.h         |   9 +-
 src/lib/netlist/solver/nld_ms_sor.h        |   5 +-
 src/lib/netlist/solver/nld_ms_sor_mat.h    |  24 +-
 src/lib/netlist/solver/nld_ms_w.h          |   9 +-
 src/lib/netlist/solver/nld_solver.cpp      |  59 +++--
 src/lib/netlist/tools/nl_convert.cpp       |  38 +--
 src/lib/netlist/tools/nl_convert.h         |   8 +-
 src/mame/drivers/deco_ld.cpp               |  60 ++---
 src/mame/drivers/system16.cpp              | 181 +++++++------
 src/mame/includes/system16.h               |   1 -
 64 files changed, 1028 insertions(+), 1178 deletions(-)
 create mode 100644 src/devices/machine/ldp1000.cpp
 create mode 100644 src/devices/machine/ldp1000.h

diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index 37bdb8fe933..7ddf031d76d 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -1176,6 +1176,18 @@ if (MACHINES["LDV1000"]~=null) then
 	}
 end
 
+---------------------------------------------------
+--
+--@src/devices/machine/ldp1000.h,MACHINES["LDP1000"] = true
+---------------------------------------------------
+
+if (MACHINES["LDP1000"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/machine/ldp1000.cpp",
+		MAME_DIR .. "src/devices/machine/ldp1000.h",
+	}
+end
+
 ---------------------------------------------------
 --
 --@src/devices/machine/ldvp931.h,MACHINES["LDVP931"] = true
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 13f35db892e..1bd63589f68 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -429,6 +429,7 @@ MACHINES["LC89510"] = true
 MACHINES["LDPR8210"] = true
 MACHINES["LDSTUB"] = true
 MACHINES["LDV1000"] = true
+MACHINES["LDP1000"] = true
 MACHINES["LDVP931"] = true
 --MACHINES["LH5810"] = true
 MACHINES["LINFLASH"] = true
diff --git a/src/devices/machine/ldp1000.cpp b/src/devices/machine/ldp1000.cpp
new file mode 100644
index 00000000000..922f3c2b63e
--- /dev/null
+++ b/src/devices/machine/ldp1000.cpp
@@ -0,0 +1,120 @@
+// license:BSD-3-Clause
+// copyright-holders:Angelo Salese
+/***************************************************************************
+
+	Sony LDP-1000 laserdisc emulation.
+
+	TODO:
+	- Dump BIOSes (seven of them according to docs)
+	- Hookup with Sony SMC-70 / SMC-777
+
+***************************************************************************/
+
+#include "emu.h"
+#include "machine/ldp1000.h"
+
+
+ROM_START( ldp1000 )
+	ROM_REGION( 0x2000, "ldp1000", 0 )
+	ROM_LOAD( "ldp1000_bios.bin", 0x0000, 0x2000, NO_DUMP )
+ROM_END
+
+//**************************************************************************
+//  GLOBAL VARIABLES
+//**************************************************************************
+
+// device type definition
+const device_type SONY_LDP1000 = &device_creator<sony_ldp1000_device>;
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  ldp1000_device - constructor
+//-------------------------------------------------
+
+sony_ldp1000_device::sony_ldp1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+	: laserdisc_device(mconfig, SONY_LDP1000, "Sony LDP-1000", tag, owner, clock, "ldp1000", __FILE__)
+{
+}
+
+
+//-------------------------------------------------
+//  device_validity_check - perform validity checks
+//  on this device
+//-------------------------------------------------
+
+void sony_ldp1000_device::device_validity_check(validity_checker &valid) const
+{
+}
+
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void sony_ldp1000_device::device_start()
+{
+	laserdisc_device::device_start();
+}
+
+
+//-------------------------------------------------
+//  device_reset - device-specific reset
+//-------------------------------------------------
+
+void sony_ldp1000_device::device_reset()
+{
+	laserdisc_device::device_reset();
+
+}
+
+//-------------------------------------------------
+//  device_rom_region - return a pointer to our
+//  ROM region definitions
+//-------------------------------------------------
+
+const rom_entry *sony_ldp1000_device::device_rom_region() const
+{
+	return ROM_NAME(ldp1000);
+}
+
+
+//-------------------------------------------------
+//  player_vsync - VSYNC callback, called at the
+//  start of the blanking period
+//-------------------------------------------------
+
+void sony_ldp1000_device::player_vsync(const vbi_metadata &vbi, int fieldnum, const attotime &curtime)
+{
+	//printf("%d vsync\n",fieldnum);
+}
+
+
+//-------------------------------------------------
+//  player_update - update callback, called on
+//  the first visible line of the frame
+//-------------------------------------------------
+
+INT32 sony_ldp1000_device::player_update(const vbi_metadata &vbi, int fieldnum, const attotime &curtime)
+{
+	//printf("%d update\n",fieldnum);
+
+	return fieldnum;
+}
+
+
+//**************************************************************************
+//  READ/WRITE HANDLERS
+//**************************************************************************
+
+READ8_MEMBER( sony_ldp1000_device::read )
+{
+	return 0;
+}
+
+WRITE8_MEMBER( sony_ldp1000_device::write )
+{
+}
diff --git a/src/devices/machine/ldp1000.h b/src/devices/machine/ldp1000.h
new file mode 100644
index 00000000000..ee7acc789bf
--- /dev/null
+++ b/src/devices/machine/ldp1000.h
@@ -0,0 +1,67 @@
+// license:BSD-3-Clause
+// copyright-holders:Angelo Salese
+/***************************************************************************
+
+	Sony LDP-1000 laserdisc emulation.
+
+***************************************************************************/
+
+#pragma once
+
+#ifndef __LDP1000DEV_H__
+#define __LDP1000DEV_H__
+
+#include "laserdsc.h"
+
+
+//**************************************************************************
+//  INTERFACE CONFIGURATION MACROS
+//**************************************************************************
+
+#define MCFG_LASERDISC_LDP1000_ADD(_tag) \
+	MCFG_DEVICE_ADD(_tag, SONY_LDP1000, 0)
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+// device type definition
+extern const device_type SONY_LDP1000;
+
+// ======================> sony_ldp1000_device
+
+class sony_ldp1000_device : public laserdisc_device
+{
+public:
+	// construction/destruction
+	sony_ldp1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+
+	// I/O operations
+	DECLARE_WRITE8_MEMBER( write );
+	DECLARE_READ8_MEMBER( read );
+
+protected:
+	// device-level overrides
+	virtual void device_validity_check(validity_checker &valid) const override;
+	virtual void device_start() override;
+	virtual void device_reset() override;
+	virtual const rom_entry *device_rom_region() const override;
+	
+	virtual void player_vsync(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) override;
+	virtual INT32 player_update(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) override;
+	virtual void player_overlay(bitmap_yuy16 &bitmap) override { }
+
+};
+
+
+
+
+
+
+//**************************************************************************
+//  GLOBAL VARIABLES
+//**************************************************************************
+
+
+
+#endif
diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp
index bd65d0b2eef..b193492c5f6 100644
--- a/src/devices/machine/netlist.cpp
+++ b/src/devices/machine/netlist.cpp
@@ -322,9 +322,9 @@ void netlist_mame_device_t::device_start()
 	m_setup->start_devices();
 	m_setup->resolve_inputs();
 
-	netlist().save_item(this, m_rem, "m_rem");
-	netlist().save_item(this, m_div, "m_div");
-	netlist().save_item(this, m_old, "m_old");
+	netlist().save(*this, m_rem, "m_rem");
+	netlist().save(*this, m_div, "m_div");
+	netlist().save(*this, m_old, "m_old");
 
 	save_state();
 
@@ -366,7 +366,7 @@ ATTR_COLD void netlist_mame_device_t::device_post_load()
 {
 	LOG_DEV_CALLS(("device_post_load\n"));
 
-	netlist().post_load();
+	netlist().state().post_load();
 	netlist().rebuild_lists();
 }
 
@@ -374,7 +374,7 @@ ATTR_COLD void netlist_mame_device_t::device_pre_save()
 {
 	LOG_DEV_CALLS(("device_pre_save\n"));
 
-	netlist().pre_save();
+	netlist().state().pre_save();
 }
 
 void netlist_mame_device_t::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
@@ -399,53 +399,44 @@ ATTR_HOT ATTR_ALIGN void netlist_mame_device_t::check_mame_abort_slice()
 
 ATTR_COLD void netlist_mame_device_t::save_state()
 {
-	for (auto const & s : netlist().save_list())
+	for (auto const & s : netlist().state().save_list())
 	{
 		netlist().log().debug("saving state for {1}\n", s->m_name.cstr());
-		switch (s->m_dt)
+		if (s->m_dt.is_float)
 		{
-			case pstate_data_type_e::DT_DOUBLE:
-				{
-					double *td = s->resolved<double>();
-					if (td != nullptr) save_pointer(td, s->m_name.cstr(), s->m_count);
-				}
-				break;
-			case pstate_data_type_e::DT_FLOAT:
-				{
-					float *td = s->resolved<float>();
-					if (td != nullptr) save_pointer(td, s->m_name.cstr(), s->m_count);
-				}
-				break;
-#if (PHAS_INT128)
-			case pstate_data_type_e::DT_INT128:
-				// FIXME: we are cheating here
-				save_pointer((char *) s->m_ptr, s->m_name.cstr(), s->m_count * sizeof(INT128));
-				break;
-#endif
-			case pstate_data_type_e::DT_INT64:
-				save_pointer((INT64 *) s->m_ptr, s->m_name.cstr(), s->m_count);
-				break;
-			case pstate_data_type_e::DT_INT16:
-				save_pointer((INT16 *) s->m_ptr, s->m_name.cstr(), s->m_count);
-				break;
-			case pstate_data_type_e::DT_INT8:
-				save_pointer((INT8 *) s->m_ptr, s->m_name.cstr(), s->m_count);
-				break;
-			case pstate_data_type_e::DT_INT:
-				save_pointer((int *) s->m_ptr, s->m_name.cstr(), s->m_count);
-				break;
-			case pstate_data_type_e::DT_BOOLEAN:
-				save_pointer((bool *) s->m_ptr, s->m_name.cstr(), s->m_count);
-				break;
-			case pstate_data_type_e::DT_CUSTOM:
-				break;
-			case pstate_data_type_e::NOT_SUPPORTED:
-			default:
-				netlist().log().fatal("found unsupported save element %s\n", s->m_name);
-				break;
+			if (s->m_dt.size == sizeof(double))
+			{
+				double *td = s->resolved<double>();
+				if (td != nullptr) save_pointer(td, s->m_name.cstr(), s->m_count);
+			}
+			else if (s->m_dt.size == sizeof(float))
+			{
+				float *td = s->resolved<float>();
+				if (td != nullptr) save_pointer(td, s->m_name.cstr(), s->m_count);
+			}
+			else
+				netlist().log().fatal("Unknown floating type for {1}\n", s->m_name.cstr());
 		}
+		else if (s->m_dt.is_integral)
+		{
+			if (s->m_dt.size == sizeof(INT64))
+				save_pointer((INT64 *) s->m_ptr, s->m_name.cstr(), s->m_count);
+			else if (s->m_dt.size == sizeof(INT32))
+				save_pointer((INT32 *) s->m_ptr, s->m_name.cstr(), s->m_count);
+			else if (s->m_dt.size == sizeof(INT16))
+				save_pointer((INT16 *) s->m_ptr, s->m_name.cstr(), s->m_count);
+			else if (s->m_dt.size == sizeof(INT8))
+				save_pointer((INT8 *) s->m_ptr, s->m_name.cstr(), s->m_count);
+			else
+				netlist().log().fatal("Unknown integral type size {1} for {2}\n", s->m_dt.size, s->m_name.cstr());
+		}
+		else if (s->m_dt.is_custom)
+		{
+			/* do nothing */
+		}
+		else
+			netlist().log().fatal("found unsupported save element {1}\n", s->m_name);
 	}
-
 }
 
 // ----------------------------------------------------------------------------------------
@@ -566,7 +557,7 @@ void netlist_mame_sound_device_t::device_start()
 
 	// Configure outputs
 
-	plib::pvector_t<nld_sound_out *> outdevs = netlist().get_device_list<nld_sound_out>();
+	std::vector<nld_sound_out *> outdevs = netlist().get_device_list<nld_sound_out>();
 	if (outdevs.size() == 0)
 		fatalerror("No output devices");
 
@@ -592,7 +583,7 @@ void netlist_mame_sound_device_t::device_start()
 	m_num_inputs = 0;
 	m_in = nullptr;
 
-	plib::pvector_t<nld_sound_in *> indevs = netlist().get_device_list<nld_sound_in>();
+	std::vector<nld_sound_in *> indevs = netlist().get_device_list<nld_sound_in>();
 	if (indevs.size() > 1)
 		fatalerror("A maximum of one input device is allowed!");
 	if (indevs.size() == 1)
diff --git a/src/devices/machine/netlist.h b/src/devices/machine/netlist.h
index 8eba71f8ba1..81e8f036d93 100644
--- a/src/devices/machine/netlist.h
+++ b/src/devices/machine/netlist.h
@@ -507,10 +507,9 @@ public:
 	: device_t(anetlist, name)
 	, m_in(*this, "IN")
 	, m_cpu_device(nullptr)
-	, m_last(0)
+	, m_last(*this, "m_last", 0)
 	{
 		m_cpu_device = downcast<netlist_mame_cpu_device_t *>(&downcast<netlist_mame_t &>(netlist()).parent());
-		save(NLNAME(m_last));
 	}
 
 	ATTR_COLD void reset() override
@@ -542,7 +541,7 @@ private:
 	netlist::analog_input_t m_in;
 	netlist_analog_output_delegate m_callback;
 	netlist_mame_cpu_device_t *m_cpu_device;
-	nl_double m_last;
+	netlist::state_var<nl_double> m_last;
 };
 
 // ----------------------------------------------------------------------------------------
@@ -557,10 +556,10 @@ public:
 		, m_channel(*this, "CHAN", 0)
 		, m_mult(*this, "MULT", 1000.0)
 		, m_offset(*this, "OFFSET", 0.0)
+		, m_sample(netlist::netlist_time::from_hz(1)) //sufficiently big enough
 		, m_in(*this, "IN")
+		, m_last_buffer(*this, "m_last_buffer", netlist::netlist_time::zero())
 	{
-		m_sample = netlist::netlist_time::from_hz(1); //sufficiently big enough
-		save(NAME(m_last_buffer));
 	}
 
 	static const int BUFSIZE = 2048;
@@ -615,7 +614,7 @@ private:
 	netlist::analog_input_t m_in;
 	double m_cur;
 	int m_last_pos;
-	netlist::netlist_time m_last_buffer;
+	netlist::state_var<netlist::netlist_time> m_last_buffer;
 };
 
 // ----------------------------------------------------------------------------------------
diff --git a/src/lib/netlist/analog/nld_bjt.h b/src/lib/netlist/analog/nld_bjt.h
index e8b80b94b4c..bb9f6863ec1 100644
--- a/src/lib/netlist/analog/nld_bjt.h
+++ b/src/lib/netlist/analog/nld_bjt.h
@@ -105,7 +105,7 @@ NETLIB_OBJECT_DERIVED(QBJT_switch, QBJT)
 		, m_gB(NETLIST_GMIN_DEFAULT)
 		, m_gC(NETLIST_GMIN_DEFAULT)
 		, m_V(0.0)
-		, m_state_on(0)
+		, m_state_on(*this, "m_state_on", 0)
 	{
 		register_subalias("B", m_RB.m_P);
 		register_subalias("E", m_RB.m_N);
@@ -119,8 +119,6 @@ NETLIB_OBJECT_DERIVED(QBJT_switch, QBJT)
 
 		connect_late(m_RB.m_P, m_BC_dummy.m_P);
 		connect_late(m_RC.m_P, m_BC_dummy.m_N);
-
-		save(NLNAME(m_state_on));
 	}
 
 	NETLIB_RESETI();
@@ -141,7 +139,7 @@ protected:
 	nl_double m_gB; // base conductance / switch on
 	nl_double m_gC; // collector conductance / switch on
 	nl_double m_V; // internal voltage source
-	UINT8 m_state_on;
+	state_var<unsigned> m_state_on;
 
 private:
 };
@@ -155,11 +153,13 @@ NETLIB_OBJECT_DERIVED(QBJT_EB, QBJT)
 {
 public:
 	NETLIB_CONSTRUCTOR_DERIVED(QBJT_EB, QBJT)
-		,   m_D_CB(*this, "m_D_CB", true)
-		,   m_D_EB(*this, "m_D_EB", true)
-		,   m_D_EC(*this, "m_D_EC", true)
-		,   m_alpha_f(0)
-		,   m_alpha_r(0)
+	, m_gD_BC(*this, "m_D_BC")
+	, m_gD_BE(*this, "m_D_BE")
+	, m_D_CB(*this, "m_D_CB", true)
+	, m_D_EB(*this, "m_D_EB", true)
+	, m_D_EC(*this, "m_D_EC", true)
+	, m_alpha_f(0)
+	, m_alpha_r(0)
 	{
 		register_subalias("E", m_D_EB.m_P);   // Cathode
 		register_subalias("B", m_D_EB.m_N);   // Anode
@@ -173,9 +173,6 @@ public:
 		connect_late(m_D_EB.m_P, m_D_EC.m_P);
 		connect_late(m_D_EB.m_N, m_D_CB.m_N);
 		connect_late(m_D_CB.m_P, m_D_EC.m_N);
-
-		m_gD_BE.save("m_D_BE", *this);
-		m_gD_BC.save("m_D_BC", *this);
 	}
 
 protected:
diff --git a/src/lib/netlist/analog/nld_opamps.h b/src/lib/netlist/analog/nld_opamps.h
index 850886b7a0e..6bef8b0bbdc 100644
--- a/src/lib/netlist/analog/nld_opamps.h
+++ b/src/lib/netlist/analog/nld_opamps.h
@@ -44,7 +44,7 @@ NETLIB_OBJECT(OPAMP)
 	, m_G1(*this, "G1")
 	, m_VCC(*this, "VCC")
 	, m_GND(*this, "GND")
-	, m_model(*this, "MODEL", "")
+	, m_model(*this, "MODEL", "LM324")
 	, m_VH(*this, "VH")
 	, m_VL(*this, "VL")
 	, m_VREF(*this, "VREF")
diff --git a/src/lib/netlist/analog/nld_twoterm.cpp b/src/lib/netlist/analog/nld_twoterm.cpp
index 9a526c4c174..0460d6f2e71 100644
--- a/src/lib/netlist/analog/nld_twoterm.cpp
+++ b/src/lib/netlist/analog/nld_twoterm.cpp
@@ -19,12 +19,18 @@ namespace netlist
 // generic_diode
 // ----------------------------------------------------------------------------------------
 
-generic_diode::generic_diode()
+generic_diode::generic_diode(device_t &dev, pstring name)
+	: m_Vd(dev, name + ".m_Vd", 0.7)
+	, m_Id(dev, name + ".m_Id", 0.0)
+	, m_G(dev,  name + ".m_G", 1e-15)
+	, m_Vt(0.0)
+	, m_Is(0.0)
+	, m_n(0.0)
+	, m_gmin(1e-15)
+	, m_VtInv(0.0)
+	, m_Vcrit(0.0)
 {
-	m_Vd = 0.7;
 	set_param(1e-15, 1, 1e-15);
-	m_G = m_gmin;
-	m_Id = 0.0;
 }
 
 void generic_diode::set_param(const nl_double Is, const nl_double n, nl_double gmin)
@@ -40,13 +46,6 @@ void generic_diode::set_param(const nl_double Is, const nl_double n, nl_double g
 	m_VtInv = 1.0 / m_Vt;
 }
 
-void generic_diode::save(pstring name, object_t &parent)
-{
-	parent.save(m_Vd, name + ".m_Vd");
-	parent.save(m_Id, name + ".m_Id");
-	parent.save(m_G, name + ".m_G");
-}
-
 // ----------------------------------------------------------------------------------------
 // nld_twoterm
 // ----------------------------------------------------------------------------------------
diff --git a/src/lib/netlist/analog/nld_twoterm.h b/src/lib/netlist/analog/nld_twoterm.h
index d94b1498a53..0b9f68b7fdd 100644
--- a/src/lib/netlist/analog/nld_twoterm.h
+++ b/src/lib/netlist/analog/nld_twoterm.h
@@ -311,7 +311,7 @@ private:
 class generic_diode
 {
 public:
-	generic_diode();
+	generic_diode(device_t &dev, pstring name);
 
 	inline void update_diode(const nl_double nVd)
 	{
@@ -360,12 +360,10 @@ public:
 
 	/* owning object must save those ... */
 
-	void save(pstring name, object_t &parent);
-
 private:
-	nl_double m_Vd;
-	nl_double m_Id;
-	nl_double m_G;
+	state_var<nl_double> m_Vd;
+	state_var<nl_double> m_Id;
+	state_var<nl_double> m_G;
 
 	nl_double m_Vt;
 	nl_double m_Is;
@@ -385,11 +383,10 @@ NETLIB_OBJECT_DERIVED(D, twoterm)
 public:
 	NETLIB_CONSTRUCTOR_DERIVED(D, twoterm)
 	, m_model(*this, "MODEL", "")
+	, m_D(*this, "m_D")
 	{
 		register_subalias("A", m_P);
 		register_subalias("K", m_N);
-
-		m_D.save("m_D", *this);
 	}
 
 	NETLIB_DYNAMIC()
diff --git a/src/lib/netlist/devices/nld_4020.cpp b/src/lib/netlist/devices/nld_4020.cpp
index 93916c344bc..f0e79ece754 100644
--- a/src/lib/netlist/devices/nld_4020.cpp
+++ b/src/lib/netlist/devices/nld_4020.cpp
@@ -22,9 +22,8 @@ namespace netlist
 		, m_IP(*this, "IP")
 		, m_Q(*this, {{"Q1", "_Q2", "_Q3", "Q4", "Q5", "Q6", "Q7", "Q8", "Q9",
 				"Q10", "Q11", "Q12", "Q13", "Q14"}})
-		, m_cnt(0)
+		, m_cnt(*this, "m_cnt", 0)
 		{
-			save(NLNAME(m_cnt));
 		}
 
 		NETLIB_RESETI()
@@ -41,7 +40,7 @@ namespace netlist
 		logic_input_t m_IP;
 		object_array_t<logic_output_t, 14> m_Q;
 
-		UINT16 m_cnt;
+		state_var<unsigned> m_cnt;
 	};
 
 	NETLIB_OBJECT(CD4020)
diff --git a/src/lib/netlist/devices/nld_74107.cpp b/src/lib/netlist/devices/nld_74107.cpp
index 4dfa8b9aa8a..c6adf487db9 100644
--- a/src/lib/netlist/devices/nld_74107.cpp
+++ b/src/lib/netlist/devices/nld_74107.cpp
@@ -18,14 +18,10 @@ namespace netlist
 		, m_clk(*this, "CLK")
 		, m_Q(*this, "Q")
 		, m_QQ(*this, "QQ")
-		, m_Q1(0)
-		, m_Q2(0)
-		, m_F(0)
-
+		, m_Q1(*this, "m_Q1", 0)
+		, m_Q2(*this, "m_Q2", 0)
+		, m_F(*this, "m_F", 0)
 		{
-			save(NLNAME(m_Q1));
-			save(NLNAME(m_Q2));
-			save(NLNAME(m_F));
 		}
 
 		NETLIB_RESETI();
@@ -37,9 +33,9 @@ namespace netlist
 		logic_output_t m_Q;
 		logic_output_t m_QQ;
 
-		netlist_sig_t m_Q1;
-		netlist_sig_t m_Q2;
-		netlist_sig_t m_F;
+		state_var<netlist_sig_t> m_Q1;
+		state_var<netlist_sig_t> m_Q2;
+		state_var<netlist_sig_t> m_F;
 
 		void newstate(const netlist_sig_t state);
 
diff --git a/src/lib/netlist/devices/nld_74123.cpp b/src/lib/netlist/devices/nld_74123.cpp
index 943fd3e14df..29cd3cd97ac 100644
--- a/src/lib/netlist/devices/nld_74123.cpp
+++ b/src/lib/netlist/devices/nld_74123.cpp
@@ -32,6 +32,9 @@ namespace netlist
 		, m_Q(*this, "Q")
 		, m_QQ(*this, "QQ")
 		, m_CV(*this, "_CV") // internal
+		, m_last_trig(*this, "m_last_trig", 0)
+		, m_state(*this, "m_state", 0)
+		, m_KP(*this, "m_KP", 0)
 		, m_K(*this, "K", (m_dev_type == 4538) ? 0.4 : 0.4)
 		, m_RI(*this, "RI", 400.0) // around 250 for HC series, 400 on LS/TTL, estimated from datasheets
 		{
@@ -49,10 +52,6 @@ namespace netlist
 
 			connect_late(m_RN.m_R.m_P, m_RP.m_R.m_N);
 			connect_late(m_CV, m_RN.m_R.m_P);
-
-			save(NLNAME(m_last_trig));
-			save(NLNAME(m_state));
-			save(NLNAME(m_KP));
 		}
 
 		NETLIB_RESETI();
@@ -75,9 +74,9 @@ namespace netlist
 
 		analog_input_t m_CV;
 
-		netlist_sig_t m_last_trig;
-		UINT8         m_state;
-		double        m_KP;
+		state_var<netlist_sig_t> m_last_trig;
+		state_var<unsigned>      m_state;
+		state_var<double>        m_KP;
 
 		param_double_t m_K;
 		param_double_t m_RI;
diff --git a/src/lib/netlist/devices/nld_74153.cpp b/src/lib/netlist/devices/nld_74153.cpp
index 32497c627e3..bd95659e76a 100644
--- a/src/lib/netlist/devices/nld_74153.cpp
+++ b/src/lib/netlist/devices/nld_74153.cpp
@@ -23,9 +23,8 @@ namespace netlist
 		, m_C(*this, {{"C0", "C1", "C2", "C3"}})
 		, m_G(*this, "G")
 		, m_Y(*this, "AY") //FIXME: Change netlists
-		, m_chan(0)
+		, m_chan(*this, "m_chan", 0)
 		{
-			save(NLNAME(m_chan));
 		}
 
 		NETLIB_RESETI();
@@ -37,7 +36,7 @@ namespace netlist
 
 		logic_output_t m_Y;
 
-		int m_chan;
+		state_var<unsigned> m_chan;
 	};
 
 	NETLIB_OBJECT(74153)
diff --git a/src/lib/netlist/devices/nld_74175.cpp b/src/lib/netlist/devices/nld_74175.cpp
index 79c4fb85d1a..66d98451ad4 100644
--- a/src/lib/netlist/devices/nld_74175.cpp
+++ b/src/lib/netlist/devices/nld_74175.cpp
@@ -18,10 +18,9 @@ namespace netlist
 		, m_CLK(*this, "CLK")
 		, m_Q(*this, {{"Q1", "Q2", "Q3", "Q4"}})
 		, m_QQ(*this, {{"Q1Q", "Q2Q", "Q3Q", "Q4Q"}})
-		, m_data(0)
+		, m_clrq(*this, "m_clr", 0)
+		, m_data(*this, "m_data", 0)
 		{
-			save(NLNAME(m_clrq));
-			save(NLNAME(m_data));
 		}
 
 		NETLIB_RESETI();
@@ -32,8 +31,8 @@ namespace netlist
 		object_array_t<logic_output_t, 4> m_Q;
 		object_array_t<logic_output_t, 4> m_QQ;
 
-		netlist_sig_t m_clrq;
-		UINT8 m_data;
+		state_var<netlist_sig_t> m_clrq;
+		state_var<unsigned>      m_data;
 	};
 
 	NETLIB_OBJECT(74175)
diff --git a/src/lib/netlist/devices/nld_74192.cpp b/src/lib/netlist/devices/nld_74192.cpp
index cc0260fd99a..216fc75224c 100644
--- a/src/lib/netlist/devices/nld_74192.cpp
+++ b/src/lib/netlist/devices/nld_74192.cpp
@@ -48,6 +48,9 @@ namespace netlist
 		, m_LOADQ(*this, "LOADQ")
 		, m_CU(*this, "CU")
 		, m_CD(*this, "CD")
+		, m_cnt(*this, "m_cnt", 0)
+		, m_last_CU(*this, "m_last_CU", 0)
+		, m_last_CD(*this, "m_last_CD", 0)
 		, m_Q(*this, {{"QA", "QB", "QC", "QD"}})
 		, m_BORROWQ(*this, "BORROWQ")
 		, m_CARRYQ(*this, "CARRYQ")
@@ -56,10 +59,6 @@ namespace netlist
 			register_subalias("B", m_ABCD.m_B);
 			register_subalias("C", m_ABCD.m_C);
 			register_subalias("D", m_ABCD.m_D);
-
-			save(NLNAME(m_cnt));
-			save(NLNAME(m_last_CU));
-			save(NLNAME(m_last_CD));
 		}
 
 		NETLIB_RESETI();
@@ -72,9 +71,9 @@ namespace netlist
 		logic_input_t m_CU;
 		logic_input_t m_CD;
 
-		INT8 m_cnt;
-		UINT8 m_last_CU;
-		UINT8 m_last_CD;
+		state_var<int> m_cnt;
+		state_var<unsigned> m_last_CU;
+		state_var<unsigned> m_last_CD;
 
 		object_array_t<logic_output_t, 4> m_Q;
 		logic_output_t m_BORROWQ;
diff --git a/src/lib/netlist/devices/nld_74193.cpp b/src/lib/netlist/devices/nld_74193.cpp
index 0742ff1ce54..264c348e656 100644
--- a/src/lib/netlist/devices/nld_74193.cpp
+++ b/src/lib/netlist/devices/nld_74193.cpp
@@ -25,17 +25,13 @@ namespace netlist
 		, m_LOADQ(*this, "LOADQ")
 		, m_CU(*this, "CU")
 		, m_CD(*this, "CD")
-		, m_cnt(0)
-		, m_last_CU(0)
-		, m_last_CD(0)
+		, m_cnt(*this, "m_cnt", 0)
+		, m_last_CU(*this, "m_last_CU", 0)
+		, m_last_CD(*this, "m_last_CD", 0)
 		, m_Q(*this, {{"QA", "QB", "QC", "QD"}})
 		, m_BORROWQ(*this, "BORROWQ")
 		, m_CARRYQ(*this, "CARRYQ")
 		{
-
-			save(NLNAME(m_cnt));
-			save(NLNAME(m_last_CU));
-			save(NLNAME(m_last_CD));
 		}
 
 		NETLIB_RESETI();
@@ -51,9 +47,9 @@ namespace netlist
 		logic_input_t m_CU;
 		logic_input_t m_CD;
 
-		INT8 m_cnt;
-		UINT8 m_last_CU;
-		UINT8 m_last_CD;
+		state_var<int> m_cnt;
+		state_var<unsigned> m_last_CU;
+		state_var<unsigned> m_last_CD;
 
 		object_array_t<logic_output_t, 4> m_Q;
 		logic_output_t m_BORROWQ;
diff --git a/src/lib/netlist/devices/nld_7448.cpp b/src/lib/netlist/devices/nld_7448.cpp
index edb11783d2e..88ccaffe83d 100644
--- a/src/lib/netlist/devices/nld_7448.cpp
+++ b/src/lib/netlist/devices/nld_7448.cpp
@@ -37,10 +37,9 @@ namespace netlist
 		, m_LTQ(*this, "LTQ")
 		, m_BIQ(*this, "BIQ")
 		, m_RBIQ(*this, "RBIQ")
-		, m_state(0)
+		, m_state(*this, "m_state", 0)
 		, m_Q(*this, {{"a", "b", "c", "d", "e", "f", "g"}})
 		{
-			save(NLNAME(m_state));
 		}
 
 		NETLIB_RESETI();
@@ -58,7 +57,7 @@ namespace netlist
 		logic_input_t m_BIQ;
 		logic_input_t m_RBIQ;
 
-		UINT8 m_state;
+		state_var<unsigned> m_state;
 
 		object_array_t<logic_output_t, 7> m_Q;  /* a .. g */
 
diff --git a/src/lib/netlist/devices/nld_7474.cpp b/src/lib/netlist/devices/nld_7474.cpp
index 55355d83cad..2d662ab73db 100644
--- a/src/lib/netlist/devices/nld_7474.cpp
+++ b/src/lib/netlist/devices/nld_7474.cpp
@@ -18,10 +18,8 @@ namespace netlist
 		, m_CLK(*this, "CLK")
 		, m_Q(*this, "Q")
 		, m_QQ(*this, "QQ")
-		, m_nextD(0)
+		, m_nextD(*this, "m_nextD", 0)
 		{
-
-			save(NLNAME(m_nextD));
 		}
 
 		NETLIB_RESETI();
@@ -31,7 +29,7 @@ namespace netlist
 		logic_input_t m_CLK;
 		logic_output_t m_Q;
 		logic_output_t m_QQ;
-		INT8 m_nextD;
+		state_var<unsigned> m_nextD;
 
 		inline void newstate(const UINT8 stateQ, const UINT8 stateQQ);
 
diff --git a/src/lib/netlist/devices/nld_7483.cpp b/src/lib/netlist/devices/nld_7483.cpp
index db23f26d563..a34c2b832c8 100644
--- a/src/lib/netlist/devices/nld_7483.cpp
+++ b/src/lib/netlist/devices/nld_7483.cpp
@@ -24,14 +24,13 @@ namespace netlist
 		, m_B2(*this, "B2")
 		, m_B3(*this, "B3")
 		, m_B4(*this, "B4")
-		, m_lastr(0)
+		, m_lastr(*this, "m_lastr", 0)
 		, m_S1(*this, "S1")
 		, m_S2(*this, "S2")
 		, m_S3(*this, "S3")
 		, m_S4(*this, "S4")
 		, m_C4(*this, "C4")
 		{
-			save(NLNAME(m_lastr));
 		}
 		NETLIB_RESETI();
 		NETLIB_UPDATEI();
@@ -47,7 +46,7 @@ namespace netlist
 		logic_input_t m_B3;
 		logic_input_t m_B4;
 
-		UINT8 m_lastr;
+		state_var<unsigned> m_lastr;
 
 		logic_output_t m_S1;
 		logic_output_t m_S2;
diff --git a/src/lib/netlist/devices/nld_7490.cpp b/src/lib/netlist/devices/nld_7490.cpp
index c47cc1d94a9..709a7920d3f 100644
--- a/src/lib/netlist/devices/nld_7490.cpp
+++ b/src/lib/netlist/devices/nld_7490.cpp
@@ -21,14 +21,11 @@ namespace netlist
 		, m_R2(*this, "R2")
 		, m_R91(*this, "R91")
 		, m_R92(*this, "R92")
-		, m_cnt(0)
-		, m_last_A(0)
-		, m_last_B(0)
+		, m_cnt(*this, "m_cnt", 0)
+		, m_last_A(*this, "m_last_A", 0)
+		, m_last_B(*this, "m_last_B", 0)
 		, m_Q(*this, {{"QA", "QB", "QC", "QD"}})
 		{
-			save(NLNAME(m_cnt));
-			save(NLNAME(m_last_A));
-			save(NLNAME(m_last_B));
 		}
 
 		NETLIB_UPDATEI();
@@ -44,9 +41,9 @@ namespace netlist
 		logic_input_t m_R91;
 		logic_input_t m_R92;
 
-		UINT8 m_cnt;
-		UINT8 m_last_A;
-		UINT8 m_last_B;
+		state_var<UINT8> m_cnt;
+		state_var<UINT8> m_last_A;
+		state_var<UINT8> m_last_B;
 
 		object_array_t<logic_output_t, 4> m_Q;
 	};
diff --git a/src/lib/netlist/devices/nld_7493.cpp b/src/lib/netlist/devices/nld_7493.cpp
index b60972d8dad..138e65dded1 100644
--- a/src/lib/netlist/devices/nld_7493.cpp
+++ b/src/lib/netlist/devices/nld_7493.cpp
@@ -19,10 +19,9 @@ namespace netlist
 		NETLIB_CONSTRUCTOR(7493ff)
 		, m_I(*this, "CLK")
 		, m_Q(*this, "Q")
+		, m_reset(*this, "m_reset", 0)
+		, m_state(*this, "m_state", 0)
 		{
-
-			save(NLNAME(m_reset));
-			save(NLNAME(m_state));
 		}
 
 		NETLIB_RESETI();
@@ -32,8 +31,8 @@ namespace netlist
 		logic_input_t m_I;
 		logic_output_t m_Q;
 
-		UINT8 m_reset;
-		UINT8 m_state;
+		state_var<UINT8> m_reset;
+		state_var<UINT8> m_state;
 	};
 
 	NETLIB_OBJECT(7493)
diff --git a/src/lib/netlist/devices/nld_74ls629.cpp b/src/lib/netlist/devices/nld_74ls629.cpp
index eb9fbd7f712..bd8127f068c 100644
--- a/src/lib/netlist/devices/nld_74ls629.cpp
+++ b/src/lib/netlist/devices/nld_74ls629.cpp
@@ -52,15 +52,11 @@ namespace netlist
 		NETLIB_CONSTRUCTOR(SN74LS629clk)
 		, m_FB(*this, "FB")
 		, m_Y(*this, "Y")
-		, m_enableq(1)
-		, m_out(0)
-		, m_inc(netlist_time::zero())
+		, m_enableq(*this, "m_enableq", 1)
+		, m_out(*this, "m_out", 0)
+		, m_inc(*this, "m_inc", netlist_time::zero())
 		{
 			connect_late(m_FB, m_Y);
-
-			save(NLNAME(m_enableq));
-			save(NLNAME(m_inc));
-			save(NLNAME(m_out));
 		}
 
 		NETLIB_RESETI()
@@ -76,9 +72,9 @@ namespace netlist
 		logic_input_t m_FB;
 		logic_output_t m_Y;
 
-		netlist_sig_t m_enableq;
-		netlist_sig_t m_out;
-		netlist_time m_inc;
+		state_var<netlist_sig_t> m_enableq;
+		state_var<netlist_sig_t> m_out;
+		state_var<netlist_time> m_inc;
 	};
 
 	NETLIB_OBJECT(SN74LS629)
diff --git a/src/lib/netlist/devices/nld_82S16.cpp b/src/lib/netlist/devices/nld_82S16.cpp
index 9b3e32cd291..aa7e2da3765 100644
--- a/src/lib/netlist/devices/nld_82S16.cpp
+++ b/src/lib/netlist/devices/nld_82S16.cpp
@@ -22,8 +22,8 @@ namespace netlist
 		, m_WEQ(*this, "WEQ")
 		, m_DIN(*this, "DIN")
 		, m_DOUTQ(*this, "DOUTQ")
+		, m_ram(*this, "m_ram", 0)
 		{
-			save(NLNAME(m_ram));
 		}
 
 		NETLIB_RESETI();
@@ -39,7 +39,7 @@ namespace netlist
 		logic_output_t m_DOUTQ;
 
 		//netlist_state_t<UINT8[256]> m_ram;
-		UINT64 m_ram[4]; // 256 bits
+		state_var<UINT64[4]> m_ram; // 256 bits
 	};
 
 	NETLIB_OBJECT_DERIVED(82S16_dip, 82S16)
diff --git a/src/lib/netlist/devices/nld_9310.cpp b/src/lib/netlist/devices/nld_9310.cpp
index 97c2d2b0a7f..3bacf460892 100644
--- a/src/lib/netlist/devices/nld_9310.cpp
+++ b/src/lib/netlist/devices/nld_9310.cpp
@@ -50,13 +50,10 @@ namespace netlist
 		, m_QC(*this, "QC")
 		, m_QD(*this, "QD")
 		, m_RC(*this, "RC")
-		, m_cnt(0)
-		, m_loadq(0)
-		, m_ent(0)
+		, m_cnt(*this, "m_cnt", 0)
+		, m_loadq(*this, "m_loadq", 0)
+		, m_ent(*this, "m_ent", 0)
 		{
-			save(NLNAME(m_cnt));
-			save(NLNAME(m_loadq));
-			save(NLNAME(m_ent));
 		}
 		NETLIB_RESETI();
 		NETLIB_UPDATEI();
@@ -73,9 +70,9 @@ namespace netlist
 		logic_output_t m_QC;
 		logic_output_t m_QD;
 		logic_output_t m_RC;
-		UINT8 m_cnt;
-		netlist_sig_t m_loadq;
-		netlist_sig_t m_ent;
+		state_var<UINT8> m_cnt;
+		state_var<netlist_sig_t> m_loadq;
+		state_var<netlist_sig_t> m_ent;
 	};
 
 	NETLIB_OBJECT(9310)
diff --git a/src/lib/netlist/devices/nld_9316.cpp b/src/lib/netlist/devices/nld_9316.cpp
index 287a9b6669d..3083b77ba6a 100644
--- a/src/lib/netlist/devices/nld_9316.cpp
+++ b/src/lib/netlist/devices/nld_9316.cpp
@@ -49,15 +49,11 @@ namespace netlist
 		, m_QC(*this, "QC")
 		, m_QD(*this, "QD")
 		, m_RC(*this, "RC")
-		, m_cnt(0)
 		, m_ABCD(nullptr)
-		, m_loadq(0)
-		, m_ent(0)
+		, m_cnt(*this, "m_cnt", 0)
+		, m_loadq(*this, "m_loadq", 0)
+		, m_ent(*this, "m_ent", 0)
 		{
-
-			save(NLNAME(m_cnt));
-			save(NLNAME(m_loadq));
-			save(NLNAME(m_ent));
 		}
 
 		NETLIB_RESETI();
@@ -75,10 +71,10 @@ namespace netlist
 		logic_output_t m_QD;
 		logic_output_t m_RC;
 
-		UINT8 m_cnt;
 		NETLIB_NAME(9316_subABCD) *m_ABCD;
-		netlist_sig_t m_loadq;
-		netlist_sig_t m_ent;
+		state_var<UINT8> m_cnt;
+		state_var<netlist_sig_t> m_loadq;
+		state_var<netlist_sig_t> m_ent;
 	};
 
 	NETLIB_OBJECT(9316)
diff --git a/src/lib/netlist/devices/nld_legacy.cpp b/src/lib/netlist/devices/nld_legacy.cpp
index aaf7c9e25a3..f3675468513 100644
--- a/src/lib/netlist/devices/nld_legacy.cpp
+++ b/src/lib/netlist/devices/nld_legacy.cpp
@@ -42,9 +42,8 @@ namespace netlist
 		, m_Q(*this, "2")
 		, m_L_to_H(*this, "L_TO_H", 10)
 		, m_H_to_L(*this, "H_TO_L", 10)
-		, m_last(0)
+		, m_last(*this, "m_last", 0)
 		{
-			save(NLNAME(m_last));
 		}
 
 		//NETLIB_UPDATE_PARAMI();
@@ -58,7 +57,7 @@ namespace netlist
 		param_int_t m_L_to_H;
 		param_int_t m_H_to_L;
 
-		UINT8 m_last;
+		state_var<UINT8> m_last;
 	};
 
 	NETLIB_RESET(nicRSFF)
diff --git a/src/lib/netlist/devices/nld_mm5837.cpp b/src/lib/netlist/devices/nld_mm5837.cpp
index 9624bec2621..c41c58adbae 100644
--- a/src/lib/netlist/devices/nld_mm5837.cpp
+++ b/src/lib/netlist/devices/nld_mm5837.cpp
@@ -28,10 +28,10 @@ namespace netlist
 		/* clock */
 		, m_feedback(*this, "FB")
 		, m_Q(*this, "Q")
-		, m_inc(0, 1)
+		, m_inc(netlist_time::from_hz(56000))
+		, m_shift(*this, "m_shift", 0)
 		, m_is_timestep(false)
 		{
-			m_inc = netlist_time::from_hz(56000);
 			connect_late(m_feedback, m_Q);
 
 			/* output */
@@ -41,9 +41,6 @@ namespace netlist
 
 			/* device */
 			register_subalias("3", m_RV.m_P);
-
-			save(NLNAME(m_shift));
-
 		}
 
 		NETLIB_RESETI();
@@ -61,10 +58,10 @@ namespace netlist
 		/* clock stage */
 		logic_input_t m_feedback;
 		logic_output_t m_Q;
-		netlist_time m_inc;
+		const netlist_time m_inc;
 
 		/* state */
-		UINT32 m_shift;
+		state_var<UINT32> m_shift;
 
 		/* cache */
 		bool m_is_timestep;
diff --git a/src/lib/netlist/devices/nld_ne555.cpp b/src/lib/netlist/devices/nld_ne555.cpp
index 2197beea776..e2553099cbd 100644
--- a/src/lib/netlist/devices/nld_ne555.cpp
+++ b/src/lib/netlist/devices/nld_ne555.cpp
@@ -28,8 +28,8 @@ namespace netlist
 		, m_THRES(*this, "THRESH")    // Pin 6
 		, m_TRIG(*this, "TRIG")       // Pin 2
 		, m_OUT(*this, "OUT")         // Pin 3
-		, m_last_out(false)
-		, m_ff(false)
+		, m_last_out(*this, "m_last_out", false)
+		, m_ff(*this, "m_ff", false)
 		{
 
 			register_subalias("GND",  m_R3.m_N);    // Pin 1
@@ -40,9 +40,6 @@ namespace netlist
 			connect_late(m_R1.m_N, m_R2.m_P);
 			connect_late(m_R2.m_N, m_R3.m_P);
 			connect_late(m_RDIS.m_N, m_R3.m_N);
-
-			save(NLNAME(m_last_out));
-			save(NLNAME(m_ff));
 		}
 
 		NETLIB_UPDATEI();
@@ -60,8 +57,8 @@ namespace netlist
 		analog_output_t m_OUT;
 
 	private:
-		bool m_last_out;
-		bool m_ff;
+		state_var<bool> m_last_out;
+		state_var<bool> m_ff;
 
 		inline nl_double clamp(const nl_double v, const nl_double a, const nl_double b);
 
diff --git a/src/lib/netlist/devices/nld_system.cpp b/src/lib/netlist/devices/nld_system.cpp
index c7467f7e3cc..dbbccb78a72 100644
--- a/src/lib/netlist/devices/nld_system.cpp
+++ b/src/lib/netlist/devices/nld_system.cpp
@@ -30,7 +30,7 @@ namespace netlist
 
 	NETLIB_UPDATE(clock)
 	{
-		OUTLOGIC(m_Q, !m_Q.net().new_Q(), m_inc  );
+		OUTLOGIC(m_Q, !INPLOGIC(m_feedback), m_inc  );
 	}
 
 	// ----------------------------------------------------------------------------------------
@@ -187,7 +187,7 @@ namespace netlist
 					stack[ptr-1] = stack[ptr-1] / stack[ptr];
 					break;
 				case PUSH_INPUT:
-					stack[ptr++] = INPANALOG(m_I[(int) rc.m_param]);
+					stack[ptr++] = INPANALOG((*m_I[(int) rc.m_param]));
 					break;
 				case PUSH_CONST:
 					stack[ptr++] = rc.m_param;
diff --git a/src/lib/netlist/devices/nld_truthtable.h b/src/lib/netlist/devices/nld_truthtable.h
index d5772907df6..2d439de4f6b 100644
--- a/src/lib/netlist/devices/nld_truthtable.h
+++ b/src/lib/netlist/devices/nld_truthtable.h
@@ -180,9 +180,9 @@ namespace netlist
 				truthtable_t *ttp, const char *desc[])
 		: device_t(owner, name)
 		, m_fam(*this, fam)
-		, m_last_state(0)
-		, m_ign(0)
-		, m_active(1)
+		, m_last_state(*this, "m_last_state", 0)
+		, m_ign(*this, "m_ign", 0)
+		, m_active(*this, "m_active", 1)
 		, m_ttp(ttp)
 		{
 			while (*desc != nullptr && **desc != 0 )
@@ -198,9 +198,9 @@ namespace netlist
 				truthtable_t *ttp, const plib::pstring_vector_t &desc)
 		: device_t(owner, name)
 		, m_fam(*this, fam)
-		, m_last_state(0)
-		, m_ign(0)
-		, m_active(1)
+		, m_last_state(*this, "m_last_state", 0)
+		, m_ign(*this, "m_ign", 0)
+		, m_active(*this, "m_active", 1)
 		, m_ttp(ttp)
 		{
 			m_desc = desc;
@@ -235,7 +235,7 @@ namespace netlist
 			for (std::size_t i=0; i < m_NO; i++)
 			{
 				pstring tmp = "_" + out[i];
-				const int idx = inout.indexof(tmp);
+				const int idx = plib::container::indexof(inout, tmp);
 				if (idx>=0)
 				{
 					connect_late(m_Q[i], m_I[idx]);
@@ -260,9 +260,6 @@ namespace netlist
 			for (int k=0; m_ttp.m_timing_nt[k] != netlist_time::zero(); k++)
 				printf("%d %f\n", k, m_ttp.m_timing_nt[k].as_double() * 1000000.0);
 	#endif
-			save(NLNAME(m_last_state));
-			save(NLNAME(m_ign));
-			save(NLNAME(m_active));
 		}
 
 		NETLIB_RESETI()
@@ -389,9 +386,9 @@ namespace netlist
 			}
 		}
 
-		UINT32 m_last_state;
-		UINT32 m_ign;
-		INT32 m_active;
+		state_var<UINT32> m_last_state;
+		state_var<UINT32> m_ign;
+		state_var<INT32> m_active;
 
 		truthtable_t *m_ttp;
 		plib::pstring_vector_t m_desc;
diff --git a/src/lib/netlist/devices/nlid_system.h b/src/lib/netlist/devices/nlid_system.h
index 8547fcfe22f..b7c2116cb54 100644
--- a/src/lib/netlist/devices/nlid_system.h
+++ b/src/lib/netlist/devices/nlid_system.h
@@ -11,6 +11,8 @@
 #ifndef NLID_SYSTEM_H_
 #define NLID_SYSTEM_H_
 
+#include <vector>
+
 #include "nl_setup.h"
 #include "nl_base.h"
 #include "nl_factory.h"
@@ -119,6 +121,8 @@ namespace netlist
 		, m_offset(*this, "OFFSET", 0.0)
 		, m_feedback(*this, "FB")
 		, m_Q(*this, "Q")
+		, m_cnt(*this, "m_cnt", 0)
+		, m_off(*this, "m_off", netlist_time::zero())
 		{
 			m_inc[0] = netlist_time::from_hz(m_freq.Value()*2);
 
@@ -144,8 +148,6 @@ namespace netlist
 				}
 				m_inc[m_size - 1] = base * total - ttotal;
 			}
-			save(NLNAME(m_cnt));
-			save(NLNAME(m_off));
 		}
 		NETLIB_UPDATEI();
 		NETLIB_RESETI();
@@ -158,10 +160,10 @@ namespace netlist
 
 		logic_input_t m_feedback;
 		logic_output_t m_Q;
-		unsigned m_cnt;
-		unsigned m_size;
 		netlist_time m_inc[32];
-		netlist_time m_off;
+		state_var<unsigned> m_cnt;
+		state_var<netlist_time> m_off;
+		unsigned m_size;
 	};
 
 	// -----------------------------------------------------------------------------
@@ -258,7 +260,7 @@ namespace netlist
 	{
 	public:
 		NETLIB_CONSTRUCTOR_DERIVED(frontier, base_dummy)
-		, m_RIN(*this, "m_RIN")
+		, m_RIN(*this, "m_RIN", true)
 		, m_ROUT(*this, "m_ROUT", true)
 		, m_I(*this, "_I")
 		, m_Q(*this, "_Q")
@@ -312,7 +314,7 @@ namespace netlist
 		{
 
 			for (std::size_t i=0; i < m_N; i++)
-				m_I.emplace(i, *this, plib::pfmt("A{1}")(i));
+				m_I.push_back(plib::make_unique<analog_input_t>(*this, plib::pfmt("A{1}")(i)));
 
 			plib::pstring_vector_t cmds(m_func.Value(), " ");
 			m_precompiled.clear();
@@ -375,9 +377,9 @@ namespace netlist
 		param_int_t m_N;
 		param_str_t m_func;
 		analog_output_t m_Q;
-		plib::uninitialised_array_t<analog_input_t, 10> m_I;
+		std::vector<std::unique_ptr<analog_input_t>> m_I;
 
-		plib::pvector_t<rpn_inst> m_precompiled;
+		std::vector<rpn_inst> m_precompiled;
 	};
 
 	// -----------------------------------------------------------------------------
@@ -392,12 +394,10 @@ namespace netlist
 		, m_I(*this, "I")
 		, m_RON(*this, "RON", 1.0)
 		, m_ROFF(*this, "ROFF", 1.0E20)
-		, m_last_state(0)
+		, m_last_state(*this, "m_last_state", 0)
 		{
 			register_subalias("1", m_R.m_P);
 			register_subalias("2", m_R.m_N);
-
-			save(NLNAME(m_last_state));
 		}
 
 		NETLIB_SUB(R) m_R;
@@ -415,7 +415,7 @@ namespace netlist
 
 	private:
 
-		UINT8 m_last_state;
+		state_var<UINT8> m_last_state;
 	};
 
 	// -----------------------------------------------------------------------------
@@ -518,7 +518,7 @@ namespace netlist
 		: nld_base_d_to_a_proxy(anetlist, name, out_proxied, m_RV.m_P)
 		, m_GNDHack(*this, "_Q")
 		, m_RV(*this, "RV")
-		, m_last_state(-1)
+		, m_last_state(*this, "m_last_var", -1)
 		, m_is_timestep(false)
 		{
 			//register_sub(m_RV);
@@ -528,8 +528,6 @@ namespace netlist
 			register_subalias("Q", m_RV.m_P);
 
 			connect_late(m_RV.m_N, m_GNDHack);
-
-			save(NLNAME(m_last_state));
 		}
 
 		virtual ~nld_d_to_a_proxy() {}
@@ -542,7 +540,7 @@ namespace netlist
 	private:
 		analog_output_t m_GNDHack;  // FIXME: Long term, we need to connect proxy gnd to device gnd
 		NETLIB_SUB(twoterm) m_RV;
-		int m_last_state;
+		state_var<int> m_last_state;
 		bool m_is_timestep;
 	};
 
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index 6c1df62290d..02dcbf1ee6d 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -105,14 +105,14 @@ const logic_family_desc_t *family_CD4XXX()
 queue_t::queue_t(netlist_t &nl)
 	: timed_queue<net_t *, netlist_time>(512)
 	, object_t(nl, "QUEUE", QUEUE)
-	, plib::pstate_callback_t()
+	, plib::state_manager_t::callback_t()
 	, m_qsize(0)
 	, m_times(512)
 	, m_names(512)
 {
 }
 
-void queue_t::register_state(plib::pstate_manager_t &manager, const pstring &module)
+void queue_t::register_state(plib::state_manager_t &manager, const pstring &module)
 {
 	netlist().log().debug("register_state\n");
 	manager.save_item(this, m_qsize, module + "." + "qsize");
@@ -186,22 +186,21 @@ device_object_t::device_object_t(core_device_t &dev, const pstring &aname, const
 // ----------------------------------------------------------------------------------------
 
 netlist_t::netlist_t(const pstring &aname)
-	:   pstate_manager_t(),
-		m_stop(netlist_time::zero()),
-		m_time(netlist_time::zero()),
-		m_use_deactivate(0),
-		m_queue(*this),
-		m_mainclock(nullptr),
-		m_solver(nullptr),
-		m_gnd(nullptr),
-		m_params(nullptr),
-		m_name(aname),
-		m_setup(nullptr),
-		m_log(this),
-		m_lib(nullptr)
+	: m_state()
+	, m_time(netlist_time::zero())
+	, m_queue(*this)
+	, m_use_deactivate(0)
+	, m_mainclock(nullptr)
+	, m_solver(nullptr)
+	, m_gnd(nullptr)
+	, m_params(nullptr)
+	, m_name(aname)
+	, m_setup(nullptr)
+	, m_log(this)
+	, m_lib(nullptr)
 {
-	save_item(this, static_cast<plib::pstate_callback_t &>(m_queue), "m_queue");
-	save_item(this, m_time, "m_time");
+	state().save_item(this, static_cast<plib::state_manager_t::callback_t &>(m_queue), "m_queue");
+	state().save_item(this, m_time, "m_time");
 }
 
 netlist_t::~netlist_t()
@@ -331,51 +330,43 @@ void netlist_t::reset()
 
 void netlist_t::process_queue(const netlist_time &delta)
 {
-	m_stop = m_time + delta;
+	netlist_time stop(m_time + delta);
+
+	m_queue.push(stop, nullptr);
 
 	if (m_mainclock == nullptr)
 	{
-		while ( (m_time < m_stop) & (!m_queue.empty()))
+		queue_t::entry_t e(m_queue.pop());
+		m_time = e.m_exec_time;
+		while (e.m_object != nullptr)
 		{
-			const queue_t::entry_t e(m_queue.pop());
-			m_time = e.m_exec_time;
 			e.m_object->update_devs();
-
 			add_to_stat(m_perf_out_processed, 1);
+			e = m_queue.pop();
+			m_time = e.m_exec_time;
 		}
-		if (m_queue.empty())
-			m_time = m_stop;
-
-	} else {
+	}
+	else
+	{
 		logic_net_t &mc_net = m_mainclock->m_Q.net();
 		const netlist_time inc = m_mainclock->m_inc;
 		netlist_time mc_time(mc_net.time());
 
-		while (m_time < m_stop)
+		while (1)
 		{
-			if (!m_queue.empty())
+			while (m_queue.top().m_exec_time > mc_time)
 			{
-				while (m_queue.top().m_exec_time > mc_time)
-				{
-					m_time = mc_time;
-					mc_time += inc;
-					mc_net.toggle_new_Q();
-					mc_net.update_devs();
-					//devices::NETLIB_NAME(mainclock)::mc_update(mc_net);
-				}
-
-				const queue_t::entry_t &e = m_queue.pop();
-				m_time = e.m_exec_time;
-				e.m_object->update_devs();
-
-			} else {
 				m_time = mc_time;
 				mc_time += inc;
 				mc_net.toggle_new_Q();
 				mc_net.update_devs();
-				//devices::NETLIB_NAME(mainclock)::mc_update(mc_net);
 			}
 
+			const queue_t::entry_t e(m_queue.pop());
+			m_time = e.m_exec_time;
+			if (e.m_object == nullptr)
+				break;
+			e.m_object->update_devs();
 			add_to_stat(m_perf_out_processed, 1);
 		}
 		mc_net.set_time(mc_time);
@@ -410,7 +401,7 @@ param_template_t<C, T>::param_template_t(device_t &device, const pstring name, c
 {
 	/* pstrings not yet supported, these need special logic */
 	if (T != param_t::STRING && T != param_t::MODEL)
-		save(NLNAME(m_param));
+		netlist().save(*this, m_param, "m_param");
 	device.setup().register_and_set_param(device.name() + "." + name, *this);
 }
 
@@ -509,9 +500,6 @@ void device_t::register_subalias(const pstring &name, core_terminal_t &term)
 
 	// everything already fully qualified
 	setup().register_alias_nofqn(alias, term.name());
-
-	if (term.is_type(terminal_t::INPUT) || term.is_type(terminal_t::TERMINAL))
-		m_terminals.push_back(alias);
 }
 
 void device_t::register_subalias(const pstring &name, const pstring &aliased)
@@ -521,10 +509,6 @@ void device_t::register_subalias(const pstring &name, const pstring &aliased)
 
 	// everything already fully qualified
 	setup().register_alias_nofqn(alias, aliased_fqn);
-
-	// FIXME: make this working again
-	//if (term.isType(terminal_t::INPUT) || term.isType(terminal_t::TERMINAL))
-	//  m_terminals.add(name);
 }
 
 void device_t::connect_late(core_terminal_t &t1, core_terminal_t &t2)
@@ -588,17 +572,17 @@ net_t::net_t(netlist_t &nl, const pstring &aname, core_terminal_t *mr)
 	else
 		nl.m_nets.push_back(std::shared_ptr<net_t>(this));
 
-	save(NLNAME(m_time));
-	save(NLNAME(m_active));
-	save(NLNAME(m_in_queue));
-	save(NLNAME(m_cur_Analog));
-	save(NLNAME(m_cur_Q));
-	save(NLNAME(m_new_Q));
+	netlist().save(*this, m_time, "m_time");
+	netlist().save(*this, m_active, "m_active");
+	netlist().save(*this, m_in_queue, "m_in_queue");
+	netlist().save(*this, m_cur_Analog, "m_cur_Analog");
+	netlist().save(*this, m_cur_Q, "m_cur_Q");
+	netlist().save(*this, m_new_Q, "m_new_Q");
 }
 
 net_t::~net_t()
 {
-	netlist().remove_save_items(this);
+	netlist().state().remove_save_items(this);
 }
 
 void net_t::inc_active(core_terminal_t &term)
@@ -770,19 +754,19 @@ analog_net_t::analog_net_t(netlist_t &nl, const pstring &aname, core_terminal_t
 {
 }
 
-bool analog_net_t::already_processed(plib::pvector_t<list_t> &groups)
+bool analog_net_t::already_processed(std::vector<list_t> &groups)
 {
 	if (isRailNet())
 		return true;
 	for (auto & grp : groups)
 	{
-		if (grp.contains(this))
+		if (plib::container::contains(grp, this))
 			return true;
 	}
 	return false;
 }
 
-void analog_net_t::process_net(plib::pvector_t<list_t> &groups)
+void analog_net_t::process_net(std::vector<list_t> &groups)
 {
 	if (num_cons() == 0)
 		return;
@@ -811,7 +795,7 @@ core_terminal_t::core_terminal_t(core_device_t &dev, const pstring &aname, const
 , m_net(nullptr)
 , m_state(STATE_NONEX)
 {
-	save(NLNAME(m_state));
+	netlist().save(*this, m_state, "m_state");
 }
 
 void core_terminal_t::reset()
@@ -822,7 +806,7 @@ void core_terminal_t::reset()
 		set_state(STATE_INP_ACTIVE);
 }
 
-void core_terminal_t::set_net(net_t::ptr_t anet)
+void core_terminal_t::set_net(net_t *anet)
 {
 	m_net = anet;
 }
@@ -845,9 +829,9 @@ terminal_t::terminal_t(core_device_t &dev, const pstring &aname)
 , m_gt1(nullptr)
 {
 	netlist().setup().register_term(*this);
-	save(NLNAME(m_Idr1));
-	save(NLNAME(m_go1));
-	save(NLNAME(m_gt1));
+	netlist().save(*this, m_Idr1, "m_Idr1");
+	netlist().save(*this, m_go1, "m_go1");
+	netlist().save(*this, m_gt1, "m_gt1");
 }
 
 
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 7828c2f3f61..607e9f313fd 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -156,8 +156,10 @@
 #define NLBASE_H_
 
 #include <vector>
+#include <unordered_map>
 #include <memory>
 #include <cmath>
+#include <cstdint>
 
 #include "nl_lists.h"
 #include "nl_time.h"
@@ -169,11 +171,6 @@
 // Type definitions
 // ----------------------------------------------------------------------------------------
 
-/*
- *  unsigned int would be a 20% speed increase over UINT8 for pong.
- *  For breakout it causes a slight decrease.
- *
- */
 using netlist_sig_t = std::uint32_t;
 
  //============================================================
@@ -293,7 +290,7 @@ namespace netlist
 	// model_map_t
 	// -----------------------------------------------------------------------------
 
-	using model_map_t = plib::hashmap_t<pstring, pstring>;
+	using model_map_t = std::unordered_map<pstring, pstring>;
 
 	// -----------------------------------------------------------------------------
 	// logic_family_t
@@ -345,7 +342,7 @@ namespace netlist
 	// object_t
 	// -----------------------------------------------------------------------------
 
-	class object_t : public plib::pstate_interface_t<object_t>
+	class object_t
 	{
 		P_PREVENT_COPYING(object_t)
 	public:
@@ -364,8 +361,6 @@ namespace netlist
 
 		const pstring &name() const;
 
-		plib::pstate_manager_t &state_manager();
-
 		type_t type() const { return m_objtype; }
 		bool is_type(const type_t atype) const { return (m_objtype == atype); }
 
@@ -408,7 +403,7 @@ namespace netlist
 		P_PREVENT_COPYING(core_terminal_t)
 	public:
 
-		using list_t = plib::pvector_t<core_terminal_t *>;
+		using list_t = std::vector<core_terminal_t *>;
 
 		/* needed here ... */
 
@@ -475,8 +470,6 @@ namespace netlist
 		P_PREVENT_COPYING(terminal_t)
 	public:
 
-		using list_t = plib::pvector_t<terminal_t *>;
-
 		terminal_t(core_device_t &dev, const pstring &aname);
 
 		terminal_t *m_otherterm;
@@ -594,9 +587,6 @@ namespace netlist
 		P_PREVENT_COPYING(net_t)
 	public:
 
-		using ptr_t = net_t *;
-		using list_t = plib::pvector_t<std::shared_ptr<net_t>>;
-
 		net_t(netlist_t &nl, const pstring &aname, core_terminal_t *mr = nullptr);
 		virtual ~net_t();
 
@@ -622,7 +612,7 @@ namespace netlist
 		bool isRailNet() const { return !(m_railterminal == nullptr); }
 		core_terminal_t & railterminal() const { return *m_railterminal; }
 
-		int num_cons() const { return m_core_terms.size(); }
+		std::size_t num_cons() const { return m_core_terms.size(); }
 
 		void inc_active(core_terminal_t &term);
 		void dec_active(core_terminal_t &term);
@@ -631,15 +621,15 @@ namespace netlist
 
 		void move_connections(net_t *new_net);
 
-		plib::pvector_t<core_terminal_t *> m_core_terms; // save post-start m_list ...
+		std::vector<core_terminal_t *> m_core_terms; // save post-start m_list ...
 
 	protected:
 		netlist_sig_t m_new_Q;
 		netlist_sig_t m_cur_Q;
 
-		netlist_time m_time;
-		INT32        m_active;
-		UINT8	     m_in_queue;    /* 0: not in queue, 1: in queue, 2: last was taken */
+		netlist_time  m_time;
+		INT32         m_active;
+		UINT8    	  m_in_queue;    /* 0: not in queue, 1: in queue, 2: last was taken */
 
 	private:
 		plib::linkedlist_t<core_terminal_t> m_list_active;
@@ -656,8 +646,6 @@ namespace netlist
 		P_PREVENT_COPYING(logic_net_t)
 	public:
 
-		using list_t = plib::pvector_t<logic_net_t *>;
-
 		logic_net_t(netlist_t &nl, const pstring &aname, core_terminal_t *mr = nullptr);
 		virtual ~logic_net_t() { };
 
@@ -699,7 +687,7 @@ namespace netlist
 		P_PREVENT_COPYING(analog_net_t)
 	public:
 
-		using list_t =  plib::pvector_t<analog_net_t *>;
+		using list_t =  std::vector<analog_net_t *>;
 
 		analog_net_t(netlist_t &nl, const pstring &aname, core_terminal_t *mr = nullptr);
 
@@ -712,8 +700,8 @@ namespace netlist
 		devices::matrix_solver_t *solver() { return m_solver; }
 		void set_solver(devices::matrix_solver_t *solver) { m_solver = solver; }
 
-		bool already_processed(plib::pvector_t<list_t> &groups);
-		void process_net(plib::pvector_t<list_t> &groups);
+		bool already_processed(std::vector<list_t> &groups);
+		void process_net(std::vector<list_t> &groups);
 
 	private:
 		devices::matrix_solver_t *m_solver;
@@ -835,9 +823,6 @@ namespace netlist
 	{
 		P_PREVENT_COPYING(core_device_t)
 	public:
-
-		using list_t = plib::pvector_t<core_device_t *>;
-
 		core_device_t(netlist_t &owner, const pstring &name);
 		core_device_t(core_device_t &owner, const pstring &name);
 
@@ -965,9 +950,6 @@ namespace netlist
 		void connect_late(const pstring &t1, const pstring &t2);
 		void connect_late(core_terminal_t &t1, core_terminal_t &t2);
 		void connect_post_start(core_terminal_t &t1, core_terminal_t &t2);
-
-		plib::pvector_t<pstring> m_terminals;
-
 	protected:
 
 		NETLIB_UPDATEI() { }
@@ -1005,14 +987,14 @@ namespace netlist
 
 	class queue_t : public timed_queue<net_t *, netlist_time>,
 							public object_t,
-							public plib::pstate_callback_t
+							public plib::state_manager_t::callback_t
 	{
 	public:
 		queue_t(netlist_t &nl);
 
 	protected:
 
-		void register_state(plib::pstate_manager_t &manager, const pstring &module) override;
+		void register_state(plib::state_manager_t &manager, const pstring &module) override;
 		void on_pre_save() override;
 		void on_post_load() override;
 
@@ -1028,7 +1010,7 @@ namespace netlist
 	// -----------------------------------------------------------------------------
 
 
-	class netlist_t : public plib::pstate_manager_t, public plib::plog_dispatch_intf //, public device_owner_t
+	class netlist_t : public plib::plog_dispatch_intf //, public device_owner_t
 	{
 		P_PREVENT_COPYING(netlist_t)
 	public:
@@ -1041,18 +1023,18 @@ namespace netlist
 		void start();
 		void stop();
 
-		 const queue_t &queue() const { return m_queue; }
-		 queue_t &queue() { return m_queue; }
-		 const netlist_time time() const { return m_time; }
-		 devices::NETLIB_NAME(solver) *solver() const { return m_solver; }
-		 devices::NETLIB_NAME(gnd) *gnd() const { return m_gnd; }
+		const queue_t &queue() const { return m_queue; }
+		queue_t &queue() { return m_queue; }
+		const netlist_time time() const { return m_time; }
+		devices::NETLIB_NAME(solver) *solver() const { return m_solver; }
+		devices::NETLIB_NAME(gnd) *gnd() const { return m_gnd; }
 		nl_double gmin() const;
 
 		void push_to_queue(net_t &out, const netlist_time attime) NOEXCEPT;
 		void remove_from_queue(net_t &out);
 
 		void process_queue(const netlist_time &delta);
-		void abort_current_queue_slice() { m_stop = netlist_time::zero(); }
+		void abort_current_queue_slice() { m_queue.retime(m_time, nullptr); }
 
 		bool use_deactivate() const { return m_use_deactivate; }
 
@@ -1064,9 +1046,9 @@ namespace netlist
 		net_t *find_net(const pstring &name);
 
 		template<class device_class>
-		plib::pvector_t<device_class *> get_device_list()
+		std::vector<device_class *> get_device_list()
 		{
-			plib::pvector_t<device_class *> tmp;
+			std::vector<device_class *> tmp;
 			for (auto &d : m_devices)
 			{
 				device_class *dev = dynamic_cast<device_class *>(d.get());
@@ -1097,16 +1079,27 @@ namespace netlist
 		plib::plog_base<NL_DEBUG> &log() { return m_log; }
 		const plib::plog_base<NL_DEBUG> &log() const { return m_log; }
 
+		plib::state_manager_t &state() { return m_state; }
+
+		template<typename O, typename C> void save(O &owner, C &state, const pstring &stname)
+		{
+			this->state().save_item((void *)&owner, state, pstring(owner.name()) + "." + stname);
+		}
+		template<typename O, typename C> void save(O &owner, C *state, const pstring &stname, const int count)
+		{
+			this->state().save_state_ptr((void *)&owner, pstring(owner.name()) + "." + stname, plib::state_manager_t::datatype_f<C>::f(), count, state);
+		}
+
 		virtual void reset();
 
 		plib::dynlib &lib() { return *m_lib; }
 
 		void print_stats() const;
 
-		plib::pvector_t<plib::owned_ptr<core_device_t>> m_devices;
+		std::vector<plib::owned_ptr<core_device_t>> m_devices;
 
 		/* sole use is to manage lifetime of net objects */
-		net_t::list_t m_nets;
+		std::vector<std::shared_ptr<net_t>> m_nets;
 
 		/* sole use is to manage lifetime of family objects */
 		std::vector<std::pair<pstring, std::unique_ptr<logic_family_desc_t>>> m_family_cache;
@@ -1121,16 +1114,16 @@ protected:
 	#endif
 
 	private:
-		netlist_time                m_stop;     // target time for current queue processing
-
+		plib::state_manager_t 		m_state;
+		/* mostly rw */
 		netlist_time                m_time;
-		bool                        m_use_deactivate;
 		queue_t                     m_queue;
+		/* mostly rw */
+		bool                        m_use_deactivate;
 
 		devices::NETLIB_NAME(mainclock) *    m_mainclock;
 		devices::NETLIB_NAME(solver) *       m_solver;
 		devices::NETLIB_NAME(gnd) *          m_gnd;
-
 		devices::NETLIB_NAME(netlistparams) *m_params;
 
 		pstring m_name;
@@ -1139,6 +1132,50 @@ protected:
 		plib::dynlib *m_lib;                 // external lib needs to be loaded as long as netlist exists
 	};
 
+	template <typename T>
+	struct state_var
+	{
+	public:
+		state_var(device_t &dev, const pstring name, const T &value)
+		: m_value(value)
+		{
+			dev.netlist().save(dev, m_value, name);
+		}
+
+		state_var(const state_var &rhs) NOEXCEPT = default;
+		state_var(state_var &&rhs) NOEXCEPT = default;
+		state_var &operator=(const state_var rhs) { m_value = rhs.m_value; return *this; }
+		state_var &operator=(const T rhs) { m_value = rhs; return *this; }
+		operator T & () { return m_value; }
+		T & operator()() { return m_value; }
+		operator const T & () const { return m_value; }
+		const T & operator()() const { return m_value; }
+	private:
+		T m_value;
+	};
+
+	template <typename T, std::size_t N>
+	struct state_var<T[N]>
+	{
+	public:
+		state_var(device_t &dev, const pstring name, const T & value)
+		{
+			dev.netlist().save(dev, m_value, name);
+			for (int i=0; i<N; i++)
+				m_value[i] = value;
+		}
+
+		state_var(const state_var &rhs) NOEXCEPT = default;
+		state_var(state_var &&rhs) NOEXCEPT = default;
+		state_var &operator=(const state_var rhs) { m_value = rhs.m_value; return *this; }
+		state_var &operator=(const T rhs) { m_value = rhs; return *this; }
+		T & operator[](const std::size_t i) { return m_value[i]; }
+		const T & operator[](const std::size_t i) const { return m_value[i]; }
+	private:
+		T m_value[N];
+	};
+
+
 	// -----------------------------------------------------------------------------
 	// Support classes for devices
 	// -----------------------------------------------------------------------------
@@ -1162,11 +1199,6 @@ protected:
 	// inline implementations
 	// -----------------------------------------------------------------------------
 
-	inline plib::pstate_manager_t &object_t::state_manager()
-	{
-		return m_netlist;
-	}
-
 	template <class C, param_t::param_type_t T>
 	inline void param_template_t<C, T>::setTo(const C &param)
 	{
@@ -1238,7 +1270,7 @@ protected:
 
 	inline void net_t::push_to_queue(const netlist_time delay) NOEXCEPT
 	{
-		if (!is_queued() && (num_cons() > 0))
+		if (!is_queued() && (num_cons() != 0))
 		{
 			m_time = netlist().time() + delay;
 			m_in_queue = (m_active > 0);     /* queued ? */
@@ -1320,7 +1352,5 @@ protected:
 
 }
 
-NETLIST_SAVE_TYPE(netlist::core_terminal_t::state_e, pstate_data_type_e::DT_INT);
-
 
 #endif /* NLBASE_H_ */
diff --git a/src/lib/netlist/nl_factory.h b/src/lib/netlist/nl_factory.h
index 780408cd285..b85e85bf6b8 100644
--- a/src/lib/netlist/nl_factory.h
+++ b/src/lib/netlist/nl_factory.h
@@ -65,7 +65,7 @@ namespace netlist
 		}
 	};
 
-	class factory_list_t : public plib::pvector_t<plib::owned_ptr<base_factory_t>>
+	class factory_list_t : public std::vector<plib::owned_ptr<base_factory_t>>
 	{
 	public:
 		factory_list_t(setup_t &m_setup);
diff --git a/src/lib/netlist/nl_lists.h b/src/lib/netlist/nl_lists.h
index b3443ed2297..475e0e285c2 100644
--- a/src/lib/netlist/nl_lists.h
+++ b/src/lib/netlist/nl_lists.h
@@ -68,13 +68,12 @@ namespace netlist
 	#if HAS_OPENMP && USE_OPENMP
 			m_lock = 0;
 	#endif
-			//nl_assert(m_end - m_list < Size);
 		}
 
-		 entry_t pop() NOEXCEPT       { return *(--m_end); }
-		 entry_t top() const NOEXCEPT { return *(m_end-1); }
+		entry_t pop() NOEXCEPT       { return *(--m_end); }
+		const entry_t &top() const NOEXCEPT { return *(m_end-1); }
 
-		 void remove(const Element &elem) NOEXCEPT
+		void remove(const Element &elem) NOEXCEPT
 		{
 			/* Lock */
 	#if HAS_OPENMP && USE_OPENMP
@@ -101,6 +100,12 @@ namespace netlist
 	#endif
 		}
 
+		void retime(const Time t, const Element &elem) NOEXCEPT
+		{
+			remove(elem);
+			push(t, elem);
+		}
+
 		void clear()
 		{
 			m_end = &m_list[0];
diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp
index b311e4b1a68..72fdac657d9 100644
--- a/src/lib/netlist/nl_setup.cpp
+++ b/src/lib/netlist/nl_setup.cpp
@@ -110,7 +110,7 @@ void setup_t::register_dev(plib::owned_ptr<device_t> dev)
 
 void setup_t::register_lib_entry(const pstring &name)
 {
-	if (m_lib.contains(name))
+	if (plib::container::contains(m_lib, name))
 		log().warning("Lib entry collection already contains {1}. IGNORED", name);
 	else
 		m_lib.push_back(name);
@@ -118,7 +118,7 @@ void setup_t::register_lib_entry(const pstring &name)
 
 void setup_t::register_dev(const pstring &classname, const pstring &name)
 {
-	if (m_lib.contains(classname))
+	if (plib::container::contains(m_lib, classname))
 	{
 		namespace_push(name);
 		include(classname);
@@ -151,13 +151,13 @@ void setup_t::register_model(const pstring &model_in)
 		log().fatal("Unable to parse model: {1}", model_in);
 	pstring model = model_in.left(pos).trim().ucase();
 	pstring def = model_in.substr(pos + 1).trim();
-	if (!m_models.add(model, def))
+	if (!m_models.insert({model, def}).second)
 		log().fatal("Model already exists: {1}", model_in);
 }
 
 void setup_t::register_alias_nofqn(const pstring &alias, const pstring &out)
 {
-	if (!m_alias.add(alias, out))
+	if (!m_alias.insert({alias, out}).second)
 		log().fatal("Error adding alias {1} to alias list\n", alias);
 }
 
@@ -207,9 +207,10 @@ pstring setup_t::objtype_as_str(object_t &in) const
 
 void setup_t::register_and_set_param(pstring name, param_t &param)
 {
-	if (m_param_values.contains(name))
+	auto i = m_param_values.find(name);
+	if (i != m_param_values.end())
 	{
-		const pstring val = m_param_values[name];
+		const pstring val = i->second;
 		log().debug("Found parameter ... {1} : {1}\n", name, val);
 		switch (param.param_type())
 		{
@@ -240,24 +241,13 @@ void setup_t::register_and_set_param(pstring name, param_t &param)
 				log().fatal("Parameter is not supported {1} : {2}\n", name, val);
 		}
 	}
-	if (!m_params.add(param.name(), param_ref_t(param.name(), param.device(), param)))
+	if (!m_params.insert({param.name(), param_ref_t(param.name(), param.device(), param)}).second)
 		log().fatal("Error adding parameter {1} to parameter list\n", name);
 }
 
 void setup_t::register_term(core_terminal_t &term)
 {
-	if (term.is_type(terminal_t::OUTPUT))
-	{
-	}
-	else if (term.is_type(terminal_t::INPUT))
-	{
-		static_cast<device_t &>(term.device()).m_terminals.push_back(term.name());
-	}
-	else
-	{
-		static_cast<device_t &>(term.device()).m_terminals.push_back(term.name());
-	}
-	if (!m_terminals.add(term.name(), &term))
+	if (!m_terminals.insert({term.name(), &term}).second)
 		log().fatal("Error adding {1} {2} to terminal list\n", objtype_as_str(term), term.name());
 	log().debug("{1} {2}\n", objtype_as_str(term), term.name());
 }
@@ -291,15 +281,16 @@ void setup_t::remove_connections(const pstring pin)
 	pstring pinfn = build_fqn(pin);
 	bool found = false;
 
-	for (int i = m_links.size() - 1; i >= 0; i--)
+	for (auto link = m_links.begin(); link != m_links.end(); )
 	{
-		auto &link = m_links[i];
-		if ((link.first == pinfn) || (link.second == pinfn))
+		if ((link->first == pinfn) || (link->second == pinfn))
 		{
-			log().verbose("removing connection: {1} <==> {2}\n", link.first, link.second);
-			m_links.remove_at(i);
+			log().verbose("removing connection: {1} <==> {2}\n", link->first, link->second);
+			link = m_links.erase(link);
 			found = true;
 		}
+		else
+			link++;
 	}
 	if (!found)
 		log().fatal("remove_connections: found no occurrence of {1}\n", pin);
@@ -345,15 +336,15 @@ void setup_t::register_param(const pstring &param, const pstring &value)
 {
 	pstring fqn = build_fqn(param);
 
-	int idx = m_param_values.index_of(fqn);
-	if (idx < 0)
+	auto idx = m_param_values.find(fqn);
+	if (idx == m_param_values.end())
 	{
-		if (!m_param_values.add(fqn, value))
+		if (!m_param_values.insert({fqn, value}).second)
 			log().fatal("Unexpected error adding parameter {1} to parameter list\n", param);
 	}
 	else
 	{
-		log().warning("Overwriting {1} old <{2}> new <{3}>\n", fqn, m_param_values.value_at(idx), value);
+		log().warning("Overwriting {1} old <{2}> new <{3}>\n", fqn, idx->second, value);
 		m_param_values[fqn] = value;
 	}
 }
@@ -366,8 +357,8 @@ const pstring setup_t::resolve_alias(const pstring &name) const
 	/* FIXME: Detect endless loop */
 	do {
 		ret = temp;
-		int p = m_alias.index_of(ret);
-		temp = (p>=0 ? m_alias.value_at(p) : "");
+		auto p = m_alias.find(ret);
+		temp = (p != m_alias.end() ? p->second : "");
 	} while (temp != "");
 
 	log().debug("{1}==>{2}\n", name, ret);
@@ -377,17 +368,15 @@ const pstring setup_t::resolve_alias(const pstring &name) const
 core_terminal_t *setup_t::find_terminal(const pstring &terminal_in, bool required)
 {
 	const pstring &tname = resolve_alias(terminal_in);
-	int ret;
-
-	ret = m_terminals.index_of(tname);
+	auto ret = m_terminals.find(tname);
 	/* look for default */
-	if (ret < 0)
+	if (ret == m_terminals.end())
 	{
 		/* look for ".Q" std output */
-		ret = m_terminals.index_of(tname + ".Q");
+		ret = m_terminals.find(tname + ".Q");
 	}
 
-	core_terminal_t *term = (ret < 0 ? nullptr : m_terminals.value_at(ret));
+	core_terminal_t *term = (ret == m_terminals.end() ? nullptr : ret->second);
 
 	if (term == nullptr && required)
 		log().fatal("terminal {1}({2}) not found!\n", terminal_in, tname);
@@ -399,19 +388,17 @@ core_terminal_t *setup_t::find_terminal(const pstring &terminal_in, bool require
 core_terminal_t *setup_t::find_terminal(const pstring &terminal_in, object_t::type_t atype, bool required)
 {
 	const pstring &tname = resolve_alias(terminal_in);
-	int ret;
-
-	ret = m_terminals.index_of(tname);
+	auto ret = m_terminals.find(tname);
 	/* look for default */
-	if (ret < 0 && atype == object_t::OUTPUT)
+	if (ret == m_terminals.end() && atype == object_t::OUTPUT)
 	{
 		/* look for ".Q" std output */
-		ret = m_terminals.index_of(tname + ".Q");
+		ret = m_terminals.find(tname + ".Q");
 	}
-	if (ret < 0 && required)
+	if (ret == m_terminals.end() && required)
 		log().fatal("terminal {1}({2}) not found!\n", terminal_in, tname);
 
-	core_terminal_t *term = (ret < 0 ? nullptr : m_terminals.value_at(ret));
+	core_terminal_t *term = (ret == m_terminals.end() ? nullptr : ret->second);
 
 	if (term != nullptr && term->type() != atype)
 	{
@@ -431,14 +418,12 @@ param_t *setup_t::find_param(const pstring &param_in, bool required)
 	const pstring param_in_fqn = build_fqn(param_in);
 
 	const pstring &outname = resolve_alias(param_in_fqn);
-	int ret;
-
-	ret = m_params.index_of(outname);
-	if (ret < 0 && required)
+	auto ret = m_params.find(outname);
+	if (ret == m_params.end() && required)
 		log().fatal("parameter {1}({2}) not found!\n", param_in_fqn, outname);
-	if (ret != -1)
+	if (ret != m_params.end())
 		log().debug("Found parameter {1}\n", outname);
-	return (ret == -1 ? nullptr : &m_params.value_at(ret).m_param);
+	return (ret == m_params.end() ? nullptr : &ret->second.m_param);
 }
 
 // FIXME avoid dynamic cast here
@@ -588,7 +573,7 @@ void setup_t::connect_terminals(core_terminal_t &t1, core_terminal_t &t2)
 	{
 		log().debug("adding analog net ...\n");
 		// FIXME: Nets should have a unique name
-		analog_net_t::ptr_t anet = plib::palloc<analog_net_t>(netlist(),"net." + t1.name());
+		auto anet = plib::palloc<analog_net_t>(netlist(),"net." + t1.name());
 		t1.set_net(anet);
 		anet->register_con(t2);
 		anet->register_con(t1);
@@ -706,16 +691,16 @@ void setup_t::resolve_inputs()
 	int tries = 100;
 	while (m_links.size() > 0 && tries >  0) // FIXME: convert into constant
 	{
-		unsigned li = 0;
-		while (li < m_links.size())
+		auto li = m_links.begin();
+		while (li != m_links.end())
 		{
-			const pstring t1s = m_links[li].first;
-			const pstring t2s = m_links[li].second;
+			const pstring t1s = li->first;
+			const pstring t2s = li->second;
 			core_terminal_t *t1 = find_terminal(t1s);
 			core_terminal_t *t2 = find_terminal(t2s);
 
 			if (connect(*t1, *t2))
-				m_links.remove_at(li);
+				li = m_links.erase(li);
 			else
 				li++;
 		}
@@ -733,28 +718,23 @@ void setup_t::resolve_inputs()
 
 	// delete empty nets ... and save m_list ...
 
-	net_t::list_t todelete;
-
-	for (auto & net : netlist().m_nets)
+	for (auto net = netlist().m_nets.begin(); net != netlist().m_nets.end();)
 	{
-		if (net->num_cons() == 0)
-			todelete.push_back(net);
+		if (net->get()->num_cons() == 0)
+		{
+			log().verbose("Deleting net {1} ...", net->get()->name());
+			net = netlist().m_nets.erase(net);
+		}
 		else
-			net->rebuild_list();
-	}
-
-	for (auto & net : todelete)
-	{
-		log().verbose("Deleting net {1} ...", net->name());
-		netlist().m_nets.remove(net);
+			++net;
 	}
 
 	pstring errstr("");
 
 	log().verbose("looking for terminals not connected ...");
-	for (std::size_t i = 0; i < m_terminals.size(); i++)
+	for (auto & i : m_terminals)
 	{
-		core_terminal_t *term = m_terminals.value_at(i);
+		core_terminal_t *term = i.second;
 		if (!term->has_net() && dynamic_cast< devices::NETLIB_NAME(dummy_input) *>(&term->device()) != nullptr)
 			log().warning("Found dummy terminal {1} without connections", term->name());
 		else if (!term->has_net())
@@ -862,13 +842,12 @@ const logic_family_desc_t *setup_t::family_from_model(const pstring &model)
 static pstring model_string(model_map_t &map)
 {
 	pstring ret = map["COREMODEL"] + "(";
-	for (unsigned i=0; i<map.size(); i++)
-		ret = ret + map.key_at(i) + "=" + map.value_at(i) + " ";
+	for (auto & i : map)
+		ret = ret + i.first + "=" + i.second + " ";
 
 	return ret + ")";
 }
 
-
 void setup_t::model_parse(const pstring &model_in, model_map_t &map)
 {
 	pstring model = model_in;
@@ -881,9 +860,10 @@ void setup_t::model_parse(const pstring &model_in, model_map_t &map)
 		if (pos >= 0) break;
 
 		key = model.ucase();
-		if (!m_models.contains(key))
+		auto i = m_models.find(key);
+		if (i == m_models.end())
 			log().fatal("Model {1} not found\n", model);
-		model = m_models[key];
+		model = i->second;
 	}
 	pstring xmodel = model.left(pos);
 
@@ -891,7 +871,8 @@ void setup_t::model_parse(const pstring &model_in, model_map_t &map)
 		map["COREMODEL"] = key;
 	else
 	{
-		if (m_models.contains(xmodel))
+		auto i = m_models.find(xmodel);
+		if (i != m_models.end())
 			model_parse(xmodel, map);
 		else
 			log().fatal("Model doesn't exist: <{1}>\n", model_in);
@@ -918,7 +899,7 @@ const pstring setup_t::model_value_str(model_map_t &map, const pstring &entity)
 
 	if (entity != entity.ucase())
 		log().fatal("model parameters should be uppercase:{1} {2}\n", entity, model_string(map));
-	if (!map.contains(entity))
+	if (map.find(entity) == map.end())
 		log().fatal("Entity {1} not found in model {2}\n", entity, model_string(map));
 	else
 		ret = map[entity];
diff --git a/src/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h
index ebf989cb20f..109f58fb43b 100644
--- a/src/lib/netlist/nl_setup.h
+++ b/src/lib/netlist/nl_setup.h
@@ -10,6 +10,8 @@
 
 #include <memory>
 #include <stack>
+#include <unordered_map>
+
 #include "nl_base.h"
 #include "nl_factory.h"
 
@@ -91,7 +93,7 @@ namespace netlist
 		class source_t
 		{
 		public:
-			using list_t = plib::pvector_t<std::shared_ptr<source_t>>;
+			using list_t = std::vector<std::shared_ptr<source_t>>;
 
 			source_t()
 			{}
@@ -167,7 +169,7 @@ namespace netlist
 		factory_list_t &factory() { return m_factory; }
 		const factory_list_t &factory() const { return m_factory; }
 
-		bool is_library_item(const pstring &name) const { return m_lib.contains(name); }
+		bool is_library_item(const pstring &name) const { return plib::container::contains(m_lib, name); }
 
 		/* model / family related */
 
@@ -180,7 +182,7 @@ namespace netlist
 		plib::plog_base<NL_DEBUG> &log() { return netlist().log(); }
 		const plib::plog_base<NL_DEBUG> &log() const { return netlist().log(); }
 
-		plib::pvector_t<std::pair<pstring, base_factory_t *>> m_device_factory;
+		std::vector<std::pair<pstring, base_factory_t *>> m_device_factory;
 
 	protected:
 
@@ -203,23 +205,25 @@ namespace netlist
 
 		netlist_t &m_netlist;
 
-		plib::hashmap_t<pstring, pstring> m_alias;
-		plib::hashmap_t<pstring, param_ref_t>  m_params;
-		plib::hashmap_t<pstring, pstring> m_param_values;
-		plib::hashmap_t<pstring, core_terminal_t *> m_terminals;
+	public:
+		std::unordered_map<pstring, pstring> m_alias;
+		std::unordered_map<pstring, param_ref_t>  m_params;
+		std::unordered_map<pstring, pstring> m_param_values;
+		std::unordered_map<pstring, core_terminal_t *> m_terminals;
+	private:
 
-		plib::pvector_t<link_t> m_links;
+		std::vector<link_t> m_links;
 
 		factory_list_t m_factory;
 
-		plib::hashmap_t<pstring, pstring> m_models;
+		std::unordered_map<pstring, pstring> m_models;
 
 		int m_proxy_cnt;
 		int m_frontier_cnt;
 
 		std::stack<pstring> m_namespace_stack;
 		source_t::list_t m_sources;
-		plib::pvector_t<pstring> m_lib;
+		std::vector<pstring> m_lib;
 
 	};
 
diff --git a/src/lib/netlist/nl_time.h b/src/lib/netlist/nl_time.h
index ed28cedc932..9330526018f 100644
--- a/src/lib/netlist/nl_time.h
+++ b/src/lib/netlist/nl_time.h
@@ -31,10 +31,8 @@ namespace netlist
 
 #if (PHAS_INT128)
 		using INTERNALTYPE = UINT128;
-		static const pstate_data_type_e STATETYPE = DT_INT128;
 #else
 		using INTERNALTYPE = UINT64;
-		static constexpr pstate_data_type_e STATETYPE = pstate_data_type_e::DT_INT64;
 #endif
 		static constexpr INTERNALTYPE RESOLUTION = NETLIST_INTERNAL_RES;
 
@@ -47,7 +45,6 @@ namespace netlist
 		constexpr explicit netlist_time(const INTERNALTYPE nom, const INTERNALTYPE den)
 		: m_time(nom * (RESOLUTION / den)) { }
 
-
 		netlist_time &operator=(const netlist_time rhs) { m_time = rhs.m_time; return *this; }
 
 		netlist_time &operator+=(const netlist_time &rhs) { m_time += rhs.m_time; return *this; }
@@ -125,14 +122,12 @@ namespace netlist
 		INTERNALTYPE m_time;
 	};
 
-
-
 }
 
 namespace plib {
-template<> inline void pstate_manager_t::save_item(const void *owner, netlist::netlist_time &nlt, const pstring &stname)
+template<> inline void state_manager_t::save_item(const void *owner, netlist::netlist_time &nlt, const pstring &stname)
 {
-	save_state_ptr(owner, stname, netlist::netlist_time::STATETYPE, sizeof(netlist::netlist_time::INTERNALTYPE), 1, nlt.get_internaltype_ptr(), false);
+	save_state_ptr(owner, stname, datatype_t(sizeof(netlist::netlist_time::INTERNALTYPE), false, true, false), 1, nlt.get_internaltype_ptr());
 }
 }
 
diff --git a/src/lib/netlist/plib/plists.h b/src/lib/netlist/plib/plists.h
index 66b48e3ab94..030b172f50e 100644
--- a/src/lib/netlist/plib/plists.h
+++ b/src/lib/netlist/plib/plists.h
@@ -14,8 +14,6 @@
 #include <vector>
 #include <type_traits>
 #include <cmath>
-//#include <cstring>
-//#include <array>
 
 #include "palloc.h"
 #include "pstring.h"
@@ -71,48 +69,6 @@ private:
 	typename std::aligned_storage<sizeof(C), alignof(C)>::type m_buf[N];
 };
 
-// ----------------------------------------------------------------------------------------
-// plist_t: a simple list
-// ----------------------------------------------------------------------------------------
-
-template <typename LC>
-class pvector_t : public std::vector<LC>
-{
-public:
-	pvector_t() : std::vector<LC>() {}
-
-	bool contains(const LC &elem) const
-	{
-		return (std::find(this->begin(), this->end(), elem) != this->end());
-	}
-
-	void remove(const LC &elem)
-	{
-		this->erase(std::remove(this->begin(), this->end(), elem), this->end());
-	}
-
-	void insert_at(const std::size_t index, const LC &elem)
-	{
-		this->insert(this->begin() + index, elem);
-	}
-
-	 void remove_at(const std::size_t pos)
-	{
-		this->erase(this->begin() + pos);
-	}
-
-	int indexof(const LC &elem) const
-	{
-		for (std::size_t i = 0; i < this->size(); i++)
-		{
-			if (this->at(i) == elem)
-				return i;
-		}
-		return -1;
-	}
-
-};
-
 // ----------------------------------------------------------------------------------------
 // plinkedlist_t: a simple linked list
 //                the list allows insertions / deletions if used properly
@@ -187,249 +143,10 @@ public:
 	void clear() { m_head = nullptr; }
 	bool empty() const { return (m_head == nullptr); }
 
-//private:
+private:
 	LC *m_head;
 };
 
-
-// ----------------------------------------------------------------------------------------
-// hashmap list
-// ----------------------------------------------------------------------------------------
-
-
-template <class C>
-struct hash_functor
-{
-	hash_functor()
-	: m_hash(0)
-	{}
-	hash_functor(const C &v)
-	: m_hash(v)
-	{
-	}
-	friend unsigned operator%(const hash_functor &lhs, const unsigned &rhs) { return lhs.m_hash % rhs; }
-	bool operator==(const hash_functor &lhs) const { return (m_hash == lhs.m_hash); }
-private:
-	unsigned m_hash;
-};
-
-template <>
-struct hash_functor<pstring>
-{
-	hash_functor()
-	: m_hash(0)
-	{}
-	hash_functor(const pstring &v)
-	{
-		/* modified djb2 */
-		const pstring::mem_t *string = v.cstr();
-		unsigned result = 5381;
-		for (pstring::mem_t c = *string; c != 0; c = *string++)
-			result = ((result << 5) + result ) ^ (result >> (32 - 5)) ^ c;
-			//result = (result*33) ^ c;
-		m_hash = result;
-	}
-	friend unsigned operator%(const hash_functor<pstring> &lhs, const unsigned &rhs) { return lhs.m_hash % rhs; }
-	unsigned operator()() { return m_hash; }
-	bool operator==(const hash_functor<pstring> &lhs) const { return (m_hash == lhs.m_hash); }
-private:
-	unsigned m_hash;
-};
-
-#if 0
-#if 0
-	unsigned hash(const pstring &v) const
-	{
-		/* Fowler???Noll???Vo hash - FNV-1 */
-		const char *string = v.cstr();
-		unsigned result = 2166136261;
-		for (UINT8 c = *string++; c != 0; c = *string++)
-			result = (result * 16777619) ^ c;
-			// result = (result ^ c) * 16777619; FNV 1a
-		return result;
-	}
-#else
-	unsigned hash(const pstring &v) const
-	{
-		/* jenkins one at a time algo */
-		unsigned result = 0;
-		const char *string = v.cstr();
-		while (*string)
-		{
-			result += *string;
-			string++;
-			result += (result << 10);
-			result ^= (result >> 6);
-		}
-		result += (result << 3);
-		result ^= (result >> 11);
-		result += (result << 15);
-		return result;
-	}
-#endif
-#endif
-
-template <class K, class V, class H = hash_functor<K> >
-class hashmap_t
-{
-public:
-	hashmap_t() : m_hash(37)
-	{
-		for (unsigned i=0; i<m_hash.size(); i++)
-			m_hash[i] = -1;
-	}
-
-	~hashmap_t()
-	{
-	}
-
-	struct element_t
-	{
-		element_t(const K &key, const H &hash, const V &value)
-		: m_key(key), m_hash(hash), m_value(value), m_next(-1)
-		{}
-		K m_key;
-		H m_hash;
-		V m_value;
-		int m_next;
-	};
-
-	void clear()
-	{
-#if 0
-		if (0)
-		{
-			unsigned cnt = 0;
-			for (unsigned i=0; i<m_hash.size(); i++)
-				if (m_hash[i] >= 0)
-					cnt++;
-			const unsigned s = m_values.size();
-			if (s>0)
-				printf("phashmap: %d elements %d hashsize, percent in overflow: %d\n", s, (unsigned) m_hash.size(),  (s - cnt) * 100 / s);
-			else
-				printf("phashmap: No elements .. \n");
-		}
-#endif
-		m_values.clear();
-		for (unsigned i=0; i<m_hash.size(); i++)
-			m_hash[i] = -1;
-	}
-
-	bool contains(const K &key) const
-	{
-		return (get_idx(key) >= 0);
-	}
-
-	int index_of(const K &key) const
-	{
-		return get_idx(key);
-	}
-
-	unsigned size() const { return m_values.size(); }
-
-	bool add(const K &key, const V &value)
-	{
-		/*
-		 * we are using the Euler prime function here
-		 *
-		 * n * n + n + 41 | 40 >= n >=0
-		 *
-		 * and accept that outside we will not have a prime
-		 *
-		 */
-		if (m_values.size() * 3 / 2 > m_hash.size())
-		{
-			unsigned n = std::sqrt( 2 * m_hash.size());
-			n = n * n + n + 41;
-			m_hash.resize(n);
-			rebuild();
-		}
-		const H hash(key);
-		const unsigned pos = hash % m_hash.size();
-		if (m_hash[pos] == -1)
-		{
-			unsigned vpos = m_values.size();
-			m_values.push_back(element_t(key, hash, value));
-			m_hash[pos] = vpos;
-		}
-		else
-		{
-			int ep = m_hash[pos];
-
-			for (; ep != -1; ep = m_values[ep].m_next)
-			{
-				if (m_values[ep].m_hash == hash && m_values[ep].m_key == key )
-					return false; /* duplicate */
-			}
-			unsigned vpos = m_values.size();
-			m_values.push_back(element_t(key, hash, value));
-			m_values[vpos].m_next = m_hash[pos];
-			m_hash[pos] = vpos;
-		}
-		return true;
-	}
-
-	V& operator[](const K &key)
-	{
-		int p = get_idx(key);
-		if (p == -1)
-		{
-			p = m_values.size();
-			add(key, V());
-		}
-		return m_values[p].m_value;
-	}
-
-	V& value_at(const unsigned pos) { return m_values[pos].m_value; }
-	const V& value_at(const unsigned pos) const { return m_values[pos].m_value; }
-
-	V& key_at(const unsigned pos) { return m_values[pos].m_key; }
-private:
-
-	int get_idx(const K &key) const
-	{
-		H hash(key);
-		const unsigned pos = hash % m_hash.size();
-
-		for (int ep = m_hash[pos]; ep != -1; ep = m_values[ep].m_next)
-			if (m_values[ep].m_hash == hash && m_values[ep].m_key == key )
-				return ep;
-		return -1;
-	}
-
-	void rebuild()
-	{
-		for (unsigned i=0; i<m_hash.size(); i++)
-			m_hash[i] = -1;
-		for (unsigned i=0; i<m_values.size(); i++)
-		{
-			unsigned pos = m_values[i].m_hash % m_hash.size();
-			m_values[i].m_next = m_hash[pos];
-			m_hash[pos] = i;
-		}
-
-	}
-	pvector_t<element_t> m_values;
-	std::vector<int> m_hash;
-};
-
-// ----------------------------------------------------------------------------------------
-// sort a list ... slow, I am lazy
-// elements must support ">" operator.
-// ----------------------------------------------------------------------------------------
-
-template<typename T>
-static inline void sort_list(T &sl)
-{
-	for(unsigned i = 0; i < sl.size(); i++)
-	{
-		for(unsigned j = i + 1; j < sl.size(); j++)
-			if(sl[i] > sl[j])
-				std::swap(sl[i], sl[j]);
-
-	}
-}
-
 }
 
 #endif /* PLISTS_H_ */
diff --git a/src/lib/netlist/plib/poptions.h b/src/lib/netlist/plib/poptions.h
index 8a66000053c..3ab1adb78c6 100644
--- a/src/lib/netlist/plib/poptions.h
+++ b/src/lib/netlist/plib/poptions.h
@@ -71,7 +71,7 @@ public:
 
 	virtual int parse(pstring argument) override
 	{
-		if (m_limit.contains(argument))
+		if (plib::container::contains(m_limit, argument))
 		{
 			m_val = argument;
 			return 0;
@@ -224,7 +224,7 @@ private:
 		return nullptr;
 	}
 
-	pvector_t<option *> m_opts;
+	std::vector<option *> m_opts;
 	pstring m_app;
 };
 
diff --git a/src/lib/netlist/plib/pparser.cpp b/src/lib/netlist/plib/pparser.cpp
index 359e4415d72..6c0fa79d7e4 100644
--- a/src/lib/netlist/plib/pparser.cpp
+++ b/src/lib/netlist/plib/pparser.cpp
@@ -197,7 +197,7 @@ ptokenizer::token_t ptokenizer::get_token_internal()
 			c = getc();
 		}
 		ungetc();
-		token_id_t id = token_id_t(m_tokens.indexof(tokstr));
+		token_id_t id(plib::container::indexof(m_tokens, tokstr));
 		if (id.id() >= 0)
 			return token_t(id, tokstr);
 		else
@@ -225,14 +225,14 @@ ptokenizer::token_t ptokenizer::get_token_internal()
 			/* expensive, check for single char tokens */
 			if (tokstr.len() == 1)
 			{
-				token_id_t id = token_id_t(m_tokens.indexof(tokstr));
+				token_id_t id(plib::container::indexof(m_tokens, tokstr));
 				if (id.id() >= 0)
 					return token_t(id, tokstr);
 			}
 			c = getc();
 		}
 		ungetc();
-		token_id_t id = token_id_t(m_tokens.indexof(tokstr));
+		token_id_t id(plib::container::indexof(m_tokens, tokstr));
 		if (id.id() >= 0)
 			return token_t(id, tokstr);
 		else
@@ -267,7 +267,7 @@ ppreprocessor::ppreprocessor()
 	m_expr_sep.push_back(" ");
 	m_expr_sep.push_back("\t");
 
-	m_defines.add("__PLIB_PREPROCESSOR__", define_t("__PLIB_PREPROCESSOR__", "1"));
+	m_defines.insert({"__PLIB_PREPROCESSOR__", define_t("__PLIB_PREPROCESSOR__", "1")});
 }
 
 void ppreprocessor::error(const pstring &err)
@@ -349,9 +349,9 @@ double ppreprocessor::expr(const pstring_vector_t &sexpr, std::size_t &start, in
 
 ppreprocessor::define_t *ppreprocessor::get_define(const pstring &name)
 {
-	int idx = m_defines.index_of(name);
-	if (idx >= 0)
-		return &m_defines.value_at(idx);
+	auto idx = m_defines.find(name);
+	if (idx != m_defines.end())
+		return &idx->second;
 	else
 		return nullptr;
 }
@@ -440,7 +440,7 @@ pstring  ppreprocessor::process_line(const pstring &line)
 			{
 				if (lti.size() != 3)
 					error("PREPRO: only simple defines allowed: " + line);
-				m_defines.add(lti[1], define_t(lti[1], lti[2]));
+				m_defines.insert({lti[1], define_t(lti[1], lti[2])});
 			}
 		}
 		else
diff --git a/src/lib/netlist/plib/pparser.h b/src/lib/netlist/plib/pparser.h
index 610f524b5e3..ebf8d1630d1 100644
--- a/src/lib/netlist/plib/pparser.h
+++ b/src/lib/netlist/plib/pparser.h
@@ -8,6 +8,8 @@
 #ifndef PPARSER_H_
 #define PPARSER_H_
 
+#include <unordered_map>
+
 #include "pconfig.h"
 #include "pstring.h"
 #include "plists.h"
@@ -139,7 +141,7 @@ private:
 	pstring m_identifier_chars;
 	pstring m_number_chars;
 	pstring m_number_chars_start;
-	pvector_t<pstring> m_tokens;
+	std::vector<pstring> m_tokens;
 	pstring m_whitespace;
 	pstring::code_t  m_string;
 
@@ -189,7 +191,7 @@ private:
 
 	pstring process_line(const pstring &line);
 
-	hashmap_t<pstring, define_t> m_defines;
+	std::unordered_map<pstring, define_t> m_defines;
 	plib::pstring_vector_t m_expr_sep;
 
 	//pstringbuffer m_ret;
diff --git a/src/lib/netlist/plib/pstate.cpp b/src/lib/netlist/plib/pstate.cpp
index c8c4c5725c6..ee44eede27a 100644
--- a/src/lib/netlist/plib/pstate.cpp
+++ b/src/lib/netlist/plib/pstate.cpp
@@ -9,70 +9,53 @@
 
 namespace plib {
 
-pstate_manager_t::pstate_manager_t()
+state_manager_t::state_manager_t()
 {
 }
 
-pstate_manager_t::~pstate_manager_t()
+state_manager_t::~state_manager_t()
 {
 	m_save.clear();
 }
 
 
 
-void pstate_manager_t::save_state_ptr(const void *owner, const pstring &stname, const pstate_data_type_e dt, const int size, const int count, void *ptr, bool is_ptr)
+void state_manager_t::save_state_ptr(const void *owner, const pstring &stname, const datatype_t dt, const int count, void *ptr)
 {
-	pstring fullname = stname;
-	ATTR_UNUSED  pstring ts[] = {
-			"NOT_SUPPORTED",
-			"DT_CUSTOM",
-			"DT_DOUBLE",
-#if (PHAS_INT128)
-			"DT_INT128",
-#endif
-			"DT_INT64",
-			"DT_INT16",
-			"DT_INT8",
-			"DT_INT",
-			"DT_BOOLEAN",
-			"DT_FLOAT"
-	};
-
-	auto p = plib::make_unique<pstate_entry_t>(stname, dt, owner, size, count, ptr, is_ptr);
+	auto p = plib::make_unique<entry_t>(stname, dt, owner, count, ptr);
 	m_save.push_back(std::move(p));
 }
 
-void pstate_manager_t::remove_save_items(const void *owner)
+void state_manager_t::remove_save_items(const void *owner)
 {
-	unsigned i = 0;
-	while (i < m_save.size())
+	for (auto i = m_save.begin(); i != m_save.end(); )
 	{
-		if (m_save[i]->m_owner == owner)
-			m_save.remove_at(i);
+		if (i->get()->m_owner == owner)
+			i = m_save.erase(i);
 		else
 			i++;
 	}
 }
 
-void pstate_manager_t::pre_save()
+void state_manager_t::pre_save()
 {
 	for (auto & s : m_save)
-		if (s->m_dt == DT_CUSTOM)
+		if (s->m_dt.is_custom)
 			s->m_callback->on_pre_save();
 }
 
-void pstate_manager_t::post_load()
+void state_manager_t::post_load()
 {
 	for (auto & s : m_save)
-		if (s->m_dt == DT_CUSTOM)
+		if (s->m_dt.is_custom)
 			s->m_callback->on_post_load();
 }
 
-template<> void pstate_manager_t::save_item(const void *owner, pstate_callback_t &state, const pstring &stname)
+template<> void state_manager_t::save_item(const void *owner, callback_t &state, const pstring &stname)
 {
 	//save_state_ptr(stname, DT_CUSTOM, 0, 1, &state);
-	pstate_callback_t *state_p = &state;
-	auto p = plib::make_unique<pstate_entry_t>(stname, owner, state_p);
+	callback_t *state_p = &state;
+	auto p = plib::make_unique<entry_t>(stname, owner, state_p);
 	m_save.push_back(std::move(p));
 	state.register_state(*this, stname);
 }
diff --git a/src/lib/netlist/plib/pstate.h b/src/lib/netlist/plib/pstate.h
index 12115678b3a..ee170f981b1 100644
--- a/src/lib/netlist/plib/pstate.h
+++ b/src/lib/netlist/plib/pstate.h
@@ -9,6 +9,7 @@
 #define PSTATE_H_
 
 #include <memory>
+#include <type_traits>
 
 #include "plists.h"
 #include "pstring.h"
@@ -17,126 +18,104 @@
 // state saving ...
 // ----------------------------------------------------------------------------------------
 
-enum pstate_data_type_e {
-	NOT_SUPPORTED,
-	DT_CUSTOM,
-	DT_DOUBLE,
-#if (PHAS_INT128)
-	DT_INT128,
-#endif
-	DT_INT64,
-	DT_INT16,
-	DT_INT8,
-	DT_INT,
-	DT_BOOLEAN,
-	DT_FLOAT
-};
-
-template<typename ItemType> struct pstate_datatype
-{
-	static const pstate_data_type_e type = pstate_data_type_e(NOT_SUPPORTED);
-	static const bool is_ptr = false;
-};
-
-template<typename ItemType> struct pstate_datatype<ItemType *>
-{
-	static const pstate_data_type_e type = pstate_data_type_e(NOT_SUPPORTED);
-	static const bool is_ptr = true;
-};
-
-//template<typename ItemType> struct type_checker<ItemType*> { static const bool is_atom = false; static const bool is_pointer = true; };
-
-#define NETLIST_SAVE_TYPE(TYPE, TYPEDESC) \
-		template<> struct pstate_datatype<TYPE>{ static const pstate_data_type_e type = pstate_data_type_e(TYPEDESC); static const bool is_ptr = false;}; \
-		template<> struct pstate_datatype<TYPE *>{ static const pstate_data_type_e type = pstate_data_type_e(TYPEDESC); static const bool is_ptr = true;}
-
-NETLIST_SAVE_TYPE(char, DT_INT8);
-NETLIST_SAVE_TYPE(double, DT_DOUBLE);
-NETLIST_SAVE_TYPE(float, DT_FLOAT);
-NETLIST_SAVE_TYPE(INT8, DT_INT8);
-NETLIST_SAVE_TYPE(UINT8, DT_INT8);
-#if (PHAS_INT128)
-NETLIST_SAVE_TYPE(INT128, DT_INT128);
-NETLIST_SAVE_TYPE(UINT128, DT_INT128);
-#endif
-NETLIST_SAVE_TYPE(INT64, DT_INT64);
-NETLIST_SAVE_TYPE(UINT64, DT_INT64);
-NETLIST_SAVE_TYPE(bool, DT_BOOLEAN);
-NETLIST_SAVE_TYPE(UINT32, DT_INT);
-NETLIST_SAVE_TYPE(INT32, DT_INT);
-NETLIST_SAVE_TYPE(UINT16, DT_INT16);
-NETLIST_SAVE_TYPE(INT16, DT_INT16);
-//NETLIST_SAVE_TYPE(std::size_t, DT_INT64);
-
 namespace plib {
 
-class pstate_manager_t;
-
-class pstate_callback_t
+class state_manager_t
 {
 public:
-	using list_t = pvector_t<pstate_callback_t *>;
 
-	virtual ~pstate_callback_t() { };
-
-	virtual void register_state(pstate_manager_t &manager, const pstring &module) = 0;
-	virtual void on_pre_save() = 0;
-	virtual void on_post_load() = 0;
-protected:
-};
-
-struct pstate_entry_t
-{
-	using list_t = pvector_t<std::unique_ptr<pstate_entry_t>>;
-
-	pstate_entry_t(const pstring &stname, const pstate_data_type_e dt, const void *owner,
-			const int size, const int count, void *ptr, bool is_ptr)
-	: m_name(stname), m_dt(dt), m_owner(owner), m_callback(nullptr), m_size(size), m_count(count), m_ptr(ptr), m_is_ptr(is_ptr) { }
-
-	pstate_entry_t(const pstring &stname, const void *owner, pstate_callback_t *callback)
-	: m_name(stname), m_dt(DT_CUSTOM), m_owner(owner), m_callback(callback), m_size(0), m_count(0), m_ptr(nullptr), m_is_ptr(false) { }
-
-	~pstate_entry_t() { }
-
-	pstring m_name;
-	const pstate_data_type_e m_dt;
-	const void *m_owner;
-	pstate_callback_t *m_callback;
-	const int m_size;
-	const int m_count;
-	void *m_ptr;
-	bool m_is_ptr;
-
-	template<typename T>
-	T *resolved()
+	struct datatype_t
 	{
-		if (m_is_ptr)
-			return *static_cast<T **>(m_ptr);
-		else
-			return static_cast<T *>(m_ptr);
-	}
-};
+		datatype_t(std::size_t bsize, bool bptr, bool bintegral, bool bfloat)
+		: size(bsize), is_ptr(bptr), is_integral(bintegral), is_float(bfloat), is_custom(false)
+		{}
+		datatype_t(bool bcustom)
+		: size(0), is_ptr(false), is_integral(false), is_float(false), is_custom(bcustom)
+		{}
 
-class pstate_manager_t
-{
-public:
+		const std::size_t size;
+		const bool is_ptr;
+		const bool is_integral;
+		const bool is_float;
+		const bool is_custom;
+	};
 
-	pstate_manager_t();
-	~pstate_manager_t();
+	template<typename T> struct datatype_f
+	{
+		static inline const datatype_t f()
+		{
+			return datatype_t(sizeof(T), false, std::is_integral<T>::value || std::is_enum<T>::value,
+					std::is_floating_point<T>::value); }
+	};
+
+	template<typename T> struct datatype_f<T *>
+	{
+		static inline const datatype_t f()
+		{
+			return datatype_t(sizeof(T), true, std::is_integral<T>::value || std::is_enum<T>::value,
+					std::is_floating_point<T>::value);
+		}
+	};
+
+	class callback_t
+	{
+	public:
+		using list_t = std::vector<callback_t *>;
+
+		virtual ~callback_t() { };
+
+		virtual void register_state(state_manager_t &manager, const pstring &module) = 0;
+		virtual void on_pre_save() = 0;
+		virtual void on_post_load() = 0;
+	protected:
+	};
+
+	struct entry_t
+	{
+		using list_t = std::vector<std::unique_ptr<entry_t>>;
+
+		entry_t(const pstring &stname, const datatype_t dt, const void *owner,
+				const std::size_t count, void *ptr)
+		: m_name(stname), m_dt(dt), m_owner(owner), m_callback(nullptr), m_count(count), m_ptr(ptr) { }
+
+		entry_t(const pstring &stname, const void *owner, callback_t *callback)
+		: m_name(stname), m_dt(datatype_t(true)), m_owner(owner), m_callback(callback), m_count(0), m_ptr(nullptr) { }
+
+		~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;
+
+		template<typename T>
+		T *resolved()
+		{
+			if (m_dt.is_ptr)
+				return *static_cast<T **>(m_ptr);
+			else
+				return static_cast<T *>(m_ptr);
+		}
+	};
+
+	state_manager_t();
+	~state_manager_t();
 
 	template<typename C> void save_item(const void *owner, C &state, const pstring &stname)
 	{
-		save_state_ptr( owner, stname, pstate_datatype<C>::type, sizeof(C), 1, &state, pstate_datatype<C>::is_ptr);
+		save_state_ptr( owner, stname, datatype_f<C>::f(), 1, &state);
 	}
 
 	template<typename C, std::size_t N> void save_item(const void *owner, C (&state)[N], const pstring &stname)
 	{
-		save_state_ptr(owner, stname, pstate_datatype<C>::type, sizeof(state[0]), N, &(state[0]), false);
+		save_state_ptr(owner, stname, datatype_f<C>::f(), N, &(state[0]));
 	}
 
 	template<typename C> void save_item(const void *owner, C *state, const pstring &stname, const int count)
 	{
-		save_state_ptr(owner, stname, pstate_datatype<C>::type, sizeof(C), count, state, false);
+		save_state_ptr(owner, stname, datatype_f<C>::f(), count, state);
 	}
 
 	template<typename C>
@@ -149,18 +128,19 @@ public:
 	void post_load();
 	void remove_save_items(const void *owner);
 
-	const pstate_entry_t::list_t &save_list() const { return m_save; }
+	const entry_t::list_t &save_list() const { return m_save; }
 
-	void save_state_ptr(const void *owner, const pstring &stname, const pstate_data_type_e, const int size, const int count, void *ptr, bool is_ptr);
+	void save_state_ptr(const void *owner, const pstring &stname, const datatype_t dt, const int count, void *ptr);
 
 protected:
 
 private:
-	pstate_entry_t::list_t m_save;
+	entry_t::list_t m_save;
 };
 
-template<> void pstate_manager_t::save_item(const void *owner, pstate_callback_t &state, const pstring &stname);
+template<> void state_manager_t::save_item(const void *owner, callback_t &state, const pstring &stname);
 
+#if 0
 template <typename T>
 class pstate_interface_t
 {
@@ -169,24 +149,24 @@ public:
 
 	template<typename C> void save(C &state, const pstring &stname)
 	{
-		pstate_manager_t &manager = static_cast<T*>(this)->state_manager();
+		state_manager_t &manager = static_cast<T*>(this)->state_manager();
 		pstring module = static_cast<T*>(this)->name();
 		manager.save_item(this, state, module + "." + stname);
 	}
 	template<typename C, std::size_t N> void save(C (&state)[N], const pstring &stname)
 	{
-		pstate_manager_t &manager = static_cast<T*>(this)->state_manager();
+		state_manager_t &manager = static_cast<T*>(this)->state_manager();
 		pstring module = static_cast<T*>(this)->name();
-		manager.save_state_ptr(this, module + "." + stname, pstate_datatype<C>::type, sizeof(state[0]), N, &(state[0]), false);
+		manager.save_state_ptr(this, module + "." + stname, state_manager_t::datatype_f<C>::f(), N, &(state[0]));
 	}
 	template<typename C> void save(C *state, const pstring &stname, const int count)
 	{
-		pstate_manager_t &manager = static_cast<T*>(this)->state_manager();
+		state_manager_t &manager = static_cast<T*>(this)->state_manager();
 		pstring module = static_cast<T*>(this)->name();
-		manager.save_state_ptr(this, module + "." + stname, pstate_datatype<C>::type, sizeof(C), count, state, false);
+		manager.save_state_ptr(this, module + "." + stname, state_manager_t::datatype_f<C>::f(), count, state);
 	}
 };
-
+#endif
 }
 
 #endif /* PSTATE_H_ */
diff --git a/src/lib/netlist/plib/pstring.h b/src/lib/netlist/plib/pstring.h
index 5cfe5945fcf..72462f9992e 100644
--- a/src/lib/netlist/plib/pstring.h
+++ b/src/lib/netlist/plib/pstring.h
@@ -306,7 +306,6 @@ public:
 	// construction with copy
 	pstring(const mem_t *string) : type_t(string) { }
 	pstring(const type_t &string) : type_t(string) { }
-
 };
 
 // ----------------------------------------------------------------------------------------
@@ -378,4 +377,22 @@ 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;
+        }
+    };
+}
+
 #endif /* PSTRING_H_ */
diff --git a/src/lib/netlist/plib/putil.cpp b/src/lib/netlist/plib/putil.cpp
index 3e5cecc0081..79cea5bcf88 100644
--- a/src/lib/netlist/plib/putil.cpp
+++ b/src/lib/netlist/plib/putil.cpp
@@ -41,7 +41,7 @@ namespace plib
 	}
 
 	pstring_vector_t::pstring_vector_t(const pstring &str, const pstring &onstr, bool ignore_empty)
-	: pvector_t<pstring>()
+	: std::vector<pstring>()
 	{
 		int p = 0;
 		int pn;
@@ -64,7 +64,7 @@ namespace plib
 	}
 
 	pstring_vector_t::pstring_vector_t(const pstring &str, const pstring_vector_t &onstrl)
-	: pvector_t<pstring>()
+	: std::vector<pstring>()
 	{
 		pstring col = "";
 
diff --git a/src/lib/netlist/plib/putil.h b/src/lib/netlist/plib/putil.h
index db5510178c0..3636e0be217 100644
--- a/src/lib/netlist/plib/putil.h
+++ b/src/lib/netlist/plib/putil.h
@@ -21,14 +21,49 @@ namespace plib
 		const pstring environment(const pstring &var, const pstring &default_val = "");
 	}
 
+	namespace container
+	{
+		template <class C>
+		const bool contains(C &con, const typename C::value_type &elem)
+		{
+			return std::find(con.begin(), con.end(), elem) != con.end();
+		}
+
+		template <class C>
+		int indexof(C &con, const typename C::value_type &elem)
+		{
+			auto it = std::find(con.begin(), con.end(), elem);
+			if (it != con.end())
+				return it - con.begin();
+			return -1;
+		}
+
+		template <class C>
+		void insert_at(C &con, const std::size_t index, const typename C::value_type &elem)
+		{
+			con.insert(con.begin() + index, elem);
+		}
+
+	}
+
+	template <class C>
+	struct indexed_compare
+	{
+	    indexed_compare(const C& target): m_target(target) {}
+
+	    bool operator()(int a, int b) const { return m_target[a] < m_target[b]; }
+
+	    const C& m_target;
+	};
+
 	// ----------------------------------------------------------------------------------------
 	// string list
 	// ----------------------------------------------------------------------------------------
 
-	class pstring_vector_t : public pvector_t<pstring>
+	class pstring_vector_t : public std::vector<pstring>
 	{
 	public:
-		pstring_vector_t() : pvector_t<pstring>() { }
+		pstring_vector_t() : std::vector<pstring>() { }
 		pstring_vector_t(const pstring &str, const pstring &onstr, bool ignore_empty = false);
 		pstring_vector_t(const pstring &str, const pstring_vector_t &onstrl);
 	};
diff --git a/src/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp
index 302f1d12184..7c54f40f53a 100644
--- a/src/lib/netlist/prg/nltool.cpp
+++ b/src/lib/netlist/prg/nltool.cpp
@@ -129,7 +129,7 @@ protected:
 	{
 		pout("{}: {}\n", l.name().cstr(), ls.cstr());
 		if (l == plib::plog_level::FATAL)
-			throw;
+			throw std::exception();
 	}
 
 private:
@@ -191,9 +191,9 @@ struct input_t
 
 };
 
-plib::pvector_t<input_t> *read_input(netlist::netlist_t *netlist, pstring fname)
+std::vector<input_t> *read_input(netlist::netlist_t *netlist, pstring fname)
 {
-	plib::pvector_t<input_t> *ret = plib::palloc<plib::pvector_t<input_t>>();
+	std::vector<input_t> *ret = plib::palloc<std::vector<input_t>>();
 	if (fname != "")
 	{
 		plib::pifilestream f(fname);
@@ -225,7 +225,7 @@ static void run(tool_options_t &opts)
 
 	nt.read_netlist(opts.opt_file(), opts.opt_name());
 
-	plib::pvector_t<input_t> *inps = read_input(&nt, opts.opt_inp());
+	std::vector<input_t> *inps = read_input(&nt, opts.opt_inp());
 
 	double ttr = opts.opt_ttr();
 
@@ -245,7 +245,7 @@ static void run(tool_options_t &opts)
 	}
 	nt.process_queue(netlist::netlist_time(ttr) - nlt);
 	nt.stop();
-	pfree(inps);
+	plib::pfree(inps);
 
 	double emutime = (double) (plib::ticks() - t) / (double) plib::ticks_per_second();
 	pout("{1:f} seconds emulation took {2:f} real time ==> {3:5.2f}%\n", ttr, emutime, ttr/emutime*100.0);
@@ -285,19 +285,34 @@ static void listdevices()
 	nt.setup().start_devices();
 	nt.setup().resolve_inputs();
 
+	std::vector<plib::owned_ptr<netlist::core_device_t>> devs;
+
 	for (auto & f : list)
 	{
 		pstring out = plib::pfmt("{1} {2}(<id>")(f->classname(),"-20")(f->name());
 		pstring terms("");
 
-		auto d = f->Create(nt.setup().netlist(), "dummy");
-
+		auto d = f->Create(nt.setup().netlist(), f->name() + "_lc");
 		// get the list of terminals ...
-		for (auto & inp :  d->m_terminals)
+
+		for (auto & t : nt.setup().m_terminals)
 		{
-			if (inp.startsWith(d->name() + "."))
-				inp = inp.substr(d->name().len() + 1);
-			terms += "," + inp;
+			if (t.second->name().startsWith(d->name()))
+			{
+				pstring tn(t.second->name().substr(d->name().len()+1));
+				if (tn.find(".")<0)
+					terms += ", " + tn;
+			}
+		}
+
+		for (auto & t : nt.setup().m_alias)
+		{
+			if (t.first.startsWith(d->name()))
+			{
+				pstring tn(t.first.substr(d->name().len()+1));
+				if (tn.find(".")<0)
+					terms += ", " + tn;
+			}
 		}
 
 		if (f->param_desc().startsWith("+"))
@@ -317,6 +332,7 @@ static void listdevices()
 		printf("%s\n", out.cstr());
 		if (terms != "")
 			printf("Terminals: %s\n", terms.substr(1).cstr());
+		devs.push_back(std::move(d));
 	}
 }
 
diff --git a/src/lib/netlist/solver/nld_matrix_solver.h b/src/lib/netlist/solver/nld_matrix_solver.h
index 7504191a356..de5e999e340 100644
--- a/src/lib/netlist/solver/nld_matrix_solver.h
+++ b/src/lib/netlist/solver/nld_matrix_solver.h
@@ -74,9 +74,9 @@ public:
 
 	unsigned m_railstart;
 
-	plib::pvector_t<unsigned> m_nz;   /* all non zero for multiplication */
-	plib::pvector_t<unsigned> m_nzrd; /* non zero right of the diagonal for elimination, may include RHS element */
-	plib::pvector_t<unsigned> m_nzbd; /* non zero below of the diagonal for elimination */
+	std::vector<unsigned> m_nz;   /* all non zero for multiplication */
+	std::vector<unsigned> m_nzrd; /* non zero right of the diagonal for elimination, may include RHS element */
+	std::vector<unsigned> m_nzbd; /* non zero below of the diagonal for elimination */
 
 	/* state */
 	nl_double m_last_V;
@@ -84,12 +84,12 @@ public:
 	nl_double m_h_n_m_1;
 
 private:
-	plib::pvector_t<int> m_net_other;
-	plib::pvector_t<nl_double> m_go;
-	plib::pvector_t<nl_double> m_gt;
-	plib::pvector_t<nl_double> m_Idr;
-	plib::pvector_t<nl_double *> m_other_curanalog;
-	plib::pvector_t<terminal_t *> m_term;
+	std::vector<int> m_net_other;
+	std::vector<nl_double> m_go;
+	std::vector<nl_double> m_gt;
+	std::vector<nl_double> m_Idr;
+	std::vector<nl_double *> m_other_curanalog;
+	std::vector<terminal_t *> m_term;
 
 };
 
@@ -109,8 +109,7 @@ public:
 class matrix_solver_t : public device_t
 {
 public:
-	using list_t = plib::pvector_t<matrix_solver_t *>;
-	using dev_list_t = core_device_t::list_t;
+	using list_t = std::vector<matrix_solver_t *>;
 
 	enum eSortType
 	{
@@ -121,28 +120,20 @@ 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_newton_raphson(0),
-	m_stat_vsolver_calls(0),
-	m_iterative_fail(0),
-	m_iterative_total(0),
-	m_params(*params),
-	m_last_step(0, 1),
-	m_cur_ts(0),
-	m_fb_sync(*this, "FB_sync"),
-	m_Q_sync(*this, "Q_sync"),
-	m_sort(sort)
+	: device_t(anetlist, name)
+	, m_params(*params)
+	, m_stat_calculations(*this, "m_stat_calculations", 0)
+	, m_stat_newton_raphson(*this, "m_stat_newton_raphson", 0)
+	, m_stat_vsolver_calls(*this, "m_stat_vsolver_calls", 0)
+	, m_iterative_fail(*this, "m_iterative_fail", 0)
+	, m_iterative_total(*this, "m_iterative_total", 0)
+	, m_last_step(*this, "m_last_step", netlist_time::quantum())
+	, m_cur_ts(*this, "m_cur_ts", 0)
+	, m_fb_sync(*this, "FB_sync")
+	, m_Q_sync(*this, "Q_sync")
+	, m_sort(sort)
 	{
 		connect_post_start(m_fb_sync, m_Q_sync);
-
-		save(NLNAME(m_last_step));
-		save(NLNAME(m_cur_ts));
-		save(NLNAME(m_stat_calculations));
-		save(NLNAME(m_stat_newton_raphson));
-		save(NLNAME(m_stat_vsolver_calls));
-		save(NLNAME(m_iterative_fail));
-		save(NLNAME(m_iterative_total));
 	}
 
 	virtual ~matrix_solver_t();
@@ -200,27 +191,27 @@ protected:
 	template <typename T>
 	void build_LE_RHS();
 
-	plib::pvector_t<terms_t *> m_terms;
-	plib::pvector_t<analog_net_t *> m_nets;
+	std::vector<terms_t *> m_terms;
+	std::vector<analog_net_t *> m_nets;
 	std::vector<std::unique_ptr<proxied_analog_output_t>> m_inps;
 
-	plib::pvector_t<terms_t *> m_rails_temp;
-
-	int m_stat_calculations;
-	int m_stat_newton_raphson;
-	int m_stat_vsolver_calls;
-	int m_iterative_fail;
-	int m_iterative_total;
+	std::vector<terms_t *> m_rails_temp;
 
 	const solver_parameters_t &m_params;
 
+	state_var<int> m_stat_calculations;
+	state_var<int> m_stat_newton_raphson;
+	state_var<int> m_stat_vsolver_calls;
+	state_var<int> m_iterative_fail;
+	state_var<int> m_iterative_total;
+
 	inline nl_double current_timestep() { return m_cur_ts; }
 private:
 
-	netlist_time m_last_step;
-	nl_double m_cur_ts;
-	dev_list_t m_step_devices;
-	dev_list_t m_dynamic_devices;
+	state_var<netlist_time> m_last_step;
+	state_var<nl_double> m_cur_ts;
+	std::vector<core_device_t *> m_step_devices;
+	std::vector<core_device_t *> m_dynamic_devices;
 
 	logic_input_t m_fb_sync;
 	logic_output_t m_Q_sync;
diff --git a/src/lib/netlist/solver/nld_ms_direct.h b/src/lib/netlist/solver/nld_ms_direct.h
index f8514867f6e..5e4e016f6fd 100644
--- a/src/lib/netlist/solver/nld_ms_direct.h
+++ b/src/lib/netlist/solver/nld_ms_direct.h
@@ -206,18 +206,14 @@ void matrix_solver_direct_t<m_N, storage_N>::vsetup(analog_net_t::list_t &nets)
 	{
 		terms_t * t = m_terms[k];
 
-		if (!t->m_nzrd.contains(N()))
+		if (!plib::container::contains(t->m_nzrd, N()))
 			t->m_nzrd.push_back(N());
 	}
 
-	save(NLNAME(m_last_RHS));
+	netlist().save(*this, m_last_RHS, "m_last_RHS");
 
 	for (unsigned k = 0; k < N(); k++)
-	{
-		pstring num = plib::pfmt("{1}")(k);
-
-		save(RHS(k), "RHS." + num);
-	}
+		netlist().save(*this, RHS(k), plib::pfmt("RHS.{1}")(k));
 }
 
 
diff --git a/src/lib/netlist/solver/nld_ms_direct_lu.h b/src/lib/netlist/solver/nld_ms_direct_lu.h
index 47bb95c2855..e5ede1e4a69 100644
--- a/src/lib/netlist/solver/nld_ms_direct_lu.h
+++ b/src/lib/netlist/solver/nld_ms_direct_lu.h
@@ -334,10 +334,11 @@ void matrix_solver_direct_t<m_N, storage_N>::vsetup(analog_net_t::list_t &nets)
 					t->m_nz.add(other[i]);
 			}
 		}
-		psort_list(t->m_nzrd);
+		std::sort(t->m_nzrd.begin(), t->m_nzrd.end());
 
 		t->m_nz.add(k);     // add diagonal
-		psort_list(t->m_nz);
+
+		std::sort(t->m_nz.begin(), t->m_nz.end());
 	}
 
 	if(0)
diff --git a/src/lib/netlist/solver/nld_ms_gcr.h b/src/lib/netlist/solver/nld_ms_gcr.h
index f963c59be01..74733ac87ff 100644
--- a/src/lib/netlist/solver/nld_ms_gcr.h
+++ b/src/lib/netlist/solver/nld_ms_gcr.h
@@ -62,13 +62,13 @@ private:
 	{
 		plib::postringstream t;
 		csc_private(t);
-		plib::hash_functor<pstring> h(t.str());
+		std::hash<pstring> h;
 
-		return plib::pfmt("nl_gcr_{1:x}_{2}")(h())(mat.nz_num);
+		return plib::pfmt("nl_gcr_{1:x}_{2}")(h( t.str() ))(mat.nz_num);
 	}
 
 	unsigned m_dim;
-	plib::pvector_t<int> m_term_cr[storage_N];
+	std::vector<int> m_term_cr[storage_N];
 	mat_cr_t<storage_N> mat;
 	nl_double m_A[storage_N * storage_N];
 
diff --git a/src/lib/netlist/solver/nld_ms_gmres.h b/src/lib/netlist/solver/nld_ms_gmres.h
index e4c42b2e098..30761623611 100644
--- a/src/lib/netlist/solver/nld_ms_gmres.h
+++ b/src/lib/netlist/solver/nld_ms_gmres.h
@@ -48,7 +48,7 @@ private:
 
 	int solve_ilu_gmres(nl_double * RESTRICT x, const nl_double * RESTRICT rhs, const unsigned restart_max, const unsigned mr, nl_double accuracy);
 
-	plib::pvector_t<int> m_term_cr[storage_N];
+	std::vector<int> m_term_cr[storage_N];
 
 	bool m_use_iLU_preconditioning;
 	bool m_use_more_precise_stop_condition;
diff --git a/src/lib/netlist/solver/nld_ms_sm.h b/src/lib/netlist/solver/nld_ms_sm.h
index 7ed72bcd575..3695d3b3b05 100644
--- a/src/lib/netlist/solver/nld_ms_sm.h
+++ b/src/lib/netlist/solver/nld_ms_sm.h
@@ -128,15 +128,10 @@ void matrix_solver_sm_t<m_N, storage_N>::vsetup(analog_net_t::list_t &nets)
 
 	matrix_solver_t::setup_base(nets);
 
-
-	save(NLNAME(m_last_RHS));
+	netlist().save(*this, m_last_RHS, "m_last_RHS");
 
 	for (unsigned k = 0; k < N(); k++)
-	{
-		pstring num = plib::pfmt("{1}")(k);
-
-		save(RHS(k), "RHS." + num);
-	}
+		netlist().save(*this, RHS(k), plib::pfmt("RHS.{1}")(k));
 }
 
 
diff --git a/src/lib/netlist/solver/nld_ms_sor.h b/src/lib/netlist/solver/nld_ms_sor.h
index a198fa6bf57..34a6acefcef 100644
--- a/src/lib/netlist/solver/nld_ms_sor.h
+++ b/src/lib/netlist/solver/nld_ms_sor.h
@@ -29,7 +29,7 @@ public:
 
 	matrix_solver_SOR_t(netlist_t &anetlist, const pstring &name, const solver_parameters_t *params, int size)
 		: matrix_solver_direct_t<m_N, storage_N>(anetlist, name, matrix_solver_t::ASCENDING, params, size)
-		, m_lp_fact(0)
+		, m_lp_fact(*this, "m_lp_fact", 0)
 		{
 		}
 
@@ -39,7 +39,7 @@ public:
 	virtual int vsolve_non_dynamic(const bool newton_raphson) override;
 
 private:
-	nl_double m_lp_fact;
+	state_var<nl_double> m_lp_fact;
 };
 
 // ----------------------------------------------------------------------------------------
@@ -51,7 +51,6 @@ template <unsigned m_N, unsigned storage_N>
 void matrix_solver_SOR_t<m_N, storage_N>::vsetup(analog_net_t::list_t &nets)
 {
 	matrix_solver_direct_t<m_N, storage_N>::vsetup(nets);
-	this->save(NLNAME(m_lp_fact));
 }
 
 template <unsigned m_N, unsigned 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 8fa871d83f4..2ea00212164 100644
--- a/src/lib/netlist/solver/nld_ms_sor_mat.h
+++ b/src/lib/netlist/solver/nld_ms_sor_mat.h
@@ -32,10 +32,11 @@ public:
 
 	matrix_solver_SOR_mat_t(netlist_t &anetlist, const pstring &name, const solver_parameters_t *params, int size)
 		: matrix_solver_direct_t<m_N, storage_N>(anetlist, name, matrix_solver_t::DESCENDING, params, size)
-		, m_omega(params->m_sor)
-		, m_lp_fact(0)
-		, m_gs_fail(0)
-		, m_gs_total(0)
+		, m_Vdelta(*this, "m_Vdelta", 0.0)
+		, m_omega(*this, "m_omega", params->m_sor)
+		, m_lp_fact(*this, "m_lp_fact", 0)
+		, m_gs_fail(*this, "m_gs_fail", 0)
+		, m_gs_total(*this, "m_gs_total", 0)
 		{
 		}
 
@@ -46,12 +47,12 @@ public:
 	virtual int vsolve_non_dynamic(const bool newton_raphson) override;
 
 private:
-	nl_double m_Vdelta[storage_N];
+	state_var<nl_double[storage_N]> m_Vdelta;
 
-	nl_double m_omega;
-	nl_double m_lp_fact;
-	int m_gs_fail;
-	int m_gs_total;
+	state_var<nl_double> m_omega;
+	state_var<nl_double> m_lp_fact;
+	state_var<int> m_gs_fail;
+	state_var<int> m_gs_total;
 };
 
 // ----------------------------------------------------------------------------------------
@@ -62,11 +63,6 @@ template <unsigned m_N, unsigned storage_N>
 void matrix_solver_SOR_mat_t<m_N, storage_N>::vsetup(analog_net_t::list_t &nets)
 {
 	matrix_solver_direct_t<m_N, storage_N>::vsetup(nets);
-	this->save(NLNAME(m_omega));
-	this->save(NLNAME(m_lp_fact));
-	this->save(NLNAME(m_gs_fail));
-	this->save(NLNAME(m_gs_total));
-	this->save(NLNAME(m_Vdelta));
 }
 
 #if 0
diff --git a/src/lib/netlist/solver/nld_ms_w.h b/src/lib/netlist/solver/nld_ms_w.h
index 19c84ef80bc..f0f1cddf96e 100644
--- a/src/lib/netlist/solver/nld_ms_w.h
+++ b/src/lib/netlist/solver/nld_ms_w.h
@@ -137,15 +137,10 @@ void matrix_solver_w_t<m_N, storage_N>::vsetup(analog_net_t::list_t &nets)
 
 	matrix_solver_t::setup_base(nets);
 
-
-	save(NLNAME(m_last_RHS));
+	netlist().save(*this, m_last_RHS, "m_last_RHS");
 
 	for (unsigned k = 0; k < N(); k++)
-	{
-		pstring num = plib::pfmt("{1}")(k);
-
-		save(RHS(k), "RHS." + num);
-	}
+		netlist().save(*this, RHS(k), plib::pfmt("RHS.{1}")(k));
 }
 
 
diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp
index 0a9d6360dc8..84e88623b7f 100644
--- a/src/lib/netlist/solver/nld_solver.cpp
+++ b/src/lib/netlist/solver/nld_solver.cpp
@@ -67,12 +67,12 @@ void terms_t::add(terminal_t *term, int net_other, bool sorted)
 		{
 			if (m_net_other[i] > net_other)
 			{
-				m_term.insert_at(i, term);
-				m_net_other.insert_at(i, net_other);
-				m_gt.insert_at(i, 0.0);
-				m_go.insert_at(i, 0.0);
-				m_Idr.insert_at(i, 0.0);
-				m_other_curanalog.insert_at(i, nullptr);
+				plib::container::insert_at(m_term, i, term);
+				plib::container::insert_at(m_net_other, i, net_other);
+				plib::container::insert_at(m_gt, i, 0.0);
+				plib::container::insert_at(m_go, i, 0.0);
+				plib::container::insert_at(m_Idr, i, 0.0);
+				plib::container::insert_at(m_other_curanalog, i, nullptr);
 				return;
 			}
 		}
@@ -135,10 +135,10 @@ void matrix_solver_t::setup_base(analog_net_t::list_t &nets)
 			{
 				case terminal_t::TERMINAL:
 					if (p->device().is_timestep())
-						if (!m_step_devices.contains(&p->device()))
+						if (!plib::container::contains(m_step_devices, &p->device()))
 							m_step_devices.push_back(&p->device());
 					if (p->device().is_dynamic())
-						if (!m_dynamic_devices.contains(&p->device()))
+						if (!plib::container::contains(m_dynamic_devices, &p->device()))
 							m_dynamic_devices.push_back(&p->device());
 					{
 						terminal_t *pterm = dynamic_cast<terminal_t *>(p);
@@ -257,13 +257,13 @@ void matrix_solver_t::setup_matrix()
 		t->m_nz.clear();
 
 		for (unsigned i = 0; i < t->m_railstart; i++)
-			if (!t->m_nz.contains(other[i]))
+			if (!plib::container::contains(t->m_nz, other[i]))
 				t->m_nz.push_back(other[i]);
 
 		t->m_nz.push_back(k);     // add diagonal
 
 		/* and sort */
-		plib::sort_list(t->m_nz);
+		std::sort(t->m_nz.begin(), t->m_nz.end());
 	}
 
 	/* create a list of non zero elements right of the diagonal
@@ -281,22 +281,21 @@ void matrix_solver_t::setup_matrix()
 		else
 		{
 			t->m_nzrd = m_terms[k-1]->m_nzrd;
-			unsigned j=0;
-			while(j < t->m_nzrd.size())
+			for (auto j = t->m_nzrd.begin(); j != t->m_nzrd.end(); )
 			{
-				if (t->m_nzrd[j] < k + 1)
-					t->m_nzrd.remove_at(j);
+				if (*j < k + 1)
+					j = t->m_nzrd.erase(j);
 				else
-					j++;
+					++j;
 			}
 		}
 
 		for (unsigned i = 0; i < t->m_railstart; i++)
-			if (!t->m_nzrd.contains(other[i]) && other[i] >= (int) (k + 1))
+			if (!plib::container::contains(t->m_nzrd, other[i]) && other[i] >= (int) (k + 1))
 				t->m_nzrd.push_back(other[i]);
 
 		/* and sort */
-		plib::sort_list(t->m_nzrd);
+		std::sort(t->m_nzrd.begin(), t->m_nzrd.end());
 	}
 
 	/* create a list of non zero elements below diagonal k
@@ -324,7 +323,7 @@ void matrix_solver_t::setup_matrix()
 			if (touched[row][k])
 			{
 				ops++;
-				if (!m_terms[k]->m_nzbd.contains(row))
+				if (!plib::container::contains(m_terms[k]->m_nzbd, row))
 					m_terms[k]->m_nzbd.push_back(row);
 				for (unsigned col = k + 1; col < iN; col++)
 					if (touched[k][col])
@@ -353,13 +352,13 @@ void matrix_solver_t::setup_matrix()
 	{
 		pstring num = plib::pfmt("{1}")(k);
 
-		save(m_terms[k]->m_last_V, "lastV." + num);
-		save(m_terms[k]->m_DD_n_m_1, "m_DD_n_m_1." + num);
-		save(m_terms[k]->m_h_n_m_1, "m_h_n_m_1." + num);
+		netlist().save(*this, m_terms[k]->m_last_V, "lastV." + num);
+		netlist().save(*this, m_terms[k]->m_DD_n_m_1, "m_DD_n_m_1." + num);
+		netlist().save(*this, m_terms[k]->m_h_n_m_1, "m_h_n_m_1." + num);
 
-		save(m_terms[k]->go(),"GO" + num, m_terms[k]->count());
-		save(m_terms[k]->gt(),"GT" + num, m_terms[k]->count());
-		save(m_terms[k]->Idr(),"IDR" + num , m_terms[k]->count());
+		netlist().save(*this, m_terms[k]->go(),"GO" + num, m_terms[k]->count());
+		netlist().save(*this, m_terms[k]->gt(),"GT" + num, m_terms[k]->count());
+		netlist().save(*this, m_terms[k]->Idr(),"IDR" + num , m_terms[k]->count());
 	}
 
 	for (unsigned k=0; k<iN; k++)
@@ -552,11 +551,11 @@ void matrix_solver_t::log_stats()
 		log().verbose("       has {1} elements", this->has_timestep_devices() ? "timestep" : "no timestep");
 		log().verbose("       {1:6.3} average newton raphson loops", (double) this->m_stat_newton_raphson / (double) this->m_stat_vsolver_calls);
 		log().verbose("       {1:10} invocations ({2:6} Hz)  {3:10} gs fails ({4:6.2} %) {5:6.3} average",
-				this->m_stat_calculations,
-				this->m_stat_calculations * 10 / (int) (this->netlist().time().as_double() * 10.0),
-				this->m_iterative_fail,
-				100.0 * (double) this->m_iterative_fail / (double) this->m_stat_calculations,
-				(double) this->m_iterative_total / (double) this->m_stat_calculations);
+				this->m_stat_calculations(),
+				this->m_stat_calculations() * 10 / (int) (this->netlist().time().as_double() * 10.0),
+				this->m_iterative_fail(),
+				100.0 * (double) this->m_iterative_fail() / (double) this->m_stat_calculations(),
+				(double) this->m_iterative_total() / (double) this->m_stat_calculations());
 	}
 }
 
@@ -698,7 +697,7 @@ std::unique_ptr<matrix_solver_t> NETLIB_NAME(solver)::create_solver(int size, co
 
 void NETLIB_NAME(solver)::post_start()
 {
-	plib::pvector_t<analog_net_t::list_t> groups;
+	std::vector<analog_net_t::list_t> groups;
 	const bool use_specific = true;
 
 	m_params.m_pivot = m_pivot.Value();
diff --git a/src/lib/netlist/tools/nl_convert.cpp b/src/lib/netlist/tools/nl_convert.cpp
index 145de96aa38..545377cc494 100644
--- a/src/lib/netlist/tools/nl_convert.cpp
+++ b/src/lib/netlist/tools/nl_convert.cpp
@@ -11,26 +11,6 @@
 #include "nl_convert.h"
 
 
-template<typename Class>
-static plib::pvector_t<int> bubble(const plib::pvector_t<Class> &sl)
-{
-	plib::pvector_t<int> ret;
-	for (unsigned i=0; i<sl.size(); i++)
-		ret.push_back(i);
-
-	for(unsigned i=0; i < sl.size(); i++)
-	{
-		for(unsigned j=i+1; j < sl.size(); j++)
-		{
-			if(sl[ret[i]]->name() > sl[ret[j]]->name())
-			{
-				std::swap(ret[i], ret[j]);
-			}
-		}
-	}
-	return ret;
-}
-
 /*-------------------------------------------------
     convert - convert a spice netlist
 -------------------------------------------------*/
@@ -38,7 +18,7 @@ static plib::pvector_t<int> bubble(const plib::pvector_t<Class> &sl)
 void nl_convert_base_t::add_pin_alias(const pstring &devname, const pstring &name, const pstring &alias)
 {
 	pstring pname = devname + "." + name;
-	m_pins.add(pname, plib::make_unique<pin_alias_t>(pname, devname + "." + alias));
+	m_pins.insert({pname, plib::make_unique<pin_alias_t>(pname, devname + "." + alias)});
 }
 
 void nl_convert_base_t::add_ext_alias(const pstring &alias)
@@ -73,13 +53,14 @@ void nl_convert_base_t::add_device(const pstring &atype, const pstring &aname)
 void nl_convert_base_t::add_term(pstring netname, pstring termname)
 {
 	net_t * net = nullptr;
-	if (m_nets.contains(netname))
+	auto idx = m_nets.find(netname);
+	if (idx != m_nets.end())
 		net = m_nets[netname].get();
 	else
 	{
 		auto nets = std::make_shared<net_t>(netname);
 		net = nets.get();
-		m_nets.add(netname, nets);
+		m_nets.insert({netname, nets});
 	}
 
 	/* if there is a pin alias, translate ... */
@@ -102,7 +83,12 @@ void nl_convert_base_t::dump_nl()
 		if (net->terminals().size() == 1)
 			net->set_no_export();
 	}
-	plib::pvector_t<int> sorted = bubble(m_devs);
+
+	std::vector<int> sorted;
+	for (unsigned i=0; i < m_devs.size(); i++)
+		sorted.push_back(i);
+	std::sort(sorted.begin(), sorted.end(), plib::indexed_compare<std::vector<std::shared_ptr<dev_t>>>(m_devs));
+
 	for (std::size_t i=0; i<m_devs.size(); i++)
 	{
 		std::size_t j = sorted[i];
@@ -118,9 +104,9 @@ void nl_convert_base_t::dump_nl()
 					m_devs[j]->name().cstr());
 	}
 	// print nets
-	for (std::size_t i=0; i<m_nets.size(); i++)
+	for (auto & i : m_nets)
 	{
-		net_t * net = m_nets.value_at(i).get();
+		net_t * net = i.second.get();
 		if (!net->is_no_export())
 		{
 			//printf("Net {}\n", net->name().cstr());
diff --git a/src/lib/netlist/tools/nl_convert.h b/src/lib/netlist/tools/nl_convert.h
index 40d339e0934..a2e0dc99ecb 100644
--- a/src/lib/netlist/tools/nl_convert.h
+++ b/src/lib/netlist/tools/nl_convert.h
@@ -130,10 +130,10 @@ private:
 
 	plib::postringstream m_buf;
 
-	plib::pvector_t<std::shared_ptr<dev_t>> m_devs;
-	plib::hashmap_t<pstring, std::shared_ptr<net_t> > m_nets;
-	plib::pvector_t<pstring> m_ext_alias;
-	plib::hashmap_t<pstring, std::shared_ptr<pin_alias_t>> m_pins;
+	std::vector<std::shared_ptr<dev_t>> m_devs;
+	std::unordered_map<pstring, std::shared_ptr<net_t> > m_nets;
+	std::vector<pstring> m_ext_alias;
+	std::unordered_map<pstring, std::shared_ptr<pin_alias_t>> m_pins;
 
 	static unit_t m_units[];
 
diff --git a/src/mame/drivers/deco_ld.cpp b/src/mame/drivers/deco_ld.cpp
index 5c2c1a5a282..fe7706ec6af 100644
--- a/src/mame/drivers/deco_ld.cpp
+++ b/src/mame/drivers/deco_ld.cpp
@@ -111,8 +111,9 @@ Sound processor - 6502
 #include "emu.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/ay8910.h"
-#include "machine/ldv1000.h"
+#include "machine/ldp1000.h"
 #include "machine/gen_latch.h"
+#include "machine/6850acia.h"
 
 
 class deco_ld_state : public driver_device
@@ -123,6 +124,7 @@ public:
 			m_maincpu(*this, "maincpu"),
 			m_audiocpu(*this, "audiocpu"),
 			m_laserdisc(*this, "laserdisc"),
+			//m_acia(*this, "acia"),
 			m_gfxdecode(*this, "gfxdecode"),
 			m_screen(*this, "screen"),
 			m_palette(*this, "palette"),
@@ -137,7 +139,8 @@ public:
 
 	required_device<cpu_device> m_maincpu;
 	optional_device<cpu_device> m_audiocpu;
-	required_device<pioneer_ldv1000_device> m_laserdisc;
+	required_device<sony_ldp1000_device> m_laserdisc;
+	//required_device<acia6850_device> m_acia;
 	required_device<gfxdecode_device> m_gfxdecode;
 	required_device<screen_device> m_screen;
 	required_device<palette_device> m_palette;
@@ -150,20 +153,17 @@ public:
 
 	UINT8 m_laserdisc_data;
 	int m_nmimask;
-	DECLARE_READ8_MEMBER(laserdisc_r);
-	DECLARE_WRITE8_MEMBER(laserdisc_w);
 	DECLARE_READ8_MEMBER(sound_status_r);
 	DECLARE_WRITE8_MEMBER(decold_sound_cmd_w);
-	DECLARE_WRITE8_MEMBER(decold_palette_w);
 	DECLARE_CUSTOM_INPUT_MEMBER(begas_vblank_r);
 	DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
 	virtual void machine_start() override;
-	UINT32 screen_update_rblaster(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+	UINT32 screen_update_rblaster(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	INTERRUPT_GEN_MEMBER(sound_interrupt);
-	void draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect, UINT8 *spriteram, UINT16 tile_bank );
+	void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 *spriteram, UINT16 tile_bank );
 };
 
-void deco_ld_state::draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect, UINT8 *spriteram, UINT16 tile_bank )
+void deco_ld_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 *spriteram, UINT16 tile_bank )
 {
 	gfx_element *gfx = m_gfxdecode->gfx(1);
 	int i,spr_offs,x,y,col,fx,fy;
@@ -208,7 +208,7 @@ void deco_ld_state::draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect
 	}
 }
 
-UINT32 deco_ld_state::screen_update_rblaster(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+UINT32 deco_ld_state::screen_update_rblaster(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	gfx_element *gfx = m_gfxdecode->gfx(0);
 	int y,x;
@@ -246,33 +246,12 @@ UINT32 deco_ld_state::screen_update_rblaster(screen_device &screen, bitmap_rgb32
 }
 
 
-
-READ8_MEMBER(deco_ld_state::laserdisc_r)
-{
-	UINT8 result = m_laserdisc->status_r();
-//  osd_printf_debug("laserdisc_r = %02X\n", result);
-	return result;
-}
-
-
-WRITE8_MEMBER(deco_ld_state::laserdisc_w)
-{
-	m_laserdisc_data = data;
-}
-
-
 WRITE8_MEMBER(deco_ld_state::decold_sound_cmd_w)
 {
 	m_soundlatch->write(space, 0, data);
 	m_audiocpu->set_input_line(0, HOLD_LINE);
 }
 
-/* same as Burger Time HW */
-WRITE8_MEMBER(deco_ld_state::decold_palette_w)
-{
-	m_palette->write(space, offset, UINT8(~data));
-}
-
 /* unknown, but certainly related to audiocpu somehow */
 READ8_MEMBER(deco_ld_state::sound_status_r)
 {
@@ -287,9 +266,10 @@ static ADDRESS_MAP_START( rblaster_map, AS_PROGRAM, 8, deco_ld_state )
 	AM_RANGE(0x1003, 0x1003) AM_READ_PORT("IN1")
 	AM_RANGE(0x1004, 0x1004) AM_DEVREAD("soundlatch2", generic_latch_8_device, read) AM_WRITE(decold_sound_cmd_w)
 	AM_RANGE(0x1005, 0x1005) AM_READ(sound_status_r)
-	AM_RANGE(0x1006, 0x1006) AM_NOP // 6850 status
-	AM_RANGE(0x1007, 0x1007) AM_READWRITE(laserdisc_r,laserdisc_w) // 6850 data
-	AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(decold_palette_w) AM_SHARE("palette")
+	//AM_RANGE(0x1006, 0x1006) AM_READ(acia_status_hack_r)
+	//AM_RANGE(0x1006, 0x1006) AM_DEVREADWRITE("acia", acia6850_device, status_r, control_w)
+	//AM_RANGE(0x1007, 0x1007) AM_DEVREADWRITE("acia", acia6850_device, data_r, data_w)
+	AM_RANGE(0x1800, 0x1fff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
 	AM_RANGE(0x2000, 0x27ff) AM_RAM
 	AM_RANGE(0x2800, 0x2bff) AM_RAM AM_SHARE("vram0")
 	AM_RANGE(0x2c00, 0x2fff) AM_RAM AM_SHARE("attr0")
@@ -480,17 +460,21 @@ static MACHINE_CONFIG_START( rblaster, deco_ld_state )
 
 //  MCFG_QUANTUM_TIME(attotime::from_hz(6000))
 
-	MCFG_LASERDISC_LDV1000_ADD("laserdisc") //Sony LDP-1000A, is it truly compatible with the Pioneer?
+	MCFG_LASERDISC_LDP1000_ADD("laserdisc") 
 	MCFG_LASERDISC_OVERLAY_DRIVER(256, 256, deco_ld_state, screen_update_rblaster)
-	MCFG_LASERDISC_OVERLAY_CLIP(0, 256-1, 8, 240-1)
+	//MCFG_LASERDISC_OVERLAY_CLIP(0, 256-1, 8, 240-1)
 	MCFG_LASERDISC_OVERLAY_PALETTE("palette")
 
 	/* video hardware */
 	MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", "laserdisc")
 	MCFG_GFXDECODE_ADD("gfxdecode", "palette", rblaster)
-	MCFG_PALETTE_ADD("palette", 512)
-	MCFG_PALETTE_FORMAT(BBGGGRRR)
+	MCFG_PALETTE_ADD("palette", 0x800)
+	MCFG_PALETTE_FORMAT(BBGGGRRR_inverted)
 
+	//MCFG_DEVICE_ADD("acia", ACIA6850, 0)
+	//MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("laserdisc", sony_ldp1000_device, write))
+	//MCFG_ACIA6850_RXD_HANDLER(DEVREADLINE("laserdisc", sony_ldp1000_device, read))
+	
 	/* sound hardware */
 	/* TODO: mixing */
 	MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -608,7 +592,7 @@ ROM_START( rblaster )
 	ROM_LOAD( "08.bin",   0xa000, 0x2000, CRC(4608b516) SHA1(44af4be84a0b807ea0813ce86376a4b6fd927e5a) )
 
 	DISK_REGION( "laserdisc" )
-	DISK_IMAGE_READONLY( "rblaster", 0, NO_DUMP )
+	DISK_IMAGE_READONLY( "rblaster", 0, SHA1(1563ea907d461592e17646848fdf2dce904bba32) )
 ROM_END
 
 ROM_START( cobra )
diff --git a/src/mame/drivers/system16.cpp b/src/mame/drivers/system16.cpp
index 264921fbf39..3291f592b37 100644
--- a/src/mame/drivers/system16.cpp
+++ b/src/mame/drivers/system16.cpp
@@ -53,7 +53,7 @@
     Passing Shot (2 sets)
     Wonderboy 3
 
-    System 18 (more commplex tilemaps)
+    System 18 (more complex tilemaps)
     ----------------------------------
 
     Alien Storm
@@ -100,12 +100,6 @@
 #define SHADOW_COLORS_MULTIPLIER 3
 
 
-INTERRUPT_GEN_MEMBER(segas1x_bootleg_state::sys16_interrupt)
-{
-	device.execute().set_input_line(4, HOLD_LINE); /* Interrupt vector 4, used by VBlank */
-}
-
-
 /***************************************************************************/
 
 WRITE16_MEMBER(segas1x_bootleg_state::sound_command_nmi_w)
@@ -551,7 +545,7 @@ WRITE16_MEMBER(segas1x_bootleg_state::s16bl_fgscrollx_bank_w)
 	scroll += 0x200;
 	set_tile_bank(bank);
 
-	scroll += 3; // so that the character portraits in attract mode are properly aligned (alighnment on character select no longer matches original tho?)
+	scroll += 3; // so that the character portraits in attract mode are properly aligned (alignment on character select no longer matches original tho?)
 	m_fg_scrollx = -scroll;
 }
 
@@ -1963,35 +1957,11 @@ GFXDECODE_END
 
 /*************************************
  *
- *  Machine driver
+ *  Sound fragments
  *
  *************************************/
 
-/* System 16A/B Bootlegs */
-static MACHINE_CONFIG_START( system16_base, segas1x_bootleg_state )
-
-	/* basic machine hardware */
-	MCFG_CPU_ADD("maincpu", M68000, 10000000)
-	MCFG_CPU_VBLANK_INT_DRIVER("screen", segas1x_bootleg_state,  sys16_interrupt)
-
-	/* video hardware */
-	MCFG_SCREEN_ADD("screen", RASTER)
-	MCFG_SCREEN_REFRESH_RATE(60)
-	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
-	MCFG_SCREEN_SIZE(40*8, 36*8)
-	MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
-	MCFG_SCREEN_UPDATE_DRIVER(segas1x_bootleg_state, screen_update_system16)
-	MCFG_SCREEN_PALETTE("palette")
-
-	MCFG_GFXDECODE_ADD("gfxdecode", "palette", sys16)
-	MCFG_PALETTE_ADD("palette", 2048*SHADOW_COLORS_MULTIPLIER)
-
-	MCFG_VIDEO_START_OVERRIDE(segas1x_bootleg_state,system16)
-
-	MCFG_GENERIC_LATCH_8_ADD("soundlatch")
-MACHINE_CONFIG_END
-
-static MACHINE_CONFIG_DERIVED( system16, system16_base )
+static MACHINE_CONFIG_FRAGMENT( z80_ym2151 )
 
 	MCFG_CPU_ADD("soundcpu", Z80, 4000000)
 	MCFG_CPU_PROGRAM_MAP(sound_map)
@@ -2011,23 +1981,26 @@ WRITE_LINE_MEMBER(segas1x_bootleg_state::sound_cause_nmi)
 	m_soundcpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
 }
 
-static MACHINE_CONFIG_DERIVED( system16_7759, system16 )
+static MACHINE_CONFIG_FRAGMENT( z80_ym2151_upd7759 )
 
-	/* basic machine hardware */
-
-	MCFG_CPU_MODIFY("soundcpu")
+	MCFG_CPU_ADD("soundcpu", Z80, 4000000)
 	MCFG_CPU_PROGRAM_MAP(sound_7759_map)
 	MCFG_CPU_IO_MAP(sound_7759_io_map)
 
 	/* sound hardware */
+	MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+	MCFG_YM2151_ADD("ymsnd", 4000000)
+	MCFG_SOUND_ROUTE(0, "lspeaker", 0.32)
+	MCFG_SOUND_ROUTE(1, "rspeaker", 0.32)
+
 	MCFG_SOUND_ADD("7759", UPD7759, UPD7759_STANDARD_CLOCK)
 	MCFG_UPD7759_DRQ_CALLBACK(WRITELINE(segas1x_bootleg_state,sound_cause_nmi))
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.48)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.48)
 MACHINE_CONFIG_END
 
-
-static MACHINE_CONFIG_FRAGMENT( system16_datsu_sound )
+static MACHINE_CONFIG_FRAGMENT( datsu_ym2151_msm5205 )
 	/* TODO:
 	- other games might use this sound configuration
 	- speaker is likely to be mono for the bootlegs, not stereo.
@@ -2039,8 +2012,6 @@ static MACHINE_CONFIG_FRAGMENT( system16_datsu_sound )
 
 	MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
 
-	MCFG_GENERIC_LATCH_8_ADD("soundlatch")
-
 	MCFG_YM2151_ADD("ymsnd", 4000000)
 	MCFG_SOUND_ROUTE(0, "lspeaker", 0.32)
 	MCFG_SOUND_ROUTE(1, "rspeaker", 0.32)
@@ -2052,19 +2023,7 @@ static MACHINE_CONFIG_FRAGMENT( system16_datsu_sound )
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
 MACHINE_CONFIG_END
 
-static MACHINE_CONFIG_DERIVED( shinobi_datsu, system16_base )
-
-	/* basic machine hardware */
-	MCFG_CPU_MODIFY("maincpu")
-	MCFG_CPU_PROGRAM_MAP(shinobib_map)
-
-	MCFG_BOOTLEG_SYS16A_SPRITES_ADD("sprites")
-	MCFG_BOOTLEG_SYS16A_SPRITES_XORIGIN(189-117)
-
-	MCFG_VIDEO_START_OVERRIDE(segas1x_bootleg_state, s16a_bootleg_shinobi )
-	MCFG_SCREEN_MODIFY("screen")
-	MCFG_SCREEN_UPDATE_DRIVER(segas1x_bootleg_state, screen_update_s16a_bootleg)
-
+static MACHINE_CONFIG_FRAGMENT( datsu_2x_ym2203 )
 	MCFG_CPU_ADD("soundcpu", Z80, 4000000)
 	MCFG_CPU_PERIODIC_INT_DRIVER(segas1x_bootleg_state, nmi_line_pulse,  3000) // or from the YM2203?
 	MCFG_CPU_PROGRAM_MAP(shinobi_datsu_sound_map)
@@ -2087,11 +2046,56 @@ static MACHINE_CONFIG_DERIVED( shinobi_datsu, system16_base )
 	MCFG_SOUND_ROUTE(1, "mono", 0.50)
 	MCFG_SOUND_ROUTE(2, "mono", 0.50)
 	MCFG_SOUND_ROUTE(3, "mono", 0.80)
+MACHINE_CONFIG_END
 
+/*************************************
+ *
+ *  Machine driver
+ *
+ *************************************/
+
+/* System 16A/B Bootlegs */
+static MACHINE_CONFIG_START( system16_base, segas1x_bootleg_state )
+
+	/* basic machine hardware */
+	MCFG_CPU_ADD("maincpu", M68000, 10000000)
+	MCFG_CPU_VBLANK_INT_DRIVER("screen", segas1x_bootleg_state,  irq4_line_hold)
+
+	/* video hardware */
+	MCFG_SCREEN_ADD("screen", RASTER)
+	MCFG_SCREEN_REFRESH_RATE(60)
+	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+	MCFG_SCREEN_SIZE(40*8, 36*8)
+	MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
+	MCFG_SCREEN_UPDATE_DRIVER(segas1x_bootleg_state, screen_update_system16)
+	MCFG_SCREEN_PALETTE("palette")
+
+	MCFG_GFXDECODE_ADD("gfxdecode", "palette", sys16)
+	MCFG_PALETTE_ADD("palette", 2048*SHADOW_COLORS_MULTIPLIER)
+
+	MCFG_VIDEO_START_OVERRIDE(segas1x_bootleg_state,system16)
+
+	MCFG_GENERIC_LATCH_8_ADD("soundlatch")
+MACHINE_CONFIG_END
+
+static MACHINE_CONFIG_DERIVED( shinobi_datsu, system16_base )
+
+	/* basic machine hardware */
+	MCFG_CPU_MODIFY("maincpu")
+	MCFG_CPU_PROGRAM_MAP(shinobib_map)
+
+	MCFG_BOOTLEG_SYS16A_SPRITES_ADD("sprites")
+	MCFG_BOOTLEG_SYS16A_SPRITES_XORIGIN(189-117)
+
+	MCFG_VIDEO_START_OVERRIDE(segas1x_bootleg_state, s16a_bootleg_shinobi )
+	MCFG_SCREEN_MODIFY("screen")
+	MCFG_SCREEN_UPDATE_DRIVER(segas1x_bootleg_state, screen_update_s16a_bootleg)
+	
+	MCFG_FRAGMENT_ADD(datsu_2x_ym2203)
 MACHINE_CONFIG_END
 
 
-static MACHINE_CONFIG_DERIVED( passshtb, system16_7759 )
+static MACHINE_CONFIG_DERIVED( passshtb, system16_base )
 
 	/* basic machine hardware */
 	MCFG_CPU_MODIFY("maincpu")
@@ -2104,10 +2108,12 @@ static MACHINE_CONFIG_DERIVED( passshtb, system16_7759 )
 	MCFG_VIDEO_START_OVERRIDE(segas1x_bootleg_state, s16a_bootleg_passsht )
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_UPDATE_DRIVER(segas1x_bootleg_state, screen_update_s16a_bootleg)
+
+	MCFG_FRAGMENT_ADD(z80_ym2151_upd7759)
 MACHINE_CONFIG_END
 
 
-static MACHINE_CONFIG_DERIVED( passsht4b, system16_7759 )
+static MACHINE_CONFIG_DERIVED( passsht4b, system16_base )
 
 	/* basic machine hardware */
 	MCFG_CPU_MODIFY("maincpu")
@@ -2121,9 +2127,11 @@ static MACHINE_CONFIG_DERIVED( passsht4b, system16_7759 )
 	MCFG_VIDEO_START_OVERRIDE(segas1x_bootleg_state, s16a_bootleg_passsht )
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_UPDATE_DRIVER(segas1x_bootleg_state, screen_update_s16a_bootleg_passht4b)
+	
+	MCFG_FRAGMENT_ADD(datsu_2x_ym2203)
 MACHINE_CONFIG_END
 
-static MACHINE_CONFIG_DERIVED( wb3bb, system16 )
+static MACHINE_CONFIG_DERIVED( wb3bb, system16_base )
 
 	/* basic machine hardware */
 	MCFG_CPU_MODIFY("maincpu")
@@ -2137,6 +2145,8 @@ static MACHINE_CONFIG_DERIVED( wb3bb, system16 )
 	MCFG_VIDEO_START_OVERRIDE(segas1x_bootleg_state, s16a_bootleg_wb3bl )
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_UPDATE_DRIVER(segas1x_bootleg_state, screen_update_s16a_bootleg)
+	
+	MCFG_FRAGMENT_ADD(z80_ym2151)
 MACHINE_CONFIG_END
 
 
@@ -2146,7 +2156,7 @@ static MACHINE_CONFIG_START( goldnaxeb1, segas1x_bootleg_state )
 	MCFG_CPU_ADD("maincpu", M68000, 10000000)
 	MCFG_CPU_PROGRAM_MAP(goldnaxeb1_map)
 	MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map)
-	MCFG_CPU_VBLANK_INT_DRIVER("screen", segas1x_bootleg_state,  sys16_interrupt)
+	MCFG_CPU_VBLANK_INT_DRIVER("screen", segas1x_bootleg_state,  irq4_line_hold)
 
 
 	/* video hardware */
@@ -2192,35 +2202,28 @@ static MACHINE_CONFIG_DERIVED( bayrouteb2, goldnaxeb1 )
 	MCFG_CPU_PROGRAM_MAP(bayrouteb2_map)
 	MCFG_DEVICE_REMOVE_ADDRESS_MAP(AS_DECRYPTED_OPCODES)
 
-	MCFG_FRAGMENT_ADD(system16_datsu_sound)
+	MCFG_GENERIC_LATCH_8_ADD("soundlatch")
+
+	MCFG_FRAGMENT_ADD(datsu_ym2151_msm5205)
 
 	MCFG_DEVICE_MODIFY("sprites")
 	MCFG_BOOTLEG_SYS16B_SPRITES_XORIGIN(189-107)
 
 MACHINE_CONFIG_END
 
-static MACHINE_CONFIG_DERIVED( tturfbl, system16_7759 )
+static MACHINE_CONFIG_DERIVED( tturfbl, system16_base )
 
 	/* basic machine hardware */
 	MCFG_CPU_MODIFY("maincpu")
 	MCFG_CPU_PROGRAM_MAP(tturfbl_map)
 
-	MCFG_CPU_MODIFY("soundcpu")
-	MCFG_CPU_PROGRAM_MAP(tturfbl_sound_map)
-	MCFG_CPU_IO_MAP(tturfbl_sound_io_map)
-
-	MCFG_DEVICE_REMOVE("7759")
-	MCFG_SOUND_ADD("5205", MSM5205, 220000)
-	MCFG_MSM5205_VCLK_CB(WRITELINE(segas1x_bootleg_state, tturfbl_msm5205_callback))
-	MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B)
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
+	MCFG_FRAGMENT_ADD(datsu_ym2151_msm5205)
 
 	MCFG_BOOTLEG_SYS16B_SPRITES_ADD("sprites")
 	MCFG_BOOTLEG_SYS16B_SPRITES_XORIGIN(189-107)
 MACHINE_CONFIG_END
 
-static MACHINE_CONFIG_DERIVED( dduxbl, system16 )
+static MACHINE_CONFIG_DERIVED( dduxbl, system16_base )
 
 	/* basic machine hardware */
 	MCFG_CPU_MODIFY("maincpu")
@@ -2228,9 +2231,11 @@ static MACHINE_CONFIG_DERIVED( dduxbl, system16 )
 
 	MCFG_BOOTLEG_SYS16B_SPRITES_ADD("sprites")
 	MCFG_BOOTLEG_SYS16B_SPRITES_XORIGIN(189-112)
+	
+	MCFG_FRAGMENT_ADD(z80_ym2151)
 MACHINE_CONFIG_END
 
-static MACHINE_CONFIG_DERIVED( eswatbl, system16_7759 )
+static MACHINE_CONFIG_DERIVED( eswatbl, system16_base )
 
 	/* basic machine hardware */
 	MCFG_CPU_MODIFY("maincpu")
@@ -2238,11 +2243,13 @@ static MACHINE_CONFIG_DERIVED( eswatbl, system16_7759 )
 
 	MCFG_BOOTLEG_SYS16B_SPRITES_ADD("sprites")
 	MCFG_BOOTLEG_SYS16B_SPRITES_XORIGIN(189-124)
+	
+	MCFG_FRAGMENT_ADD(z80_ym2151_upd7759)
 MACHINE_CONFIG_END
 
 
 
-static MACHINE_CONFIG_DERIVED( tetrisbl, system16 )
+static MACHINE_CONFIG_DERIVED( tetrisbl, system16_base )
 
 	/* basic machine hardware */
 	MCFG_CPU_MODIFY("maincpu")
@@ -2250,10 +2257,22 @@ static MACHINE_CONFIG_DERIVED( tetrisbl, system16 )
 
 	MCFG_BOOTLEG_SYS16B_SPRITES_ADD("sprites")
 	MCFG_BOOTLEG_SYS16B_SPRITES_XORIGIN(189-112)
+	
+	MCFG_FRAGMENT_ADD(z80_ym2151)
 MACHINE_CONFIG_END
 
+static MACHINE_CONFIG_DERIVED( altbeastbl, system16_base )
+	/* basic machine hardware */
+	MCFG_CPU_MODIFY("maincpu")
+	MCFG_CPU_PROGRAM_MAP(tetrisbl_map)
 
-static MACHINE_CONFIG_DERIVED( beautyb, system16 )
+	MCFG_BOOTLEG_SYS16B_SPRITES_ADD("sprites")
+	MCFG_BOOTLEG_SYS16B_SPRITES_XORIGIN(189-112)
+	
+	MCFG_FRAGMENT_ADD(datsu_2x_ym2203)
+MACHINE_CONFIG_END
+
+static MACHINE_CONFIG_DERIVED( beautyb, system16_base )
 
 	/* basic machine hardware */
 	MCFG_CPU_MODIFY("maincpu")
@@ -2261,6 +2280,8 @@ static MACHINE_CONFIG_DERIVED( beautyb, system16 )
 
 	MCFG_BOOTLEG_SYS16B_SPRITES_ADD("sprites")
 	MCFG_BOOTLEG_SYS16B_SPRITES_XORIGIN(189-112)
+	
+	MCFG_FRAGMENT_ADD(z80_ym2151)
 MACHINE_CONFIG_END
 
 
@@ -3254,7 +3275,7 @@ ROM_END
 
 Michael Jackson's Mooonwalker bootleg - Complete Dump
 
-This romset comes from a bootleg pcb.This is the complement of which lacks in the existing set (mwalkbl)
+This romset comes from a bootleg pcb. This is the complement of which lacks in the existing set (mwalkbl)
 Hardware info:
 Main cpu 68000P10
 Sound cpu Z80A
@@ -3265,7 +3286,7 @@ mwb5snd - sound program
 mwb10snd to mwb15snd - adpcm samples
 mwb16obj to mwb31obj - sprites/objects
 Rest of eproms (main program and tiles/bg) are identical of existing set and original set respectively.
-Note - sound section was been heavily modified: sound program to use only samples and some musics are cut (not present).Sprite eproms are splitted from original set.
+Note - sound section was been heavily modified: sound program to use only samples and some musics are cut (not present). Sprite eproms are split from original set.
 Eproms are 27512, 27010
 
 */
@@ -3779,7 +3800,7 @@ DRIVER_INIT_MEMBER(segas1x_bootleg_state,astormbl)
 GAME( 1987, shinobld,    shinobi,   shinobi_datsu,    shinobi, segas1x_bootleg_state,   shinobl,    ROT0,   "bootleg (Datsu)", "Shinobi (Datsu bootleg, set 1)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
 GAME( 1987, shinoblda,   shinobi,   shinobi_datsu,    shinobi, segas1x_bootleg_state,   shinobl,    ROT0,   "bootleg (Datsu)", "Shinobi (Datsu bootleg, set 2)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
 GAME( 1988, passshtb,    passsht,   passshtb,    passsht, segas1x_bootleg_state,   passsht,    ROT270, "bootleg", "Passing Shot (2 Players) (bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1988, passht4b,    passsht,   passsht4b,   passht4b, segas1x_bootleg_state,  shinobl,    ROT270, "bootleg", "Passing Shot (4 Players) (bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
+GAME( 1988, passht4b,    passsht,   passsht4b,   passht4b, segas1x_bootleg_state,  shinobl,    ROT270, "bootleg", "Passing Shot (4 Players) (bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
 GAME( 1988, wb3bbl,      wb3,       wb3bb,       wb3b, segas1x_bootleg_state,      wb3bbl,     ROT0,   "bootleg", "Wonder Boy III - Monster Lair (bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS)
 GAME( 1988, wb3bble,     wb3,       wb3bb,       wb3b, segas1x_bootleg_state,      wb3bbl,     ROT0,   "bootleg", "Wonder Boy III - Monster Lair (encrypted bootleg)", MACHINE_NOT_WORKING )
 
@@ -3790,8 +3811,8 @@ GAME( 1989, goldnaxeb1,  goldnaxe,  goldnaxeb1,  goldnaxe, segas1x_bootleg_state
 GAME( 1989, goldnaxeb2,  goldnaxe,  goldnaxeb2,  goldnaxe, segas1x_bootleg_state,  goldnaxeb2, ROT0,   "bootleg", "Golden Axe (bootleg)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 1989, tturfbl,     tturf,     tturfbl,     tturf, segas1x_bootleg_state,     tturfbl,    ROT0,   "bootleg (Datsu)", "Tough Turf (Datsu bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
 GAME( 1989, dduxbl,      ddux,      dduxbl,      ddux, segas1x_bootleg_state,      dduxbl,     ROT0,   "bootleg (Datsu)", "Dynamite Dux (Datsu bootleg)", MACHINE_NOT_WORKING )
-GAME( 1988, altbeastbl,  altbeast,  tetrisbl,    tetris, segas1x_bootleg_state,    altbeastbl, ROT0,   "bootleg (Datsu)", "Altered Beast (Datsu bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
-GAME( 1988, mutantwarr,  altbeast,  tetrisbl,    tetris, segas1x_bootleg_state,    altbeastbl, ROT0,   "bootleg (Datsu)", "Mutant Warrior (Altered Beast - Datsu bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
+GAME( 1988, altbeastbl,  altbeast,  altbeastbl,  tetris, segas1x_bootleg_state,    altbeastbl, ROT0,   "bootleg (Datsu)", "Altered Beast (Datsu bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1988, mutantwarr,  altbeast,  altbeastbl,    tetris, segas1x_bootleg_state,    altbeastbl, ROT0,   "bootleg (Datsu)", "Mutant Warrior (Altered Beast - Datsu bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
 GAME( 1989, eswatbl,     eswat,     eswatbl,     eswat, segas1x_bootleg_state,     eswatbl,    ROT0,   "bootleg", "E-Swat - Cyber Police (bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
 GAME( 1988, tetrisbl,    tetris,    tetrisbl,    tetris, segas1x_bootleg_state,    dduxbl,     ROT0,   "bootleg", "Tetris (bootleg)", 0 )
 
diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h
index cf4bde12f5f..db4ccb86b57 100644
--- a/src/mame/includes/system16.h
+++ b/src/mame/includes/system16.h
@@ -212,7 +212,6 @@ public:
 	UINT32 screen_update_system18old(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	UINT32 screen_update_s16a_bootleg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	UINT32 screen_update_s16a_bootleg_passht4b(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	INTERRUPT_GEN_MEMBER(sys16_interrupt);
 	void setup_system16_bootleg_spritebanking(  );
 	void update_page(  );
 	void set_tile_bank( int data );

From a45743bbc48dd13a58a3a89e0e7689ec2250912d Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Sun, 12 Jun 2016 15:32:21 +0200
Subject: [PATCH 14/39] Added parameter USE_DEACTIVATE to truthtable devices.
 Added more constexpr to netlist_time. Fixed some ifdef code paths. (nw)

---
 src/lib/netlist/devices/nld_7448.cpp     |  8 ----
 src/lib/netlist/devices/nld_7448.h       |  8 ++++
 src/lib/netlist/devices/nld_9312.cpp     | 57 ++++++++++--------------
 src/lib/netlist/devices/nld_truthtable.h | 21 +++++----
 src/lib/netlist/nl_base.cpp              |  1 +
 src/lib/netlist/nl_base.h                |  1 -
 src/lib/netlist/nl_config.h              |  5 ++-
 src/lib/netlist/nl_time.h                | 24 +++++-----
 src/mame/machine/nl_breakout.cpp         |  3 ++
 9 files changed, 60 insertions(+), 68 deletions(-)

diff --git a/src/lib/netlist/devices/nld_7448.cpp b/src/lib/netlist/devices/nld_7448.cpp
index 88ccaffe83d..44ee8a69ec8 100644
--- a/src/lib/netlist/devices/nld_7448.cpp
+++ b/src/lib/netlist/devices/nld_7448.cpp
@@ -13,14 +13,6 @@ namespace netlist
 	namespace devices
 	{
 
-
-	/*
-	 * FIXME: Using truthtable is a lot slower than the explicit device
-	 * 		  in breakout. Performance drops by 20%.
-	 */
-
-	#define USE_TRUTHTABLE_7448	(0)
-
 	#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 d9532b55cdb..5f3784d192d 100644
--- a/src/lib/netlist/devices/nld_7448.h
+++ b/src/lib/netlist/devices/nld_7448.h
@@ -26,6 +26,14 @@
 
 #include "nl_base.h"
 
+/*
+ * 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.
+ */
+
+#define USE_TRUTHTABLE_7448	(0)
+
 #define TTL_7448(name, cA0, cA1, cA2, cA3, cLTQ, cBIQ, cRBIQ)                   \
 		NET_REGISTER_DEV(TTL_7448, name)                                        \
 		NET_CONNECT(name, A, cA0)                                               \
diff --git a/src/lib/netlist/devices/nld_9312.cpp b/src/lib/netlist/devices/nld_9312.cpp
index 2fa5dcdf26f..0ff9714a103 100644
--- a/src/lib/netlist/devices/nld_9312.cpp
+++ b/src/lib/netlist/devices/nld_9312.cpp
@@ -35,20 +35,35 @@ namespace netlist
 	NETLIB_TRUTHTABLE(9312, 12, 2, 0);
 	#else
 
-	NETLIB_DEVICE(9312,
+	NETLIB_OBJECT(9312)
+	{
+		NETLIB_CONSTRUCTOR(9312)
+		, m_A(*this, "A")
+		, m_B(*this, "B")
+		, m_C(*this, "C")
+		, m_G(*this, "G")
+		, m_D(*this, {{"D0","D1","D2","D3","D4","D5","D6","D7"}})
+		, m_Y(*this, "Y")
+		, m_YQ(*this, "YQ")
+		, m_last_chan(*this, "m_last_chan", 0)
+		, m_last_G(*this, "m_last_G", 0)
+		{
+		}
+
+	NETLIB_UPDATEI();
+	NETLIB_RESETI();
 	public:
-	//      C, B, A, G,D0,D1,D2,D3,D4,D5,D6,D7| Y,YQ
 		logic_input_t m_A;
 		logic_input_t m_B;
 		logic_input_t m_C;
 		logic_input_t m_G;
-		logic_input_t m_D[8];
+		object_array_t<logic_input_t, 8> m_D;
 		logic_output_t m_Y;
 		logic_output_t m_YQ;
 
-		UINT8 m_last_chan;
-		UINT8 m_last_G;
-	);
+		state_var<UINT8> m_last_chan;
+		state_var<UINT8> m_last_G;
+	};
 
 	#endif
 
@@ -161,46 +176,20 @@ namespace netlist
 				m_B.activate();
 				m_C.activate();
 			}
-			const netlist_time delay[2] = { NLTIME_FROM_NS(33), NLTIME_FROM_NS(28) };
+			constexpr netlist_time delay[2] = { NLTIME_FROM_NS(33), NLTIME_FROM_NS(28) };
 			const UINT8 chan = INPLOGIC(m_A) | (INPLOGIC(m_B)<<1) | (INPLOGIC(m_C)<<2);
 			if (m_last_chan != chan)
 			{
 				m_D[m_last_chan].inactivate();
 				m_D[chan].activate();
 			}
-			const UINT8 val = INPLOGIC(m_D[chan]);
+			const auto val = INPLOGIC(m_D[chan]);
 			OUTLOGIC(m_Y, val, delay[val]);
 			OUTLOGIC(m_YQ, !val, delay[!val]);
 			m_last_chan = chan;
 		}
 	}
 
-	NETLIB_START(9312)
-	{
-		register_input("G",         m_G);
-		register_input("A",         m_A);
-		register_input("B",         m_B);
-		register_input("C",         m_C);
-
-		register_input("D0",        m_D[0]);
-		register_input("D1",        m_D[1]);
-		register_input("D2",        m_D[2]);
-		register_input("D3",        m_D[3]);
-		register_input("D4",        m_D[4]);
-		register_input("D5",        m_D[5]);
-		register_input("D6",        m_D[6]);
-		register_input("D7",        m_D[7]);
-
-		register_output("Y",        m_Y);
-		register_output("YQ",       m_YQ);
-
-		m_last_chan = 0;
-		m_last_G = 0;
-
-		save(NLNAME(m_last_chan));
-		save(NLNAME(m_last_G));
-	}
-
 	NETLIB_RESET(9312)
 	{
 	}
diff --git a/src/lib/netlist/devices/nld_truthtable.h b/src/lib/netlist/devices/nld_truthtable.h
index 2d439de4f6b..d7d431f20d7 100644
--- a/src/lib/netlist/devices/nld_truthtable.h
+++ b/src/lib/netlist/devices/nld_truthtable.h
@@ -183,6 +183,7 @@ namespace netlist
 		, m_last_state(*this, "m_last_state", 0)
 		, m_ign(*this, "m_ign", 0)
 		, m_active(*this, "m_active", 1)
+		, m_use_deactivate(*this, "USE_DEACTIVATE", true)
 		, m_ttp(ttp)
 		{
 			while (*desc != nullptr && **desc != 0 )
@@ -201,6 +202,7 @@ namespace netlist
 		, m_last_state(*this, "m_last_state", 0)
 		, m_ign(*this, "m_ign", 0)
 		, m_active(*this, "m_active", 1)
+		, m_use_deactivate(*this, "USE_DEACTIVATE", true)
 		, m_ttp(ttp)
 		{
 			m_desc = desc;
@@ -251,14 +253,13 @@ namespace netlist
 					&m_ttp->m_initialized, packed_int(m_ttp->m_outs), m_ttp->m_timing, m_ttp->m_timing_nt);
 
 			desc.setup(m_desc, disabled_ignore * 0);
-
 	#if 0
 			printf("%s\n", name().cstr());
 			for (int j=0; j < m_size; j++)
-				printf("%05x %04x %04x %04x\n", j, m_ttp.m_outs[j] & ((1 << m_NO)-1),
-						m_ttp.m_outs[j] >> m_NO, m_ttp.m_timing[j * m_NO + 0]);
-			for (int k=0; m_ttp.m_timing_nt[k] != netlist_time::zero(); k++)
-				printf("%d %f\n", k, m_ttp.m_timing_nt[k].as_double() * 1000000.0);
+				printf("%05x %04x %04x %04x\n", j, m_ttp->m_outs[j] & ((1 << m_NO)-1),
+						m_ttp->m_outs[j] >> m_NO, m_ttp->m_timing[j * m_NO + 0]);
+			for (int k=0; m_ttp->m_timing_nt[k] != netlist_time::zero(); k++)
+				printf("%d %f\n", k, m_ttp->m_timing_nt[k].as_double() * 1000000.0);
 	#endif
 		}
 
@@ -282,8 +283,7 @@ namespace netlist
 	public:
 		void inc_active() override
 		{
-			nl_assert(netlist().use_deactivate());
-			if (m_NI > 1 && m_has_state == 0)
+			if (m_NI > 1 && m_has_state == 0 && m_use_deactivate)
 				if (++m_active == 1)
 				{
 					process<false>();
@@ -292,14 +292,13 @@ namespace netlist
 
 		void dec_active() override
 		{
-			nl_assert(netlist().use_deactivate());
 			/* FIXME:
 			 * Based on current measurements there is no point to disable
 			 * 1 input devices. This should actually be a parameter so that we
 			 * can decide for each individual gate whether it is benefitial to
 			 * ignore deactivation.
 			 */
-			if (m_NI > 1 && m_has_state == 0)
+			if (m_NI > 1 && m_has_state == 0 && m_use_deactivate)
 				if (--m_active == 0)
 				{
 					for (std::size_t i = 0; i< m_NI; i++)
@@ -388,8 +387,8 @@ namespace netlist
 
 		state_var<UINT32> m_last_state;
 		state_var<UINT32> m_ign;
-		state_var<INT32> m_active;
-
+		state_var<INT32>  m_active;
+		param_logic_t     m_use_deactivate;
 		truthtable_t *m_ttp;
 		plib::pstring_vector_t m_desc;
 	};
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index 02dcbf1ee6d..558f9e8a591 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -951,6 +951,7 @@ nl_double param_model_t::model_value(const pstring &entity)
 	return netlist().setup().model_value(m_map, entity);
 }
 
+
 } // namespace
 
 namespace netlist
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 607e9f313fd..9de75d1f67d 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -1349,7 +1349,6 @@ protected:
 		out.set_Q(val, delay);
 	}
 
-
 }
 
 
diff --git a/src/lib/netlist/nl_config.h b/src/lib/netlist/nl_config.h
index 68a60ece8e4..04e1f0e14c2 100644
--- a/src/lib/netlist/nl_config.h
+++ b/src/lib/netlist/nl_config.h
@@ -126,7 +126,7 @@
 //============================================================
 
 // this macro passes an item followed by a string version of itself as two consecutive parameters
-#define NLNAME(x) x, #x
+//#define NLNAME(x) x, #x
 
 #define NOEXCEPT noexcept
 
@@ -145,8 +145,9 @@
 //#define nl_double float
 //#define NL_FCONST(x) (x ## f)
 
-#define nl_double double
+//#define nl_double double
 #define NL_FCONST(x) x
+using nl_double = double;
 
 
 //============================================================
diff --git a/src/lib/netlist/nl_time.h b/src/lib/netlist/nl_time.h
index 9330526018f..42c0092b3fc 100644
--- a/src/lib/netlist/nl_time.h
+++ b/src/lib/netlist/nl_time.h
@@ -37,8 +37,8 @@ namespace netlist
 		static constexpr INTERNALTYPE RESOLUTION = NETLIST_INTERNAL_RES;
 
 		constexpr netlist_time() NOEXCEPT : m_time(0) {}
-		netlist_time(const netlist_time &rhs) NOEXCEPT = default;
-		netlist_time(netlist_time &&rhs) NOEXCEPT = default;
+		constexpr netlist_time(const netlist_time &rhs) NOEXCEPT = default;
+		constexpr netlist_time(netlist_time &&rhs) NOEXCEPT = default;
 
 		constexpr explicit netlist_time(const double t)
 		: m_time((INTERNALTYPE) ( t * (double) RESOLUTION)) { }
@@ -103,21 +103,21 @@ namespace netlist
 			return lhs.m_time != rhs.m_time;
 		}
 
-		INTERNALTYPE as_raw() const { return m_time; }
-		double as_double() const { return (double) m_time / (double) RESOLUTION; }
+		constexpr INTERNALTYPE as_raw() const { return m_time; }
+		constexpr double as_double() const { return (double) m_time / (double) RESOLUTION; }
 
 		// for save states ....
 		INTERNALTYPE *get_internaltype_ptr() { return &m_time; }
 
-		static inline netlist_time from_nsec(const INTERNALTYPE ns) { return netlist_time(ns, U64(1000000000)); }
-		static inline netlist_time from_usec(const INTERNALTYPE us) { return netlist_time(us, U64(1000000)); }
-		static inline netlist_time from_msec(const INTERNALTYPE ms) { return netlist_time(ms, U64(1000)); }
-		static inline netlist_time from_hz(const INTERNALTYPE hz) { return netlist_time(1 , hz); }
-		static inline netlist_time from_raw(const INTERNALTYPE raw) { return netlist_time(raw, RESOLUTION); }
+		static inline constexpr netlist_time from_nsec(const INTERNALTYPE ns) { return netlist_time(ns, U64(1000000000)); }
+		static inline constexpr netlist_time from_usec(const INTERNALTYPE us) { return netlist_time(us, U64(1000000)); }
+		static inline constexpr netlist_time from_msec(const INTERNALTYPE ms) { return netlist_time(ms, U64(1000)); }
+		static inline constexpr netlist_time from_hz(const INTERNALTYPE hz) { return netlist_time(1 , hz); }
+		static inline constexpr netlist_time from_raw(const INTERNALTYPE raw) { return netlist_time(raw, RESOLUTION); }
 
-		static inline netlist_time zero() { return netlist_time(0, RESOLUTION); }
-		static inline netlist_time quantum() { return netlist_time(1, RESOLUTION); }
-		static inline netlist_time never() { return netlist_time(std::numeric_limits<netlist_time::INTERNALTYPE>::max(), RESOLUTION); }
+		static inline constexpr netlist_time zero() { return netlist_time(0, RESOLUTION); }
+		static inline constexpr netlist_time quantum() { return netlist_time(1, RESOLUTION); }
+		static inline constexpr netlist_time never() { return netlist_time(std::numeric_limits<netlist_time::INTERNALTYPE>::max(), RESOLUTION); }
 	private:
 		INTERNALTYPE m_time;
 	};
diff --git a/src/mame/machine/nl_breakout.cpp b/src/mame/machine/nl_breakout.cpp
index fb0f49587d6..1cfd879c91a 100644
--- a/src/mame/machine/nl_breakout.cpp
+++ b/src/mame/machine/nl_breakout.cpp
@@ -283,6 +283,9 @@ CIRCUIT_LAYOUT( breakout )
 	CHIP("J3", 7402)
 	CHIP("J4", 9312)
 	CHIP("J5", 7448)
+#if	USE_TRUTHTABLE_7448
+	PARAM(J5.USE_DEACTIVATE, 0) // only use this if compiled with 7448 as a truthtable
+#endif
 	CHIP("J6", 9310)
 	CHIP("J7", 7420)
 	CHIP("J8", 74279)

From 7a023dd4e67bb41dfaa880edd139b7b0ed4ac60c Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Sun, 12 Jun 2016 16:15:21 +0200
Subject: [PATCH 15/39] Formally differentiate between logic inputs (e.g.
 switches) and int inputs (e.g. resistor ladders or selection switches). (nw)

---
 src/devices/machine/netlist.cpp         | 45 ++++++++++++++---
 src/devices/machine/netlist.h           | 65 ++++++++++++++++++++++---
 src/lib/netlist/analog/nld_switches.cpp |  4 +-
 src/lib/netlist/analog/nld_switches.h   |  4 +-
 src/mame/audio/irem.cpp                 | 10 ++--
 src/mame/drivers/pong.cpp               | 48 ++++++++----------
 6 files changed, 128 insertions(+), 48 deletions(-)

diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp
index b193492c5f6..9ebf362c950 100644
--- a/src/devices/machine/netlist.cpp
+++ b/src/devices/machine/netlist.cpp
@@ -27,6 +27,7 @@ const device_type NETLIST_SOUND = &device_creator<netlist_mame_sound_device_t>;
 /* subdevices */
 
 const device_type NETLIST_ANALOG_INPUT = &device_creator<netlist_mame_analog_input_t>;
+const device_type NETLIST_INT_INPUT = &device_creator<netlist_mame_int_input_t>;
 const device_type NETLIST_LOGIC_INPUT = &device_creator<netlist_mame_logic_input_t>;
 const device_type NETLIST_STREAM_INPUT = &device_creator<netlist_mame_stream_input_t>;
 
@@ -113,11 +114,11 @@ void netlist_mame_analog_output_t::device_start()
 
 
 // ----------------------------------------------------------------------------------------
-// netlist_mame_logic_input_t
+// netlist_mame_int_input_t
 // ----------------------------------------------------------------------------------------
 
-netlist_mame_logic_input_t::netlist_mame_logic_input_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-		: device_t(mconfig, NETLIST_ANALOG_INPUT, "Netlist Logic Input", tag, owner, clock, "netlist_logic_input", __FILE__),
+netlist_mame_int_input_t::netlist_mame_int_input_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+		: device_t(mconfig, NETLIST_INT_INPUT, "Netlist Logic Input", tag, owner, clock, "netlist_logic_input", __FILE__),
 			netlist_mame_sub_interface(*owner),
 			m_param(nullptr),
 			m_mask(0xffffffff),
@@ -126,16 +127,16 @@ netlist_mame_logic_input_t::netlist_mame_logic_input_t(const machine_config &mco
 {
 }
 
-void netlist_mame_logic_input_t::static_set_params(device_t &device, const char *param_name, const UINT32 mask, const UINT32 shift)
+void netlist_mame_int_input_t::static_set_params(device_t &device, const char *param_name, const UINT32 mask, const UINT32 shift)
 {
-	netlist_mame_logic_input_t &netlist = downcast<netlist_mame_logic_input_t &>(device);
+	netlist_mame_int_input_t &netlist = downcast<netlist_mame_int_input_t &>(device);
 	LOG_DEV_CALLS(("static_set_params %s\n", device.tag()));
 	netlist.m_param_name = param_name;
 	netlist.m_shift = shift;
 	netlist.m_mask = mask;
 }
 
-void netlist_mame_logic_input_t::device_start()
+void netlist_mame_int_input_t::device_start()
 {
 	LOG_DEV_CALLS(("start %s\n", tag()));
 	netlist::param_t *p = downcast<netlist_mame_device_t *>(this->owner())->setup().find_param(m_param_name);
@@ -146,6 +147,38 @@ void netlist_mame_logic_input_t::device_start()
 	}
 }
 
+// ----------------------------------------------------------------------------------------
+// netlist_mame_logic_input_t
+// ----------------------------------------------------------------------------------------
+
+netlist_mame_logic_input_t::netlist_mame_logic_input_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+		: device_t(mconfig, NETLIST_LOGIC_INPUT, "Netlist Logic Input", tag, owner, clock, "netlist_logic_input", __FILE__),
+			netlist_mame_sub_interface(*owner),
+			m_param(nullptr),
+			m_shift(0),
+			m_param_name("")
+{
+}
+
+void netlist_mame_logic_input_t::static_set_params(device_t &device, const char *param_name, const UINT32 shift)
+{
+	netlist_mame_logic_input_t &netlist = downcast<netlist_mame_logic_input_t &>(device);
+	LOG_DEV_CALLS(("static_set_params %s\n", device.tag()));
+	netlist.m_param_name = param_name;
+	netlist.m_shift = shift;
+}
+
+void netlist_mame_logic_input_t::device_start()
+{
+	LOG_DEV_CALLS(("start %s\n", tag()));
+	netlist::param_t *p = downcast<netlist_mame_device_t *>(this->owner())->setup().find_param(m_param_name);
+	m_param = dynamic_cast<netlist::param_logic_t *>(p);
+	if (m_param == nullptr)
+	{
+		fatalerror("device %s wrong parameter type for %s\n", basetag(), m_param_name.cstr());
+	}
+}
+
 // ----------------------------------------------------------------------------------------
 // netlist_mame_stream_input_t
 // ----------------------------------------------------------------------------------------
diff --git a/src/devices/machine/netlist.h b/src/devices/machine/netlist.h
index 81e8f036d93..98b9c03244d 100644
--- a/src/devices/machine/netlist.h
+++ b/src/devices/machine/netlist.h
@@ -36,9 +36,13 @@
 				netlist_analog_output_delegate(& _class :: _member,                 \
 						# _class "::" # _member, _class_tag, (_class *)nullptr)   );
 
-#define MCFG_NETLIST_LOGIC_INPUT(_basetag, _tag, _name, _shift, _mask)              \
+#define MCFG_NETLIST_LOGIC_INPUT(_basetag, _tag, _name, _shift)              \
 	MCFG_DEVICE_ADD(_basetag ":" _tag, NETLIST_LOGIC_INPUT, 0)                      \
-	netlist_mame_logic_input_t::static_set_params(*device, _name, _mask, _shift);
+	netlist_mame_logic_input_t::static_set_params(*device, _name, _shift);
+
+#define MCFG_NETLIST_INT_INPUT(_basetag, _tag, _name, _shift, _mask)                \
+	MCFG_DEVICE_ADD(_basetag ":" _tag, NETLIST_INT_INPUT, 0)                      \
+	netlist_mame_int_input_t::static_set_params(*device, _name, _mask, _shift);
 
 #define MCFG_NETLIST_STREAM_INPUT(_basetag, _chan, _name)                           \
 	MCFG_DEVICE_ADD(_basetag ":cin" # _chan, NETLIST_STREAM_INPUT, 0)               \
@@ -52,6 +56,9 @@
 #define NETLIST_LOGIC_PORT_CHANGED(_base, _tag)                                     \
 	PORT_CHANGED_MEMBER(_base ":" _tag, netlist_mame_logic_input_t, input_changed, 0)
 
+#define NETLIST_INT_PORT_CHANGED(_base, _tag)                                     \
+	PORT_CHANGED_MEMBER(_base ":" _tag, netlist_mame_logic_input_t, input_changed, 0)
+
 #define NETLIST_ANALOG_PORT_CHANGED(_base, _tag)                                    \
 	PORT_CHANGED_MEMBER(_base ":" _tag, netlist_mame_analog_input_t, input_changed, 0)
 
@@ -404,17 +411,17 @@ private:
 
 
 // ----------------------------------------------------------------------------------------
-// netlist_mame_logic_input_t
+// netlist_mame_int_input_t
 // ----------------------------------------------------------------------------------------
 
-class netlist_mame_logic_input_t :  public device_t,
+class netlist_mame_int_input_t :  public device_t,
 									public netlist_mame_sub_interface
 {
 public:
 
 	// construction/destruction
-	netlist_mame_logic_input_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	virtual ~netlist_mame_logic_input_t() { }
+	netlist_mame_int_input_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	virtual ~netlist_mame_int_input_t() { }
 
 	static void static_set_params(device_t &device, const char *param_name, const UINT32 mask, const UINT32 shift);
 
@@ -449,6 +456,51 @@ private:
 	pstring m_param_name;
 };
 
+// ----------------------------------------------------------------------------------------
+// netlist_mame_logic_input_t
+// ----------------------------------------------------------------------------------------
+
+class netlist_mame_logic_input_t :  public device_t,
+									public netlist_mame_sub_interface
+{
+public:
+
+	// construction/destruction
+	netlist_mame_logic_input_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	virtual ~netlist_mame_logic_input_t() { }
+
+	static void static_set_params(device_t &device, const char *param_name, const UINT32 shift);
+
+	inline void write(const UINT32 val)
+	{
+		const UINT32 v = (val >> m_shift) & 1;
+		if (v != m_param->Value())
+			synchronize(0, v);
+	}
+
+	inline DECLARE_INPUT_CHANGED_MEMBER(input_changed) { write(newval); }
+	DECLARE_WRITE_LINE_MEMBER(write_line)       { write(state);  }
+	DECLARE_WRITE8_MEMBER(write8)               { write(data);   }
+	DECLARE_WRITE16_MEMBER(write16)             { write(data);   }
+	DECLARE_WRITE32_MEMBER(write32)             { write(data);   }
+	DECLARE_WRITE64_MEMBER(write64)             { write(data);   }
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override
+	{
+		if (is_sound_device())
+			update_to_current_time();
+		m_param->setTo(param);
+	}
+
+private:
+	netlist::param_logic_t *m_param;
+	UINT32 m_shift;
+	pstring m_param_name;
+};
+
 // ----------------------------------------------------------------------------------------
 // netlist_mame_stream_input_t
 // ----------------------------------------------------------------------------------------
@@ -709,6 +761,7 @@ extern const device_type NETLIST_CPU;
 extern const device_type NETLIST_SOUND;
 extern const device_type NETLIST_ANALOG_INPUT;
 extern const device_type NETLIST_LOGIC_INPUT;
+extern const device_type NETLIST_INT_INPUT;
 
 extern const device_type NETLIST_ANALOG_OUTPUT;
 extern const device_type NETLIST_STREAM_INPUT;
diff --git a/src/lib/netlist/analog/nld_switches.cpp b/src/lib/netlist/analog/nld_switches.cpp
index 6c887aad569..46762e72eb1 100644
--- a/src/lib/netlist/analog/nld_switches.cpp
+++ b/src/lib/netlist/analog/nld_switches.cpp
@@ -27,7 +27,7 @@ NETLIB_RESET(switch1)
 
 NETLIB_UPDATE(switch1)
 {
-	if (m_POS.Value() == 0)
+	if (!m_POS.Value())
 	{
 		m_R.set_R(R_OFF);
 	}
@@ -57,7 +57,7 @@ NETLIB_RESET(switch2)
 
 NETLIB_UPDATE(switch2)
 {
-	if (m_POS.Value() == 0)
+	if (!m_POS.Value())
 	{
 		m_R1.set_R(R_ON);
 		m_R2.set_R(R_OFF);
diff --git a/src/lib/netlist/analog/nld_switches.h b/src/lib/netlist/analog/nld_switches.h
index 5355b5e13bf..69954cb4a2a 100644
--- a/src/lib/netlist/analog/nld_switches.h
+++ b/src/lib/netlist/analog/nld_switches.h
@@ -47,7 +47,7 @@ NETLIB_OBJECT(switch1)
 	NETLIB_UPDATE_PARAMI();
 
 	NETLIB_SUB(R_base) m_R;
-	param_int_t m_POS;
+	param_logic_t m_POS;
 };
 
 NETLIB_OBJECT(switch2)
@@ -71,7 +71,7 @@ NETLIB_OBJECT(switch2)
 
 	NETLIB_SUB(R_base) m_R1;
 	NETLIB_SUB(R_base) m_R2;
-	param_int_t m_POS;
+	param_logic_t m_POS;
 };
 
 	} //namespace devices
diff --git a/src/mame/audio/irem.cpp b/src/mame/audio/irem.cpp
index 57c28493622..d06d9d35ad5 100644
--- a/src/mame/audio/irem.cpp
+++ b/src/mame/audio/irem.cpp
@@ -455,11 +455,11 @@ static MACHINE_CONFIG_FRAGMENT( irem_audio_base )
 	MCFG_NETLIST_SETUP(kidniki)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
-	MCFG_NETLIST_LOGIC_INPUT("snd_nl", "ibd", "I_BD0.IN", 0, 1)
-	MCFG_NETLIST_LOGIC_INPUT("snd_nl", "isd", "I_SD0.IN", 0, 1)
-	MCFG_NETLIST_LOGIC_INPUT("snd_nl", "ich", "I_CH0.IN", 0, 1)
-	MCFG_NETLIST_LOGIC_INPUT("snd_nl", "ioh", "I_OH0.IN", 0, 1)
-	MCFG_NETLIST_LOGIC_INPUT("snd_nl", "sinh", "SINH.IN", 0, 1)
+	MCFG_NETLIST_LOGIC_INPUT("snd_nl", "ibd", "I_BD0.IN", 0)
+	MCFG_NETLIST_LOGIC_INPUT("snd_nl", "isd", "I_SD0.IN", 0)
+	MCFG_NETLIST_LOGIC_INPUT("snd_nl", "ich", "I_CH0.IN", 0)
+	MCFG_NETLIST_LOGIC_INPUT("snd_nl", "ioh", "I_OH0.IN", 0)
+	MCFG_NETLIST_LOGIC_INPUT("snd_nl", "sinh", "SINH.IN", 0)
 
 	MCFG_NETLIST_STREAM_INPUT("snd_nl", 0, "R_AY45M_A.R")
 	MCFG_NETLIST_STREAM_INPUT("snd_nl", 1, "R_AY45M_B.R")
diff --git a/src/mame/drivers/pong.cpp b/src/mame/drivers/pong.cpp
index d454b462766..b960e6e55a1 100644
--- a/src/mame/drivers/pong.cpp
+++ b/src/mame/drivers/pong.cpp
@@ -372,10 +372,10 @@ static MACHINE_CONFIG_START( pong, pong_state )
 	MCFG_NETLIST_ANALOG_MULT_OFFSET(1.0 / 100.0 * RES_K(50), RES_K(56) )
 	MCFG_NETLIST_ANALOG_INPUT("maincpu", "pot0", "ic_b9_POT.DIAL")
 	MCFG_NETLIST_ANALOG_INPUT("maincpu", "pot1", "ic_a9_POT.DIAL")
-	MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw1a", "sw1a.POS", 0, 0x01)
-	MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw1b", "sw1b.POS", 0, 0x01)
-	MCFG_NETLIST_LOGIC_INPUT("maincpu", "coinsw", "coinsw.POS", 0, 0x01)
-	MCFG_NETLIST_LOGIC_INPUT("maincpu", "antenna", "antenna.IN", 0, 0x01)
+	MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw1a", "sw1a.POS", 0)
+	MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw1b", "sw1b.POS", 0)
+	MCFG_NETLIST_LOGIC_INPUT("maincpu", "coinsw", "coinsw.POS", 0)
+	MCFG_NETLIST_LOGIC_INPUT("maincpu", "antenna", "antenna.IN", 0)
 
 	MCFG_NETLIST_ANALOG_OUTPUT("maincpu", "snd0", "sound", pong_state, sound_cb, "")
 	MCFG_NETLIST_ANALOG_OUTPUT("maincpu", "vid0", "videomix", fixedfreq_device, update_vid, "fixfreq")
@@ -403,21 +403,21 @@ static MACHINE_CONFIG_START( breakout, breakout_state )
 
 	MCFG_NETLIST_ANALOG_INPUT("maincpu", "pot1", "POTP1.DIAL")
 	MCFG_NETLIST_ANALOG_INPUT("maincpu", "pot2", "POTP2.DIAL")
-	MCFG_NETLIST_LOGIC_INPUT("maincpu", "coinsw1", "COIN1.POS", 0, 0x01)
-	MCFG_NETLIST_LOGIC_INPUT("maincpu", "coinsw2", "COIN2.POS", 0, 0x01)
-	MCFG_NETLIST_LOGIC_INPUT("maincpu", "startsw1", "START1.POS", 0, 0x01)
-	MCFG_NETLIST_LOGIC_INPUT("maincpu", "startsw2", "START2.POS", 0, 0x01)
-	MCFG_NETLIST_LOGIC_INPUT("maincpu", "servesw", "SERVE.POS", 0, 0x01)
-	MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw4", "S4.POS", 0, 0x01)
-	MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw3", "S3.POS", 0, 0x01)
-	MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw2", "S2.POS", 0, 0x01)
+	MCFG_NETLIST_LOGIC_INPUT("maincpu", "coinsw1", "COIN1.POS", 0)
+	MCFG_NETLIST_LOGIC_INPUT("maincpu", "coinsw2", "COIN2.POS", 0)
+	MCFG_NETLIST_LOGIC_INPUT("maincpu", "startsw1", "START1.POS", 0)
+	MCFG_NETLIST_LOGIC_INPUT("maincpu", "startsw2", "START2.POS", 0)
+	MCFG_NETLIST_LOGIC_INPUT("maincpu", "servesw", "SERVE.POS", 0)
+	MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw4", "S4.POS", 0)
+	MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw3", "S3.POS", 0)
+	MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw2", "S2.POS", 0)
 
-	MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw1_1", "S1_1.POS", 0, 0x01)
-	MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw1_2", "S1_2.POS", 0, 0x01)
-	MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw1_3", "S1_3.POS", 0, 0x01)
-	MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw1_4", "S1_4.POS", 0, 0x01)
+	MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw1_1", "S1_1.POS", 0)
+	MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw1_2", "S1_2.POS", 0)
+	MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw1_3", "S1_3.POS", 0)
+	MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw1_4", "S1_4.POS", 0)
 
-	MCFG_NETLIST_LOGIC_INPUT("maincpu", "antenna", "antenna.IN", 0, 0x01)
+	MCFG_NETLIST_LOGIC_INPUT("maincpu", "antenna", "antenna.IN", 0)
 
 	MCFG_NETLIST_ANALOG_OUTPUT("maincpu", "snd0", "sound", breakout_state, sound_cb, "")
 	MCFG_NETLIST_ANALOG_OUTPUT("maincpu", "vid0", "videomix", fixedfreq_device, update_vid, "fixfreq")
@@ -462,20 +462,14 @@ static MACHINE_CONFIG_START( pongd, pong_state )
 	MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK)
 	MCFG_NETLIST_SETUP(pongdoubles)
 
-#if 0
-	MCFG_NETLIST_ANALOG_INPUT("maincpu", "vr0", "ic_b9_R.R")
-	MCFG_NETLIST_ANALOG_INPUT_MULT_OFFSET(1.0 / 100.0 * RES_K(50), RES_K(56) )
-	MCFG_NETLIST_ANALOG_INPUT("maincpu", "vr1", "ic_a9_R.R")
-	MCFG_NETLIST_ANALOG_INPUT_MULT_OFFSET(1.0 / 100.0 * RES_K(50), RES_K(56) )
-#endif
 	MCFG_NETLIST_ANALOG_INPUT("maincpu", "pot0", "A10_POT.DIAL")
 	MCFG_NETLIST_ANALOG_INPUT("maincpu", "pot1", "B10_POT.DIAL")
 	MCFG_NETLIST_ANALOG_INPUT("maincpu", "pot2", "B9B_POT.DIAL")
 	MCFG_NETLIST_ANALOG_INPUT("maincpu", "pot3", "B9A_POT.DIAL")
-	MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw1a", "DIPSW1.POS", 0, 0x01)
-	MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw1b", "DIPSW2.POS", 0, 0x01)
-	MCFG_NETLIST_LOGIC_INPUT("maincpu", "coinsw", "COIN_SW.POS", 0, 0x01)
-	MCFG_NETLIST_LOGIC_INPUT("maincpu", "startsw", "START_SW.POS", 0, 0x01)
+	MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw1a", "DIPSW1.POS", 0)
+	MCFG_NETLIST_LOGIC_INPUT("maincpu", "sw1b", "DIPSW2.POS", 0)
+	MCFG_NETLIST_LOGIC_INPUT("maincpu", "coinsw", "COIN_SW.POS", 0)
+	MCFG_NETLIST_LOGIC_INPUT("maincpu", "startsw", "START_SW.POS", 0)
 #if 0
 	MCFG_NETLIST_LOGIC_INPUT("maincpu", "antenna", "antenna.IN", 0, 0x01)
 #endif

From 4268d8af31810470c50bb8beffb4bfdc09e25e17 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Sun, 12 Jun 2016 16:19:32 +0200
Subject: [PATCH 16/39] Switch to using proper (i.e. bool type) param_logic_t.
 (nw)

---
 src/lib/netlist/nl_base.cpp | 2 +-
 src/lib/netlist/nl_base.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index 558f9e8a591..a55e6496494 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -407,7 +407,7 @@ param_template_t<C, T>::param_template_t(device_t &device, const pstring name, c
 
 template class param_template_t<double, param_t::DOUBLE>;
 template class param_template_t<int, param_t::INTEGER>;
-template class param_template_t<int, param_t::LOGIC>;
+template class param_template_t<bool, param_t::LOGIC>;
 template class param_template_t<pstring, param_t::STRING>;
 template class param_template_t<pstring, param_t::MODEL>;
 
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 9de75d1f67d..54cc6d686a7 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -794,7 +794,7 @@ namespace netlist
 	using param_int_t = param_template_t<int, param_t::INTEGER>;
 	using param_str_t = param_template_t<pstring, param_t::STRING>;
 
-	using param_logic_t = param_template_t<int, param_t::INTEGER>;
+	using param_logic_t = param_template_t<bool, param_t::LOGIC>;
 
 	class param_model_t : public param_str_t
 	{

From 866ddad28a2eeda65ea754589e4fe957c049a7e6 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Sun, 12 Jun 2016 19:52:18 +0200
Subject: [PATCH 17/39] Fix 128bit netlist time. Fixed a number of
 signed/unsigned comparisons. Refactored netlist_time into a template. Removed
 implicit double assignment to netlist. Doomed to produce bugs. Instead, use
 netlist_time::from_double. (nw)

---
 src/devices/machine/netlist.cpp         |  4 ++
 src/lib/netlist/devices/nld_74ls629.cpp |  2 +-
 src/lib/netlist/devices/nld_system.cpp  |  2 +-
 src/lib/netlist/devices/nlid_system.h   |  4 +-
 src/lib/netlist/nl_base.cpp             |  1 +
 src/lib/netlist/nl_base.h               |  4 +-
 src/lib/netlist/nl_time.h               | 87 +++++++++++++------------
 src/lib/netlist/plib/palloc.h           |  4 +-
 src/lib/netlist/plib/pconfig.h          |  4 +-
 src/lib/netlist/plib/pstate.h           |  5 +-
 src/lib/netlist/plib/ptypes.h           | 28 +++++++-
 src/lib/netlist/plib/putil.h            |  2 +-
 src/lib/netlist/prg/nltool.cpp          |  6 +-
 src/lib/netlist/solver/nld_solver.cpp   |  8 +--
 14 files changed, 98 insertions(+), 63 deletions(-)

diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp
index 9ebf362c950..9f448ade849 100644
--- a/src/devices/machine/netlist.cpp
+++ b/src/devices/machine/netlist.cpp
@@ -460,6 +460,10 @@ ATTR_COLD void netlist_mame_device_t::save_state()
 				save_pointer((INT16 *) s->m_ptr, s->m_name.cstr(), s->m_count);
 			else if (s->m_dt.size == sizeof(INT8))
 				save_pointer((INT8 *) s->m_ptr, s->m_name.cstr(), s->m_count);
+#if (PHAS_INT128)
+			else if (s->m_dt.size == sizeof(INT128))
+				save_pointer((INT64 *) s->m_ptr, s->m_name.cstr(), s->m_count * 2);
+#endif
 			else
 				netlist().log().fatal("Unknown integral type size {1} for {2}\n", s->m_dt.size, s->m_name.cstr());
 		}
diff --git a/src/lib/netlist/devices/nld_74ls629.cpp b/src/lib/netlist/devices/nld_74ls629.cpp
index bd8127f068c..74d2892031c 100644
--- a/src/lib/netlist/devices/nld_74ls629.cpp
+++ b/src/lib/netlist/devices/nld_74ls629.cpp
@@ -212,7 +212,7 @@ namespace netlist
 
 			// FIXME: we need a possibility to remove entries from queue ...
 			//        or an exact model ...
-			m_clock.m_inc = netlist_time(0.5 / (double) freq);
+			m_clock.m_inc = netlist_time::from_double(0.5 / (double) freq);
 			//m_clock.update();
 
 			//NL_VERBOSE_OUT(("{1} {2} {3} {4}\n", name(), v_freq, v_rng, freq));
diff --git a/src/lib/netlist/devices/nld_system.cpp b/src/lib/netlist/devices/nld_system.cpp
index dbbccb78a72..d3f554f4912 100644
--- a/src/lib/netlist/devices/nld_system.cpp
+++ b/src/lib/netlist/devices/nld_system.cpp
@@ -40,7 +40,7 @@ namespace netlist
 	NETLIB_RESET(extclock)
 	{
 		m_cnt = 0;
-		m_off = netlist_time(m_offset.Value());
+		m_off = netlist_time::from_double(m_offset.Value());
 		//m_Q.initial(0);
 	}
 
diff --git a/src/lib/netlist/devices/nlid_system.h b/src/lib/netlist/devices/nlid_system.h
index b7c2116cb54..6b681aa6abd 100644
--- a/src/lib/netlist/devices/nlid_system.h
+++ b/src/lib/netlist/devices/nlid_system.h
@@ -130,7 +130,7 @@ namespace netlist
 			{
 				netlist_time base = netlist_time::from_hz(m_freq.Value()*2);
 				plib::pstring_vector_t pat(m_pattern.Value(),",");
-				m_off = netlist_time(m_offset.Value());
+				m_off = netlist_time::from_double(m_offset.Value());
 
 				int pati[256];
 				m_size = pat.size();
@@ -313,7 +313,7 @@ namespace netlist
 		, m_Q(*this, "Q")
 		{
 
-			for (std::size_t i=0; i < m_N; i++)
+			for (int i=0; i < m_N; i++)
 				m_I.push_back(plib::make_unique<analog_input_t>(*this, plib::pfmt("A{1}")(i)));
 
 			plib::pstring_vector_t cmds(m_func.Value(), " ");
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index a55e6496494..9315c0a00a0 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -114,6 +114,7 @@ queue_t::queue_t(netlist_t &nl)
 
 void queue_t::register_state(plib::state_manager_t &manager, const pstring &module)
 {
+	printf("%e\n", netlist_time::never().as_double());
 	netlist().log().debug("register_state\n");
 	manager.save_item(this, m_qsize, module + "." + "qsize");
 	manager.save_item(this, &m_times[0], module + "." + "times", m_times.size());
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 54cc6d686a7..36626b33107 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -1001,7 +1001,7 @@ namespace netlist
 	private:
 		struct names_t { char m_buf[64]; };
 		int m_qsize;
-		std::vector<netlist_time::INTERNALTYPE> m_times;
+		std::vector<netlist_time::internal_type> m_times;
 		std::vector<names_t> m_names;
 	};
 
@@ -1161,7 +1161,7 @@ protected:
 		state_var(device_t &dev, const pstring name, const T & value)
 		{
 			dev.netlist().save(dev, m_value, name);
-			for (int i=0; i<N; i++)
+			for (std::size_t i=0; i<N; i++)
 				m_value[i] = value;
 		}
 
diff --git a/src/lib/netlist/nl_time.h b/src/lib/netlist/nl_time.h
index 42c0092b3fc..25c488ccf69 100644
--- a/src/lib/netlist/nl_time.h
+++ b/src/lib/netlist/nl_time.h
@@ -25,109 +25,112 @@
 
 namespace netlist
 {
-	struct netlist_time final
+	template <typename TYPE, TYPE RES>
+	struct ptime final
 	{
 	public:
 
-#if (PHAS_INT128)
-		using INTERNALTYPE = UINT128;
-#else
-		using INTERNALTYPE = UINT64;
-#endif
-		static constexpr INTERNALTYPE RESOLUTION = NETLIST_INTERNAL_RES;
+		using internal_type = TYPE;
+		static constexpr internal_type resolution = RES;
 
-		constexpr netlist_time() NOEXCEPT : m_time(0) {}
-		constexpr netlist_time(const netlist_time &rhs) NOEXCEPT = default;
-		constexpr netlist_time(netlist_time &&rhs) NOEXCEPT = default;
+		constexpr ptime() NOEXCEPT : m_time(0) {}
+		constexpr ptime(const ptime &rhs) NOEXCEPT = default;
+		constexpr ptime(ptime &&rhs) NOEXCEPT = default;
 
-		constexpr explicit netlist_time(const double t)
-		: m_time((INTERNALTYPE) ( t * (double) RESOLUTION)) { }
-		constexpr explicit netlist_time(const INTERNALTYPE nom, const INTERNALTYPE den)
-		: m_time(nom * (RESOLUTION / den)) { }
+		constexpr explicit ptime(const double t) = delete;
+		//: m_time((internal_type) ( t * (double) resolution)) { }
+		constexpr explicit ptime(const internal_type nom, const internal_type den)
+		: m_time(nom * (resolution / den)) { }
 
-		netlist_time &operator=(const netlist_time rhs) { m_time = rhs.m_time; return *this; }
+		ptime &operator=(const ptime rhs) { m_time = rhs.m_time; return *this; }
 
-		netlist_time &operator+=(const netlist_time &rhs) { m_time += rhs.m_time; return *this; }
-		netlist_time &operator-=(const netlist_time &rhs) { m_time -= rhs.m_time; return *this; }
+		ptime &operator+=(const ptime &rhs) { m_time += rhs.m_time; return *this; }
+		ptime &operator-=(const ptime &rhs) { m_time -= rhs.m_time; return *this; }
 
-		friend netlist_time operator-(netlist_time lhs, const netlist_time &rhs)
+		friend ptime operator-(ptime lhs, const ptime &rhs)
 		{
 			lhs -= rhs;
 			return lhs;
 		}
 
-		friend netlist_time operator+(netlist_time lhs, const netlist_time &rhs)
+		friend ptime operator+(ptime lhs, const ptime &rhs)
 		{
 			lhs += rhs;
 			return lhs;
 		}
 
-		friend netlist_time operator*(netlist_time lhs, const UINT64 factor)
+		friend ptime operator*(ptime lhs, const UINT64 factor)
 		{
-			lhs.m_time *= static_cast<INTERNALTYPE>(factor);
+			lhs.m_time *= static_cast<internal_type>(factor);
 			return lhs;
 		}
 
-		friend UINT64 operator/(const netlist_time &lhs, const netlist_time &rhs)
+		friend UINT64 operator/(const ptime &lhs, const ptime &rhs)
 		{
 			return static_cast<UINT64>(lhs.m_time / rhs.m_time);
 		}
 
-		friend bool operator<(const netlist_time &lhs, const netlist_time &rhs)
+		friend bool operator<(const ptime &lhs, const ptime &rhs)
 		{
 			return (lhs.m_time < rhs.m_time);
 		}
 
-		friend bool operator>(const netlist_time &lhs, const netlist_time &rhs)
+		friend bool operator>(const ptime &lhs, const ptime &rhs)
 		{
-			return rhs < lhs;
+			return (rhs < lhs);
 		}
 
-		friend bool operator<=(const netlist_time &lhs, const netlist_time &rhs)
+		friend bool operator<=(const ptime &lhs, const ptime &rhs)
 		{
 			return !(lhs > rhs);
 		}
 
-		friend bool operator>=(const netlist_time &lhs, const netlist_time &rhs)
+		friend bool operator>=(const ptime &lhs, const ptime &rhs)
 		{
 			return !(lhs < rhs);
 		}
 
-		friend bool operator==(const netlist_time &lhs, const netlist_time &rhs)
+		friend bool operator==(const ptime &lhs, const ptime &rhs)
 		{
 			return lhs.m_time == rhs.m_time;
 		}
 
-		friend bool operator!=(const netlist_time &lhs, const netlist_time &rhs)
+		friend bool operator!=(const ptime &lhs, const ptime &rhs)
 		{
 			return lhs.m_time != rhs.m_time;
 		}
 
-		constexpr INTERNALTYPE as_raw() const { return m_time; }
-		constexpr double as_double() const { return (double) m_time / (double) RESOLUTION; }
+		constexpr internal_type as_raw() const { return m_time; }
+		constexpr double as_double() const { return (double) m_time / (double) resolution; }
 
 		// for save states ....
-		INTERNALTYPE *get_internaltype_ptr() { return &m_time; }
+		internal_type *get_internaltype_ptr() { return &m_time; }
 
-		static inline constexpr netlist_time from_nsec(const INTERNALTYPE ns) { return netlist_time(ns, U64(1000000000)); }
-		static inline constexpr netlist_time from_usec(const INTERNALTYPE us) { return netlist_time(us, U64(1000000)); }
-		static inline constexpr netlist_time from_msec(const INTERNALTYPE ms) { return netlist_time(ms, U64(1000)); }
-		static inline constexpr netlist_time from_hz(const INTERNALTYPE hz) { return netlist_time(1 , hz); }
-		static inline constexpr netlist_time from_raw(const INTERNALTYPE raw) { return netlist_time(raw, RESOLUTION); }
+		static inline constexpr ptime from_nsec(const internal_type ns) { return ptime(ns, U64(1000000000)); }
+		static inline constexpr ptime from_usec(const internal_type us) { return ptime(us, U64(1000000)); }
+		static inline constexpr ptime from_msec(const internal_type ms) { return ptime(ms, U64(1000)); }
+		static inline constexpr ptime from_hz(const internal_type hz) { return ptime(1 , hz); }
+		static inline constexpr ptime from_raw(const internal_type raw) { return ptime(raw, resolution); }
+		static inline constexpr ptime from_double(const double t) { return ptime((internal_type) ( t * (double) resolution), resolution); }
 
-		static inline constexpr netlist_time zero() { return netlist_time(0, RESOLUTION); }
-		static inline constexpr netlist_time quantum() { return netlist_time(1, RESOLUTION); }
-		static inline constexpr netlist_time never() { return netlist_time(std::numeric_limits<netlist_time::INTERNALTYPE>::max(), RESOLUTION); }
+		static inline constexpr ptime zero() { return ptime(0, resolution); }
+		static inline constexpr ptime quantum() { return ptime(1, resolution); }
+		static inline constexpr ptime never() { return ptime(plib::numeric_limits<internal_type>::max(), resolution); }
 	private:
-		INTERNALTYPE m_time;
+		internal_type m_time;
 	};
 
+#if (PHAS_INT128)
+	using netlist_time = ptime<UINT128, NETLIST_INTERNAL_RES>;
+#else
+	using netlist_time = ptime<UINT64, NETLIST_INTERNAL_RES>;
+#endif
 }
 
 namespace plib {
 template<> inline void state_manager_t::save_item(const void *owner, netlist::netlist_time &nlt, const pstring &stname)
 {
-	save_state_ptr(owner, stname, datatype_t(sizeof(netlist::netlist_time::INTERNALTYPE), false, true, false), 1, nlt.get_internaltype_ptr());
+	save_state_ptr(owner, stname, datatype_t(sizeof(netlist::netlist_time::internal_type), false, true, false), 1, nlt.get_internaltype_ptr());
 }
 }
 
diff --git a/src/lib/netlist/plib/palloc.h b/src/lib/netlist/plib/palloc.h
index 154656602a6..80fa68e15d2 100644
--- a/src/lib/netlist/plib/palloc.h
+++ b/src/lib/netlist/plib/palloc.h
@@ -171,8 +171,8 @@ private:
 	struct block
 	{
 		block() : m_num_alloc(0), m_free(0), cur_ptr(nullptr), data(nullptr) { }
-		int m_num_alloc;
-		int m_free;
+		std::size_t m_num_alloc;
+		std::size_t m_free;
 		char *cur_ptr;
 		char *data;
 	};
diff --git a/src/lib/netlist/plib/pconfig.h b/src/lib/netlist/plib/pconfig.h
index 506c77c6f8d..4d9f77b5a6a 100644
--- a/src/lib/netlist/plib/pconfig.h
+++ b/src/lib/netlist/plib/pconfig.h
@@ -23,8 +23,8 @@
 #endif
 
 #if (PHAS_INT128)
-typedef _uint128_t UINT128;
-typedef _int128_t INT128;
+typedef __uint128_t UINT128;
+typedef __int128_t INT128;
 #endif
 
 #if !(PSTANDALONE)
diff --git a/src/lib/netlist/plib/pstate.h b/src/lib/netlist/plib/pstate.h
index ee170f981b1..cbfa2b06d1d 100644
--- a/src/lib/netlist/plib/pstate.h
+++ b/src/lib/netlist/plib/pstate.h
@@ -13,6 +13,7 @@
 
 #include "plists.h"
 #include "pstring.h"
+#include "ptypes.h"
 
 // ----------------------------------------------------------------------------------------
 // state saving ...
@@ -44,7 +45,7 @@ public:
 	{
 		static inline const datatype_t f()
 		{
-			return datatype_t(sizeof(T), false, std::is_integral<T>::value || std::is_enum<T>::value,
+			return datatype_t(sizeof(T), false, plib::is_integral<T>::value || std::is_enum<T>::value,
 					std::is_floating_point<T>::value); }
 	};
 
@@ -52,7 +53,7 @@ public:
 	{
 		static inline const datatype_t f()
 		{
-			return datatype_t(sizeof(T), true, std::is_integral<T>::value || std::is_enum<T>::value,
+			return datatype_t(sizeof(T), true, plib::is_integral<T>::value || std::is_enum<T>::value,
 					std::is_floating_point<T>::value);
 		}
 	};
diff --git a/src/lib/netlist/plib/ptypes.h b/src/lib/netlist/plib/ptypes.h
index af8e16a2253..6c66153c549 100644
--- a/src/lib/netlist/plib/ptypes.h
+++ b/src/lib/netlist/plib/ptypes.h
@@ -8,10 +8,36 @@
 #ifndef PTYPES_H_
 #define PTYPES_H_
 
+#include <type_traits>
+
 #include "pconfig.h"
 #include "pstring.h"
 
-namespace plib {
+namespace plib
+{
+
+	template<typename T> struct is_integral : public std::is_integral<T> { };
+	template<typename T> struct numeric_limits : public std::numeric_limits<T> { };
+
+	/* 128 bit support at least on GCC is not fully supported */
+#if PHAS_INT128
+	template<> struct is_integral<UINT128> { static constexpr bool value = true; };
+	template<> struct is_integral<INT128> { static constexpr bool value = true; };
+	template<> struct numeric_limits<UINT128>
+	{
+		static inline constexpr UINT128 max()
+		{
+			return ~((UINT64)0);
+		}
+	};
+	template<> struct numeric_limits<INT128>
+	{
+		static inline constexpr INT128 max()
+		{
+			return (~((UINT64)0)) >> 1;
+		}
+	};
+#endif
 
 	//============================================================
 	//  penum - strongly typed enumeration
diff --git a/src/lib/netlist/plib/putil.h b/src/lib/netlist/plib/putil.h
index 3636e0be217..5f9d1fa4047 100644
--- a/src/lib/netlist/plib/putil.h
+++ b/src/lib/netlist/plib/putil.h
@@ -24,7 +24,7 @@ namespace plib
 	namespace container
 	{
 		template <class C>
-		const bool contains(C &con, const typename C::value_type &elem)
+		bool contains(C &con, const typename C::value_type &elem)
 		{
 			return std::find(con.begin(), con.end(), elem) != con.end();
 		}
diff --git a/src/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp
index 7c54f40f53a..473c478bff1 100644
--- a/src/lib/netlist/prg/nltool.cpp
+++ b/src/lib/netlist/prg/nltool.cpp
@@ -162,7 +162,7 @@ struct input_t
 		int e = sscanf(line.cstr(), "%lf,%[^,],%lf", &t, buf, &m_value);
 		if ( e!= 3)
 			throw netlist::fatalerror_e(plib::pfmt("error {1} scanning line {2}\n")(e)(line));
-		m_time = netlist::netlist_time(t);
+		m_time = netlist::netlist_time::from_double(t);
 		m_param = netlist->setup().find_param(buf, true);
 	}
 
@@ -236,14 +236,14 @@ static void run(tool_options_t &opts)
 	unsigned pos = 0;
 	netlist::netlist_time nlt = netlist::netlist_time::zero();
 
-	while (pos < inps->size() && (*inps)[pos].m_time < netlist::netlist_time(ttr))
+	while (pos < inps->size() && (*inps)[pos].m_time < netlist::netlist_time::from_double(ttr))
 	{
 		nt.process_queue((*inps)[pos].m_time - nlt);
 		(*inps)[pos].setparam();
 		nlt = (*inps)[pos].m_time;
 		pos++;
 	}
-	nt.process_queue(netlist::netlist_time(ttr) - nlt);
+	nt.process_queue(netlist::netlist_time::from_double(ttr) - nlt);
 	nt.stop();
 	plib::pfree(inps);
 
diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp
index 84e88623b7f..0ebda97d630 100644
--- a/src/lib/netlist/solver/nld_solver.cpp
+++ b/src/lib/netlist/solver/nld_solver.cpp
@@ -403,7 +403,7 @@ void matrix_solver_t::update_forced()
 	if (m_params.m_dynamic && has_timestep_devices())
 	{
 		m_Q_sync.net().toggle_new_Q();
-		m_Q_sync.net().reschedule_in_queue(netlist_time(m_params.m_min_timestep));
+		m_Q_sync.net().reschedule_in_queue(netlist_time::from_double(m_params.m_min_timestep));
 	}
 }
 
@@ -535,7 +535,7 @@ netlist_time matrix_solver_t::compute_next_timestep()
 	}
 	//if (new_solver_timestep > 10.0 * hn)
 	//    new_solver_timestep = 10.0 * hn;
-	return netlist_time(new_solver_timestep);
+	return netlist_time::from_double(new_solver_timestep);
 }
 
 
@@ -628,7 +628,7 @@ NETLIB_UPDATE(solver)
 	if (!m_Q_step.net().is_queued())
 	{
 		m_Q_step.net().toggle_new_Q();
-		m_Q_step.net().push_to_queue(netlist_time(m_params.m_max_timestep));
+		m_Q_step.net().push_to_queue(netlist_time::from_double(m_params.m_max_timestep));
 	}
 }
 
@@ -704,7 +704,7 @@ void NETLIB_NAME(solver)::post_start()
 	m_params.m_accuracy = m_accuracy.Value();
 	m_params.m_gs_loops = m_gs_loops.Value();
 	m_params.m_nr_loops = m_nr_loops.Value();
-	m_params.m_nt_sync_delay = netlist_time(m_sync_delay.Value());
+	m_params.m_nt_sync_delay = netlist_time::from_double(m_sync_delay.Value());
 	m_params.m_lte = m_lte.Value();
 	m_params.m_sor = m_sor.Value();
 

From a232a127f49c6ee4a566f6775b74f6b327a19496 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Sun, 12 Jun 2016 20:05:07 +0200
Subject: [PATCH 18/39] Remove last traces of ATTR_ALIGN. (nw)

---
 src/devices/machine/netlist.cpp           |  4 ++--
 src/lib/netlist/plib/palloc.h             | 20 --------------------
 src/lib/netlist/prg/nltool.cpp            | 10 ----------
 src/lib/netlist/solver/nld_ms_direct.h    |  8 ++++----
 src/lib/netlist/solver/nld_ms_direct_lu.h | 10 +++++-----
 src/lib/netlist/solver/nld_ms_gcr.h       |  4 ++--
 src/lib/netlist/solver/nld_ms_gmres.h     |  4 ++--
 src/lib/netlist/solver/nld_ms_sm.h        | 16 ++++++++--------
 src/lib/netlist/solver/nld_ms_sor.h       |  8 ++++----
 src/lib/netlist/solver/nld_ms_sor_mat.h   |  2 +-
 src/lib/netlist/solver/nld_ms_w.h         | 16 ++++++++--------
 11 files changed, 36 insertions(+), 66 deletions(-)

diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp
index 9f448ade849..7160b696b52 100644
--- a/src/devices/machine/netlist.cpp
+++ b/src/devices/machine/netlist.cpp
@@ -414,7 +414,7 @@ void netlist_mame_device_t::device_timer(emu_timer &timer, device_timer_id id, i
 {
 }
 
-ATTR_HOT ATTR_ALIGN void netlist_mame_device_t::update_time_x()
+void netlist_mame_device_t::update_time_x()
 {
 	const netlist::netlist_time newt(netlist().time());
 	const netlist::netlist_time delta(newt - m_old + m_rem);
@@ -424,7 +424,7 @@ ATTR_HOT ATTR_ALIGN void netlist_mame_device_t::update_time_x()
 	m_icount -= d;
 }
 
-ATTR_HOT ATTR_ALIGN void netlist_mame_device_t::check_mame_abort_slice()
+void netlist_mame_device_t::check_mame_abort_slice()
 {
 	if (m_icount <= 0)
 		netlist().abort_current_queue_slice();
diff --git a/src/lib/netlist/plib/palloc.h b/src/lib/netlist/plib/palloc.h
index 80fa68e15d2..1529cd38194 100644
--- a/src/lib/netlist/plib/palloc.h
+++ b/src/lib/netlist/plib/palloc.h
@@ -16,26 +16,6 @@
 #include "pconfig.h"
 #include "pstring.h"
 
-#if (PSTANDALONE)
-#include <cstddef>
-#include <new>
-
-#if defined(__GNUC__) && (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))
-#if !defined(__ppc__) && !defined (__PPC__) && !defined(__ppc64__) && !defined(__PPC64__)
-#define ATTR_ALIGN __attribute__ ((aligned(64)))
-#else
-#define ATTR_ALIGN
-#endif
-#else
-#define ATTR_ALIGN
-#endif
-
-#else
-
-#define ATTR_ALIGN
-
-#endif
-
 namespace plib {
 
 //============================================================
diff --git a/src/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp
index 473c478bff1..5687cd42078 100644
--- a/src/lib/netlist/prg/nltool.cpp
+++ b/src/lib/netlist/prg/nltool.cpp
@@ -11,12 +11,6 @@
 #include <cstdio>
 #include <cstdlib>
 
-#ifdef PSTANDALONE
-#if (PSTANDALONE)
-#define PSTANDALONE_PROVIDED
-#endif
-#endif
-
 #include "plib/poptions.h"
 #include "plib/pstring.h"
 #include "plib/plists.h"
@@ -342,10 +336,6 @@ static void listdevices()
     main - primary entry point
 -------------------------------------------------*/
 
-#if (!PSTANDALONE)
-#include "corealloc.h"
-#endif
-
 #if 0
 static const char *pmf_verbose[] =
 {
diff --git a/src/lib/netlist/solver/nld_ms_direct.h b/src/lib/netlist/solver/nld_ms_direct.h
index 5e4e016f6fd..ec67a7c02ee 100644
--- a/src/lib/netlist/solver/nld_ms_direct.h
+++ b/src/lib/netlist/solver/nld_ms_direct.h
@@ -161,18 +161,18 @@ protected:
 	template <typename T1>
 	inline nl_ext_double &RHS(const T1 &r) { return m_A[r][N()]; }
 #endif
-	ATTR_ALIGN nl_double m_last_RHS[storage_N]; // right hand side - contains currents
+	nl_double m_last_RHS[storage_N]; // right hand side - contains currents
 
 private:
 	static const std::size_t m_pitch = (((storage_N + 1) + 7) / 8) * 8;
 	//static const std::size_t m_pitch = (((storage_N + 1) + 15) / 16) * 16;
 	//static const std::size_t m_pitch = (((storage_N + 1) + 31) / 32) * 32;
 #if (NL_USE_DYNAMIC_ALLOCATION)
-	ATTR_ALIGN nl_ext_double * RESTRICT m_A;
+	nl_ext_double * RESTRICT m_A;
 #else
-	ATTR_ALIGN nl_ext_double m_A[storage_N][m_pitch];
+	nl_ext_double m_A[storage_N][m_pitch];
 #endif
-	//ATTR_ALIGN nl_ext_double m_RHSx[storage_N];
+	//nl_ext_double m_RHSx[storage_N];
 
 	const unsigned m_dim;
 
diff --git a/src/lib/netlist/solver/nld_ms_direct_lu.h b/src/lib/netlist/solver/nld_ms_direct_lu.h
index e5ede1e4a69..9c2ab0d1cd0 100644
--- a/src/lib/netlist/solver/nld_ms_direct_lu.h
+++ b/src/lib/netlist/solver/nld_ms_direct_lu.h
@@ -142,15 +142,15 @@ protected:
 	template <typename T1, typename T2>
 	inline nl_ext_double &A(const T1 r, const T2 c) { return m_A[r][c]; }
 
-	//ATTR_ALIGN nl_double m_A[storage_N][((storage_N + 7) / 8) * 8];
-	ATTR_ALIGN nl_double m_RHS[storage_N];
-	ATTR_ALIGN nl_double m_last_RHS[storage_N]; // right hand side - contains currents
-	ATTR_ALIGN nl_double m_last_V[storage_N];
+	//nl_double m_A[storage_N][((storage_N + 7) / 8) * 8];
+	nl_double m_RHS[storage_N];
+	nl_double m_last_RHS[storage_N]; // right hand side - contains currents
+	nl_double m_last_V[storage_N];
 
 	terms_t *m_rails_temp;
 
 private:
-	ATTR_ALIGN nl_ext_double m_A[storage_N][((storage_N + 7) / 8) * 8];
+	nl_ext_double m_A[storage_N][((storage_N + 7) / 8) * 8];
 
 	const unsigned m_dim;
 	nl_double m_lp_fact;
diff --git a/src/lib/netlist/solver/nld_ms_gcr.h b/src/lib/netlist/solver/nld_ms_gcr.h
index 74733ac87ff..a9acfb0b0de 100644
--- a/src/lib/netlist/solver/nld_ms_gcr.h
+++ b/src/lib/netlist/solver/nld_ms_gcr.h
@@ -243,8 +243,8 @@ int matrix_solver_GCR_t<m_N, storage_N>::vsolve_non_dynamic(const bool newton_ra
 {
 	const unsigned iN = this->N();
 
-	ATTR_ALIGN nl_double RHS[storage_N];
-	ATTR_ALIGN nl_double new_V[storage_N];
+	nl_double RHS[storage_N];
+	nl_double new_V[storage_N];
 
 	for (unsigned i=0, e=mat.nz_num; i<e; i++)
 		m_A[i] = 0.0;
diff --git a/src/lib/netlist/solver/nld_ms_gmres.h b/src/lib/netlist/solver/nld_ms_gmres.h
index 30761623611..040453d99da 100644
--- a/src/lib/netlist/solver/nld_ms_gmres.h
+++ b/src/lib/netlist/solver/nld_ms_gmres.h
@@ -125,8 +125,8 @@ int matrix_solver_GMRES_t<m_N, storage_N>::vsolve_non_dynamic(const bool newton_
 	 */
 
 	//nz_num = 0;
-	ATTR_ALIGN nl_double RHS[storage_N];
-	ATTR_ALIGN nl_double new_V[storage_N];
+	nl_double RHS[storage_N];
+	nl_double new_V[storage_N];
 
 	for (unsigned i=0, e=mat.nz_num; i<e; i++)
 		m_A[i] = 0.0;
diff --git a/src/lib/netlist/solver/nld_ms_sm.h b/src/lib/netlist/solver/nld_ms_sm.h
index 3695d3b3b05..fe8414ec57d 100644
--- a/src/lib/netlist/solver/nld_ms_sm.h
+++ b/src/lib/netlist/solver/nld_ms_sm.h
@@ -90,19 +90,19 @@ protected:
 	template <typename T1, typename T2>
 	inline nl_ext_double &lAinv(const T1 &r, const T2 &c) { return m_lAinv[r][c]; }
 
-	ATTR_ALIGN nl_double m_last_RHS[storage_N]; // right hand side - contains currents
+	nl_double m_last_RHS[storage_N]; // right hand side - contains currents
 
 private:
 	static const std::size_t m_pitch  = (((  storage_N) + 7) / 8) * 8;
-	ATTR_ALIGN nl_ext_double m_A[storage_N][m_pitch];
-	ATTR_ALIGN nl_ext_double m_Ainv[storage_N][m_pitch];
-	ATTR_ALIGN nl_ext_double m_W[storage_N][m_pitch];
-	ATTR_ALIGN nl_ext_double m_RHS[storage_N]; // right hand side - contains currents
+	nl_ext_double m_A[storage_N][m_pitch];
+	nl_ext_double m_Ainv[storage_N][m_pitch];
+	nl_ext_double m_W[storage_N][m_pitch];
+	nl_ext_double m_RHS[storage_N]; // right hand side - contains currents
 
-	ATTR_ALIGN nl_ext_double m_lA[storage_N][m_pitch];
-	ATTR_ALIGN nl_ext_double m_lAinv[storage_N][m_pitch];
+	nl_ext_double m_lA[storage_N][m_pitch];
+	nl_ext_double m_lAinv[storage_N][m_pitch];
 
-	//ATTR_ALIGN nl_ext_double m_RHSx[storage_N];
+	//nl_ext_double m_RHSx[storage_N];
 
 	const unsigned m_dim;
 
diff --git a/src/lib/netlist/solver/nld_ms_sor.h b/src/lib/netlist/solver/nld_ms_sor.h
index 34a6acefcef..cf8dc8de5bf 100644
--- a/src/lib/netlist/solver/nld_ms_sor.h
+++ b/src/lib/netlist/solver/nld_ms_sor.h
@@ -70,10 +70,10 @@ int matrix_solver_SOR_t<m_N, storage_N>::vsolve_non_dynamic(const bool newton_ra
 
 	const nl_double ws = this->m_params.m_sor;
 
-	ATTR_ALIGN nl_double w[storage_N];
-	ATTR_ALIGN nl_double one_m_w[storage_N];
-	ATTR_ALIGN nl_double RHS[storage_N];
-	ATTR_ALIGN nl_double new_V[storage_N];
+	nl_double w[storage_N];
+	nl_double one_m_w[storage_N];
+	nl_double RHS[storage_N];
+	nl_double new_V[storage_N];
 
 	for (unsigned k = 0; k < iN; k++)
 	{
diff --git a/src/lib/netlist/solver/nld_ms_sor_mat.h b/src/lib/netlist/solver/nld_ms_sor_mat.h
index 2ea00212164..781e6bb4eaa 100644
--- a/src/lib/netlist/solver/nld_ms_sor_mat.h
+++ b/src/lib/netlist/solver/nld_ms_sor_mat.h
@@ -123,7 +123,7 @@ int matrix_solver_SOR_mat_t<m_N, storage_N>::vsolve_non_dynamic(const bool newto
 	 */
 
 
-	ATTR_ALIGN nl_double new_v[storage_N] = { 0.0 };
+	nl_double new_v[storage_N] = { 0.0 };
 	const unsigned iN = this->N();
 
 	matrix_solver_t::build_LE_A<matrix_solver_SOR_mat_t>();
diff --git a/src/lib/netlist/solver/nld_ms_w.h b/src/lib/netlist/solver/nld_ms_w.h
index f0f1cddf96e..294b2c4ccf4 100644
--- a/src/lib/netlist/solver/nld_ms_w.h
+++ b/src/lib/netlist/solver/nld_ms_w.h
@@ -95,26 +95,26 @@ protected:
 	template <typename T1, typename T2>
 	inline nl_ext_double &lA(const T1 &r, const T2 &c) { return m_lA[r][c]; }
 
-	ATTR_ALIGN nl_double m_last_RHS[storage_N]; // right hand side - contains currents
+	nl_double m_last_RHS[storage_N]; // right hand side - contains currents
 
 private:
 	static const std::size_t m_pitch  = (((  storage_N) + 7) / 8) * 8;
-	ATTR_ALIGN nl_ext_double m_A[storage_N][m_pitch];
-	ATTR_ALIGN nl_ext_double m_Ainv[storage_N][m_pitch];
-	ATTR_ALIGN nl_ext_double m_W[storage_N][m_pitch];
-	ATTR_ALIGN nl_ext_double m_RHS[storage_N]; // right hand side - contains currents
+	nl_ext_double m_A[storage_N][m_pitch];
+	nl_ext_double m_Ainv[storage_N][m_pitch];
+	nl_ext_double m_W[storage_N][m_pitch];
+	nl_ext_double m_RHS[storage_N]; // right hand side - contains currents
 
-	ATTR_ALIGN nl_ext_double m_lA[storage_N][m_pitch];
+	nl_ext_double m_lA[storage_N][m_pitch];
 
 	/* temporary */
-	ATTR_ALIGN nl_double H[storage_N][m_pitch] ;
+	nl_double H[storage_N][m_pitch] ;
 	unsigned rows[storage_N];
 	unsigned cols[storage_N][m_pitch];
 	unsigned colcount[storage_N];
 
 	unsigned m_cnt;
 
-	//ATTR_ALIGN nl_ext_double m_RHSx[storage_N];
+	//nl_ext_double m_RHSx[storage_N];
 
 	const unsigned m_dim;
 

From c107e795d2f4b8c821b8f417dceda0bafd8db885 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Mon, 13 Jun 2016 19:58:25 +0200
Subject: [PATCH 19/39] Move state_var so it can be used by base devices as
 well. (nw)

---
 src/lib/netlist/nl_base.cpp           |  31 ++----
 src/lib/netlist/nl_base.h             | 131 +++++++++++++++-----------
 src/lib/netlist/solver/nld_solver.cpp |   2 +-
 3 files changed, 89 insertions(+), 75 deletions(-)

diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index 9315c0a00a0..c96273e8579 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -559,26 +559,19 @@ struct do_nothing_deleter{
 
 net_t::net_t(netlist_t &nl, const pstring &aname, core_terminal_t *mr)
 	: object_t(nl, aname, NET)
-	, m_new_Q(0)
-	, m_cur_Q (0)
-	, m_time(netlist_time::zero())
-	, m_active(0)
-	, m_in_queue(2)
+	, m_new_Q(*this, "m_new_Q", 0)
+	, m_cur_Q (*this, "m_cur_Q", 0)
+	, m_time(*this, "m_time", netlist_time::zero())
+	, m_active(*this, "m_active", 0)
+	, m_in_queue(*this, "m_in_queue", 2)
 	, m_railterminal(nullptr)
-	, m_cur_Analog(0.0)
+	, m_cur_Analog(*this, "m_cur_Analog", 0.0)
 {
 	m_railterminal = mr;
 	if (mr != nullptr)
 		nl.m_nets.push_back(std::shared_ptr<net_t>(this, do_nothing_deleter()));
 	else
 		nl.m_nets.push_back(std::shared_ptr<net_t>(this));
-
-	netlist().save(*this, m_time, "m_time");
-	netlist().save(*this, m_active, "m_active");
-	netlist().save(*this, m_in_queue, "m_in_queue");
-	netlist().save(*this, m_cur_Analog, "m_cur_Analog");
-	netlist().save(*this, m_cur_Q, "m_cur_Q");
-	netlist().save(*this, m_new_Q, "m_new_Q");
 }
 
 net_t::~net_t()
@@ -794,9 +787,8 @@ core_terminal_t::core_terminal_t(core_device_t &dev, const pstring &aname, const
 : device_object_t(dev, dev.name() + "." + aname, atype)
 , plib::linkedlist_t<core_terminal_t>::element_t()
 , m_net(nullptr)
-, m_state(STATE_NONEX)
+, m_state(*this, "m_state", STATE_NONEX)
 {
-	netlist().save(*this, m_state, "m_state");
 }
 
 void core_terminal_t::reset()
@@ -825,14 +817,11 @@ void core_terminal_t::set_net(net_t *anet)
 terminal_t::terminal_t(core_device_t &dev, const pstring &aname)
 : analog_t(dev, aname, TERMINAL)
 , m_otherterm(nullptr)
-, m_Idr1(nullptr)
-, m_go1(nullptr)
-, m_gt1(nullptr)
+, m_Idr1(*this, "m_Idr1", nullptr)
+, m_go1(*this, "m_go1", nullptr)
+, m_gt1(*this, "m_gt1", nullptr)
 {
 	netlist().setup().register_term(*this);
-	netlist().save(*this, m_Idr1, "m_Idr1");
-	netlist().save(*this, m_go1, "m_go1");
-	netlist().save(*this, m_gt1, "m_gt1");
 }
 
 
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 36626b33107..1d4b5b261c4 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -285,6 +285,7 @@ namespace netlist
 	class netlist_t;
 	class core_device_t;
 	class param_model_t;
+	class device_t;
 
 	// -----------------------------------------------------------------------------
 	// model_map_t
@@ -342,6 +343,56 @@ namespace netlist
 	// object_t
 	// -----------------------------------------------------------------------------
 
+	// -----------------------------------------------------------------------------
+	// State variables - use to preserve state
+	// -----------------------------------------------------------------------------
+
+	template <typename T>
+	struct state_var
+	{
+	public:
+		template <typename O>
+		state_var(O &owner, const pstring name, const T &value);
+		state_var(const state_var &rhs) NOEXCEPT = default;
+		state_var(state_var &&rhs) NOEXCEPT = default;
+		state_var &operator=(state_var rhs) { std::swap(rhs.m_value, this->m_value); return *this; }
+		state_var &operator=(const T rhs) { m_value = rhs; return *this; }
+		operator T & () { return m_value; }
+		T & operator()() { return m_value; }
+		operator const T & () const { return m_value; }
+		const T & operator()() const { return m_value; }
+
+		T * ptr() { return &m_value; }
+		const T * ptr() const { return &m_value; }
+	private:
+		T m_value;
+	};
+
+	template <typename T, std::size_t N>
+	struct state_var<T[N]>
+	{
+	public:
+		state_var(device_t &dev, const pstring name, const T & value);
+		state_var(const state_var &rhs) NOEXCEPT = default;
+		state_var(state_var &&rhs) NOEXCEPT = default;
+		state_var &operator=(const state_var rhs) { m_value = rhs.m_value; return *this; }
+		state_var &operator=(const T rhs) { m_value = rhs; return *this; }
+		T & operator[](const std::size_t i) { return m_value[i]; }
+		const T & operator[](const std::size_t i) const { return m_value[i]; }
+	private:
+		T m_value[N];
+	};
+
+	// -----------------------------------------------------------------------------
+	// State variables - predefined and c++11 non-optioanl
+	// -----------------------------------------------------------------------------
+
+	using state_var_u8 = state_var<std::uint_fast8_t>;
+	using state_var_s8 = state_var<std::int_fast8_t>;
+
+	using state_var_u32 = state_var<std::uint_fast32_t>;
+	using state_var_s32 = state_var<std::int_fast32_t>;
+
 	class object_t
 	{
 		P_PREVENT_COPYING(object_t)
@@ -441,7 +492,7 @@ namespace netlist
 
 	private:
 		net_t * m_net;
-		state_e m_state;
+		state_var<state_e> m_state;
 	};
 
 	// -----------------------------------------------------------------------------
@@ -514,9 +565,9 @@ namespace netlist
 			}
 		}
 
-		nl_double *m_Idr1; // drive current
-		nl_double *m_go1;  // conductance for Voltage from other term
-		nl_double *m_gt1;  // conductance for total conductance
+		state_var<nl_double *> m_Idr1; // drive current
+		state_var<nl_double *> m_go1;  // conductance for Voltage from other term
+		state_var<nl_double *> m_gt1;  // conductance for total conductance
 
 	};
 
@@ -624,12 +675,12 @@ namespace netlist
 		std::vector<core_terminal_t *> m_core_terms; // save post-start m_list ...
 
 	protected:
-		netlist_sig_t m_new_Q;
-		netlist_sig_t m_cur_Q;
+		state_var<netlist_sig_t> m_new_Q;
+		state_var<netlist_sig_t> m_cur_Q;
 
-		netlist_time  m_time;
-		INT32         m_active;
-		UINT8    	  m_in_queue;    /* 0: not in queue, 1: in queue, 2: last was taken */
+		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 */
 
 	private:
 		plib::linkedlist_t<core_terminal_t> m_list_active;
@@ -637,7 +688,7 @@ namespace netlist
 
 	public:
 		// FIXME: Have to fix the public at some time
-		nl_double m_cur_Analog;
+		state_var<nl_double>     m_cur_Analog;
 
 	};
 
@@ -1132,49 +1183,6 @@ protected:
 		plib::dynlib *m_lib;                 // external lib needs to be loaded as long as netlist exists
 	};
 
-	template <typename T>
-	struct state_var
-	{
-	public:
-		state_var(device_t &dev, const pstring name, const T &value)
-		: m_value(value)
-		{
-			dev.netlist().save(dev, m_value, name);
-		}
-
-		state_var(const state_var &rhs) NOEXCEPT = default;
-		state_var(state_var &&rhs) NOEXCEPT = default;
-		state_var &operator=(const state_var rhs) { m_value = rhs.m_value; return *this; }
-		state_var &operator=(const T rhs) { m_value = rhs; return *this; }
-		operator T & () { return m_value; }
-		T & operator()() { return m_value; }
-		operator const T & () const { return m_value; }
-		const T & operator()() const { return m_value; }
-	private:
-		T m_value;
-	};
-
-	template <typename T, std::size_t N>
-	struct state_var<T[N]>
-	{
-	public:
-		state_var(device_t &dev, const pstring name, const T & value)
-		{
-			dev.netlist().save(dev, m_value, name);
-			for (std::size_t i=0; i<N; i++)
-				m_value[i] = value;
-		}
-
-		state_var(const state_var &rhs) NOEXCEPT = default;
-		state_var(state_var &&rhs) NOEXCEPT = default;
-		state_var &operator=(const state_var rhs) { m_value = rhs.m_value; return *this; }
-		state_var &operator=(const T rhs) { m_value = rhs; return *this; }
-		T & operator[](const std::size_t i) { return m_value[i]; }
-		const T & operator[](const std::size_t i) const { return m_value[i]; }
-	private:
-		T m_value[N];
-	};
-
 
 	// -----------------------------------------------------------------------------
 	// Support classes for devices
@@ -1349,6 +1357,23 @@ protected:
 		out.set_Q(val, delay);
 	}
 
+	template <typename T>
+	template <typename O>
+	state_var<T>::state_var(O &owner, const pstring name, const T &value)
+	: m_value(value)
+	{
+		owner.netlist().save(owner, m_value, name);
+	}
+
+	template <typename T, std::size_t N>
+	state_var<T[N]>::state_var(device_t &dev, const pstring name, const T & value)
+	{
+		dev.netlist().save(dev, m_value, name);
+		for (std::size_t i=0; i<N; i++)
+			m_value[i] = value;
+	}
+
+
 }
 
 
diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp
index 0ebda97d630..3f4b39b77cb 100644
--- a/src/lib/netlist/solver/nld_solver.cpp
+++ b/src/lib/netlist/solver/nld_solver.cpp
@@ -89,7 +89,7 @@ void terms_t::set_pointers()
 	for (unsigned i = 0; i < count(); i++)
 	{
 		m_term[i]->set_ptrs(&m_gt[i], &m_go[i], &m_Idr[i]);
-		m_other_curanalog[i] = &m_term[i]->m_otherterm->net().m_cur_Analog;
+		m_other_curanalog[i] = m_term[i]->m_otherterm->net().m_cur_Analog.ptr();
 	}
 }
 

From 0b6f6073f7a160a3705f7f4a9f2ca617f9fefdf3 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Tue, 14 Jun 2016 20:33:51 +0200
Subject: [PATCH 20/39] Change UINT8 to uint_[fast|least|8_t. (nw)

---
 src/lib/netlist/devices/nld_4020.cpp       | 11 ++-
 src/lib/netlist/devices/nld_74107.cpp      |  2 +-
 src/lib/netlist/devices/nld_74153.cpp      |  2 +-
 src/lib/netlist/devices/nld_74175.cpp      |  4 +-
 src/lib/netlist/devices/nld_74192.cpp      |  2 +-
 src/lib/netlist/devices/nld_7448.cpp       | 10 +--
 src/lib/netlist/devices/nld_7450.cpp       |  6 +-
 src/lib/netlist/devices/nld_7474.cpp       |  4 +-
 src/lib/netlist/devices/nld_7483.cpp       |  6 +-
 src/lib/netlist/devices/nld_7490.cpp       |  6 +-
 src/lib/netlist/devices/nld_7493.cpp       |  4 +-
 src/lib/netlist/devices/nld_82S16.cpp      |  6 +-
 src/lib/netlist/devices/nld_9310.cpp       | 16 ++---
 src/lib/netlist/devices/nld_9312.cpp       |  8 +--
 src/lib/netlist/devices/nld_9316.cpp       | 16 ++---
 src/lib/netlist/devices/nld_legacy.cpp     |  2 +-
 src/lib/netlist/devices/nld_mm5837.cpp     |  6 +-
 src/lib/netlist/devices/nld_truthtable.cpp | 46 ++++++------
 src/lib/netlist/devices/nld_truthtable.h   | 67 +++++++++---------
 src/lib/netlist/devices/nlid_system.h      |  2 +-
 src/lib/netlist/nl_base.h                  |  6 +-
 src/lib/netlist/nl_config.h                |  6 +-
 src/lib/netlist/nl_time.h                  | 17 +++--
 src/lib/netlist/plib/pconfig.h             | 82 +++-------------------
 src/lib/netlist/plib/pparser.h             |  4 +-
 src/lib/netlist/plib/pstream.cpp           |  2 +-
 src/lib/netlist/plib/pstream.h             |  2 +-
 src/lib/netlist/plib/pstring.cpp           |  4 +-
 src/lib/netlist/plib/pstring.h             |  2 +-
 src/lib/netlist/plib/ptypes.h              |  4 +-
 30 files changed, 150 insertions(+), 205 deletions(-)

diff --git a/src/lib/netlist/devices/nld_4020.cpp b/src/lib/netlist/devices/nld_4020.cpp
index f0e79ece754..3dec9b087b7 100644
--- a/src/lib/netlist/devices/nld_4020.cpp
+++ b/src/lib/netlist/devices/nld_4020.cpp
@@ -35,7 +35,7 @@ namespace netlist
 		NETLIB_UPDATEI();
 
 	public:
-		void update_outputs(const UINT16 cnt);
+		void update_outputs(const unsigned cnt);
 
 		logic_input_t m_IP;
 		object_array_t<logic_output_t, 14> m_Q;
@@ -79,10 +79,9 @@ namespace netlist
 
 	NETLIB_UPDATE(CD4020_sub)
 	{
-		UINT8 cnt = m_cnt;
-		cnt = ( cnt + 1) & 0x3fff;
-		update_outputs(cnt);
-		m_cnt = cnt;
+		++m_cnt;
+		m_cnt &= 0x3fff;
+		update_outputs(m_cnt);
 	}
 
 	NETLIB_UPDATE(CD4020)
@@ -100,7 +99,7 @@ namespace netlist
 			m_sub.m_IP.activate_hl();
 	}
 
-	inline NETLIB_FUNC_VOID(CD4020_sub, update_outputs, (const UINT16 cnt))
+	inline NETLIB_FUNC_VOID(CD4020_sub, update_outputs, (const unsigned cnt))
 	{
 		/* static */ const netlist_time out_delayQn[14] = {
 				NLTIME_FROM_NS(180), NLTIME_FROM_NS(280),
diff --git a/src/lib/netlist/devices/nld_74107.cpp b/src/lib/netlist/devices/nld_74107.cpp
index c6adf487db9..52b59a0816d 100644
--- a/src/lib/netlist/devices/nld_74107.cpp
+++ b/src/lib/netlist/devices/nld_74107.cpp
@@ -137,7 +137,7 @@ namespace netlist
 
 	NETLIB_UPDATE(74107A)
 	{
-		const UINT8 JK = (INPLOGIC(m_J) << 1) | INPLOGIC(m_K);
+		const auto JK = (INPLOGIC(m_J) << 1) | INPLOGIC(m_K);
 
 		switch (JK)
 		{
diff --git a/src/lib/netlist/devices/nld_74153.cpp b/src/lib/netlist/devices/nld_74153.cpp
index bd95659e76a..913d9d19518 100644
--- a/src/lib/netlist/devices/nld_74153.cpp
+++ b/src/lib/netlist/devices/nld_74153.cpp
@@ -109,7 +109,7 @@ namespace netlist
 		const netlist_time delay[2] = { NLTIME_FROM_NS(23), NLTIME_FROM_NS(18) };
 		if (!INPLOGIC(m_G))
 		{
-			UINT8 t = INPLOGIC(m_C[m_chan]);
+			uint_fast8_t t = INPLOGIC(m_C[m_chan]);
 			OUTLOGIC(m_Y, t, delay[t] );
 		}
 		else
diff --git a/src/lib/netlist/devices/nld_74175.cpp b/src/lib/netlist/devices/nld_74175.cpp
index 66d98451ad4..b9c02009a68 100644
--- a/src/lib/netlist/devices/nld_74175.cpp
+++ b/src/lib/netlist/devices/nld_74175.cpp
@@ -108,7 +108,7 @@ namespace netlist
 		{
 			for (int i=0; i<4; i++)
 			{
-				UINT8 d = (m_data >> i) & 1;
+				netlist_sig_t d = (m_data >> i) & 1;
 				OUTLOGIC(m_Q[i], d, delay[d]);
 				OUTLOGIC(m_QQ[i], d ^ 1, delay[d ^ 1]);
 			}
@@ -118,7 +118,7 @@ namespace netlist
 
 	NETLIB_UPDATE(74175)
 	{
-		UINT8 d = 0;
+		uint_fast8_t d = 0;
 		for (int i=0; i<4; i++)
 		{
 			d |= (INPLOGIC(m_D[i]) << i);
diff --git a/src/lib/netlist/devices/nld_74192.cpp b/src/lib/netlist/devices/nld_74192.cpp
index 216fc75224c..93af5de836d 100644
--- a/src/lib/netlist/devices/nld_74192.cpp
+++ b/src/lib/netlist/devices/nld_74192.cpp
@@ -33,7 +33,7 @@ namespace netlist
 		logic_input_t m_C;
 		logic_input_t m_D;
 
-		inline UINT8 read_ABCD() const
+		uint_fast8_t read_ABCD() const
 		{
 			//return (INPLOGIC_PASSIVE(m_D) << 3) | (INPLOGIC_PASSIVE(m_C) << 2) | (INPLOGIC_PASSIVE(m_B) << 1) | (INPLOGIC_PASSIVE(m_A) << 0);
 			return (INPLOGIC(m_D) << 3) | (INPLOGIC(m_C) << 2) | (INPLOGIC(m_B) << 1) | (INPLOGIC(m_A) << 0);
diff --git a/src/lib/netlist/devices/nld_7448.cpp b/src/lib/netlist/devices/nld_7448.cpp
index 44ee8a69ec8..ea1b46ca5dd 100644
--- a/src/lib/netlist/devices/nld_7448.cpp
+++ b/src/lib/netlist/devices/nld_7448.cpp
@@ -38,8 +38,8 @@ namespace netlist
 		NETLIB_UPDATEI();
 
 	public:
-		void update_outputs(UINT8 v);
-		static const UINT8 tab7448[16][7];
+		void update_outputs(uint_fast8_t v);
+		static const uint_fast8_t tab7448[16][7];
 
 		logic_input_t m_A;
 		logic_input_t m_B;
@@ -158,7 +158,7 @@ namespace netlist
 			m_C.activate();
 			m_B.activate();
 			m_A.activate();
-			UINT8 v;
+			uint_fast8_t v;
 
 			v = (INPLOGIC(m_A) << 0) | (INPLOGIC(m_B) << 1) | (INPLOGIC(m_C) << 2) | (INPLOGIC(m_D) << 3);
 			if ((!INPLOGIC(m_RBIQ) && (v==0)))
@@ -177,7 +177,7 @@ namespace netlist
 		m_RBIQ.inactivate();
 	}
 
-	NETLIB_FUNC_VOID(7448, update_outputs, (UINT8 v))
+	NETLIB_FUNC_VOID(7448, update_outputs, (uint_fast8_t v))
 	{
 		nl_assert(v<16);
 		if (v != m_state)
@@ -190,7 +190,7 @@ namespace netlist
 		}
 	}
 
-	const UINT8 NETLIB_NAME(7448)::tab7448[16][7] =
+	const uint_fast8_t NETLIB_NAME(7448)::tab7448[16][7] =
 	{
 			{   1, 1, 1, 1, 1, 1, 0 },  /* 00 - not blanked ! */
 			{   0, 1, 1, 0, 0, 0, 0 },  /* 01 */
diff --git a/src/lib/netlist/devices/nld_7450.cpp b/src/lib/netlist/devices/nld_7450.cpp
index 548a76c47d7..67060e7955e 100644
--- a/src/lib/netlist/devices/nld_7450.cpp
+++ b/src/lib/netlist/devices/nld_7450.cpp
@@ -69,12 +69,12 @@ namespace netlist
 		m_B.activate();
 		m_C.activate();
 		m_D.activate();
-		UINT8 t1 = INPLOGIC(m_A) & INPLOGIC(m_B);
-		UINT8 t2 = INPLOGIC(m_C) & INPLOGIC(m_D);
+		uint_fast8_t t1 = INPLOGIC(m_A) & INPLOGIC(m_B);
+		uint_fast8_t t2 = INPLOGIC(m_C) & INPLOGIC(m_D);
 
 		const netlist_time times[2] = { NLTIME_FROM_NS(22), NLTIME_FROM_NS(15) };
 
-		UINT8 res = 0;
+		uint_fast8_t res = 0;
 		if (t1 ^ 1)
 		{
 			if (t2 ^ 1)
diff --git a/src/lib/netlist/devices/nld_7474.cpp b/src/lib/netlist/devices/nld_7474.cpp
index 2d662ab73db..56f9d1dfcb8 100644
--- a/src/lib/netlist/devices/nld_7474.cpp
+++ b/src/lib/netlist/devices/nld_7474.cpp
@@ -31,7 +31,7 @@ namespace netlist
 		logic_output_t m_QQ;
 		state_var<unsigned> m_nextD;
 
-		inline void newstate(const UINT8 stateQ, const UINT8 stateQQ);
+		inline void newstate(const netlist_sig_t stateQ, const netlist_sig_t stateQQ);
 
 	private:
 
@@ -93,7 +93,7 @@ namespace netlist
 		NETLIB_SUB(7474) m_2;
 	};
 
-	inline void NETLIB_NAME(7474sub)::newstate(const UINT8 stateQ, const UINT8 stateQQ)
+	inline void NETLIB_NAME(7474sub)::newstate(const netlist_sig_t stateQ, const netlist_sig_t stateQQ)
 	{
 		// 0: High-to-low 40 ns, 1: Low-to-high 25 ns
 		const netlist_time delay[2] = { NLTIME_FROM_NS(40), NLTIME_FROM_NS(25) };
diff --git a/src/lib/netlist/devices/nld_7483.cpp b/src/lib/netlist/devices/nld_7483.cpp
index a34c2b832c8..c314be16d33 100644
--- a/src/lib/netlist/devices/nld_7483.cpp
+++ b/src/lib/netlist/devices/nld_7483.cpp
@@ -89,10 +89,10 @@ namespace netlist
 
 	NETLIB_UPDATE(7483)
 	{
-		UINT8 a = (INPLOGIC(m_A1) << 0) | (INPLOGIC(m_A2) << 1) | (INPLOGIC(m_A3) << 2) | (INPLOGIC(m_A4) << 3);
-		UINT8 b = (INPLOGIC(m_B1) << 0) | (INPLOGIC(m_B2) << 1) | (INPLOGIC(m_B3) << 2) | (INPLOGIC(m_B4) << 3);
+		uint_fast8_t a = (INPLOGIC(m_A1) << 0) | (INPLOGIC(m_A2) << 1) | (INPLOGIC(m_A3) << 2) | (INPLOGIC(m_A4) << 3);
+		uint_fast8_t b = (INPLOGIC(m_B1) << 0) | (INPLOGIC(m_B2) << 1) | (INPLOGIC(m_B3) << 2) | (INPLOGIC(m_B4) << 3);
 
-		UINT8 r = a + b + INPLOGIC(m_C0);
+		uint_fast8_t r = a + b + INPLOGIC(m_C0);
 
 		if (r != m_lastr)
 		{
diff --git a/src/lib/netlist/devices/nld_7490.cpp b/src/lib/netlist/devices/nld_7490.cpp
index 709a7920d3f..22deac2ea9a 100644
--- a/src/lib/netlist/devices/nld_7490.cpp
+++ b/src/lib/netlist/devices/nld_7490.cpp
@@ -41,9 +41,9 @@ namespace netlist
 		logic_input_t m_R91;
 		logic_input_t m_R92;
 
-		state_var<UINT8> m_cnt;
-		state_var<UINT8> m_last_A;
-		state_var<UINT8> m_last_B;
+		state_var_u8 m_cnt;
+		state_var_u8 m_last_A;
+		state_var_u8 m_last_B;
 
 		object_array_t<logic_output_t, 4> m_Q;
 	};
diff --git a/src/lib/netlist/devices/nld_7493.cpp b/src/lib/netlist/devices/nld_7493.cpp
index 138e65dded1..8a12333e596 100644
--- a/src/lib/netlist/devices/nld_7493.cpp
+++ b/src/lib/netlist/devices/nld_7493.cpp
@@ -31,8 +31,8 @@ namespace netlist
 		logic_input_t m_I;
 		logic_output_t m_Q;
 
-		state_var<UINT8> m_reset;
-		state_var<UINT8> m_state;
+		state_var_u8 m_reset;
+		state_var_u8 m_state;
 	};
 
 	NETLIB_OBJECT(7493)
diff --git a/src/lib/netlist/devices/nld_82S16.cpp b/src/lib/netlist/devices/nld_82S16.cpp
index aa7e2da3765..6b0e40abf0b 100644
--- a/src/lib/netlist/devices/nld_82S16.cpp
+++ b/src/lib/netlist/devices/nld_82S16.cpp
@@ -38,8 +38,8 @@ namespace netlist
 		logic_input_t m_DIN;
 		logic_output_t m_DOUTQ;
 
-		//netlist_state_t<UINT8[256]> m_ram;
-		state_var<UINT64[4]> m_ram; // 256 bits
+		//netlist_state_t<NLUINT8[256]> m_ram;
+		state_var<uint_fast64_t[4]> m_ram; // 256 bits
 	};
 
 	NETLIB_OBJECT_DERIVED(82S16_dip, 82S16)
@@ -88,7 +88,7 @@ namespace netlist
 
 			if (!INPLOGIC(m_WEQ))
 			{
-				m_ram[adr >> 6] = (m_ram[adr >> 6] & ~((UINT64) 1 << (adr & 0x3f))) | ((UINT64) INPLOGIC(m_DIN) << (adr & 0x3f));
+				m_ram[adr >> 6] = (m_ram[adr >> 6] & ~((uint_fast64_t) 1 << (adr & 0x3f))) | ((uint_fast64_t) INPLOGIC(m_DIN) << (adr & 0x3f));
 			}
 			OUTLOGIC(m_DOUTQ, ((m_ram[adr >> 6] >> (adr & 0x3f)) & 1) ^ 1, NLTIME_FROM_NS(20));
 		}
diff --git a/src/lib/netlist/devices/nld_9310.cpp b/src/lib/netlist/devices/nld_9310.cpp
index 3bacf460892..6ed3b9c0adb 100644
--- a/src/lib/netlist/devices/nld_9310.cpp
+++ b/src/lib/netlist/devices/nld_9310.cpp
@@ -33,7 +33,7 @@ namespace netlist
 		logic_input_t m_C;
 		logic_input_t m_D;
 
-		inline UINT8 read_ABCD() const
+		uint_fast8_t read_ABCD() const
 		{
 			//return (INPLOGIC_PASSIVE(m_D) << 3) | (INPLOGIC_PASSIVE(m_C) << 2) | (INPLOGIC_PASSIVE(m_B) << 1) | (INPLOGIC_PASSIVE(m_A) << 0);
 			return (INPLOGIC(m_D) << 3) | (INPLOGIC(m_C) << 2) | (INPLOGIC(m_B) << 1) | (INPLOGIC(m_A) << 0);
@@ -58,8 +58,8 @@ namespace netlist
 		NETLIB_RESETI();
 		NETLIB_UPDATEI();
 	public:
-		inline void update_outputs_all(const UINT8 cnt, const netlist_time out_delay);
-		inline void update_outputs(const UINT8 cnt);
+		inline void update_outputs_all(const uint_fast8_t cnt, const netlist_time out_delay);
+		inline void update_outputs(const uint_fast8_t cnt);
 
 		logic_input_t m_CLK;
 
@@ -70,9 +70,9 @@ namespace netlist
 		logic_output_t m_QC;
 		logic_output_t m_QD;
 		logic_output_t m_RC;
-		state_var<UINT8> m_cnt;
-		state_var<netlist_sig_t> m_loadq;
-		state_var<netlist_sig_t> m_ent;
+		state_var_u8 m_cnt;
+		state_var_u8 m_loadq;
+		state_var_u8 m_ent;
 	};
 
 	NETLIB_OBJECT(9310)
@@ -208,7 +208,7 @@ namespace netlist
 		}
 	}
 
-	inline NETLIB_FUNC_VOID(9310_sub, update_outputs_all, (const UINT8 cnt, const netlist_time out_delay))
+	inline NETLIB_FUNC_VOID(9310_sub, update_outputs_all, (const uint_fast8_t cnt, const netlist_time out_delay))
 	{
 		OUTLOGIC(m_QA, (cnt >> 0) & 1, out_delay);
 		OUTLOGIC(m_QB, (cnt >> 1) & 1, out_delay);
@@ -216,7 +216,7 @@ namespace netlist
 		OUTLOGIC(m_QD, (cnt >> 3) & 1, out_delay);
 	}
 
-	inline NETLIB_FUNC_VOID(9310_sub, update_outputs, (const UINT8 cnt))
+	inline NETLIB_FUNC_VOID(9310_sub, update_outputs, (const uint_fast8_t cnt))
 	{
 		/* static */ const netlist_time out_delay = NLTIME_FROM_NS(20);
 	#if 0
diff --git a/src/lib/netlist/devices/nld_9312.cpp b/src/lib/netlist/devices/nld_9312.cpp
index 0ff9714a103..0191a905ebc 100644
--- a/src/lib/netlist/devices/nld_9312.cpp
+++ b/src/lib/netlist/devices/nld_9312.cpp
@@ -61,8 +61,8 @@ namespace netlist
 		logic_output_t m_Y;
 		logic_output_t m_YQ;
 
-		state_var<UINT8> m_last_chan;
-		state_var<UINT8> m_last_G;
+		state_var_u8 m_last_chan;
+		state_var_u8 m_last_G;
 	};
 
 	#endif
@@ -155,7 +155,7 @@ namespace netlist
 
 	NETLIB_UPDATE(9312)
 	{
-		const UINT8 G = INPLOGIC(m_G);
+		const NLUINT8 G = INPLOGIC(m_G);
 		if (G)
 		{
 			const netlist_time delay[2] = { NLTIME_FROM_NS(33), NLTIME_FROM_NS(19) };
@@ -177,7 +177,7 @@ namespace netlist
 				m_C.activate();
 			}
 			constexpr netlist_time delay[2] = { NLTIME_FROM_NS(33), NLTIME_FROM_NS(28) };
-			const UINT8 chan = INPLOGIC(m_A) | (INPLOGIC(m_B)<<1) | (INPLOGIC(m_C)<<2);
+			const NLUINT8 chan = INPLOGIC(m_A) | (INPLOGIC(m_B)<<1) | (INPLOGIC(m_C)<<2);
 			if (m_last_chan != chan)
 			{
 				m_D[m_last_chan].inactivate();
diff --git a/src/lib/netlist/devices/nld_9316.cpp b/src/lib/netlist/devices/nld_9316.cpp
index 3083b77ba6a..2a4e41ccb1e 100644
--- a/src/lib/netlist/devices/nld_9316.cpp
+++ b/src/lib/netlist/devices/nld_9316.cpp
@@ -33,7 +33,7 @@ namespace netlist
 		logic_input_t m_C;
 		logic_input_t m_D;
 
-		inline UINT8 read_ABCD() const
+		uint_fast8_t read_ABCD() const
 		{
 			//return (INPLOGIC_PASSIVE(m_D) << 3) | (INPLOGIC_PASSIVE(m_C) << 2) | (INPLOGIC_PASSIVE(m_B) << 1) | (INPLOGIC_PASSIVE(m_A) << 0);
 			return (INPLOGIC(m_D) << 3) | (INPLOGIC(m_C) << 2) | (INPLOGIC(m_B) << 1) | (INPLOGIC(m_A) << 0);
@@ -60,8 +60,8 @@ namespace netlist
 		NETLIB_UPDATEI();
 
 	public:
-		inline void update_outputs_all(const UINT8 cnt, const netlist_time out_delay);
-		inline void update_outputs(const UINT8 cnt);
+		inline void update_outputs_all(const uint_fast8_t cnt, const netlist_time out_delay);
+		inline void update_outputs(const uint_fast8_t cnt);
 
 		logic_input_t m_CLK;
 
@@ -72,9 +72,9 @@ namespace netlist
 		logic_output_t m_RC;
 
 		NETLIB_NAME(9316_subABCD) *m_ABCD;
-		state_var<UINT8> m_cnt;
-		state_var<netlist_sig_t> m_loadq;
-		state_var<netlist_sig_t> m_ent;
+		state_var_u8 m_cnt;
+		state_var_u8 m_loadq;
+		state_var_u8 m_ent;
 	};
 
 	NETLIB_OBJECT(9316)
@@ -207,7 +207,7 @@ namespace netlist
 		}
 	}
 
-	inline NETLIB_FUNC_VOID(9316_sub, update_outputs_all, (const UINT8 cnt, const netlist_time out_delay))
+	inline NETLIB_FUNC_VOID(9316_sub, update_outputs_all, (const uint_fast8_t cnt, const netlist_time out_delay))
 	{
 		OUTLOGIC(m_QA, (cnt >> 0) & 1, out_delay);
 		OUTLOGIC(m_QB, (cnt >> 1) & 1, out_delay);
@@ -215,7 +215,7 @@ namespace netlist
 		OUTLOGIC(m_QD, (cnt >> 3) & 1, out_delay);
 	}
 
-	inline NETLIB_FUNC_VOID(9316_sub, update_outputs, (const UINT8 cnt))
+	inline NETLIB_FUNC_VOID(9316_sub, update_outputs, (const uint_fast8_t cnt))
 	{
 		/* static */ const netlist_time out_delay = NLTIME_FROM_NS(20);
 	#if 0
diff --git a/src/lib/netlist/devices/nld_legacy.cpp b/src/lib/netlist/devices/nld_legacy.cpp
index f3675468513..1f16dbe97b8 100644
--- a/src/lib/netlist/devices/nld_legacy.cpp
+++ b/src/lib/netlist/devices/nld_legacy.cpp
@@ -57,7 +57,7 @@ namespace netlist
 		param_int_t m_L_to_H;
 		param_int_t m_H_to_L;
 
-		state_var<UINT8> m_last;
+		state_var_u8 m_last;
 	};
 
 	NETLIB_RESET(nicRSFF)
diff --git a/src/lib/netlist/devices/nld_mm5837.cpp b/src/lib/netlist/devices/nld_mm5837.cpp
index c41c58adbae..d86fc90b0d7 100644
--- a/src/lib/netlist/devices/nld_mm5837.cpp
+++ b/src/lib/netlist/devices/nld_mm5837.cpp
@@ -61,7 +61,7 @@ namespace netlist
 		const netlist_time m_inc;
 
 		/* state */
-		state_var<UINT32> m_shift;
+		state_var_u32 m_shift;
 
 		/* cache */
 		bool m_is_timestep;
@@ -87,10 +87,10 @@ namespace netlist
 		 *
 		 */
 
-		const UINT32 last_state = m_shift & 0x01;
+		const auto last_state = m_shift & 0x01;
 		/* shift */
 		m_shift = (m_shift >> 1) | (((m_shift & 0x01) ^ ((m_shift >> 3) & 0x01)) << 16);
-		const UINT32 state = m_shift & 0x01;
+		const auto state = m_shift & 0x01;
 
 		if (state != last_state)
 		{
diff --git a/src/lib/netlist/devices/nld_truthtable.cpp b/src/lib/netlist/devices/nld_truthtable.cpp
index 5aaa14c0fef..9ed524e58b1 100644
--- a/src/lib/netlist/devices/nld_truthtable.cpp
+++ b/src/lib/netlist/devices/nld_truthtable.cpp
@@ -32,11 +32,11 @@ namespace netlist
 		typename nld_truthtable_t<m_NI, m_NO, has_state>::truthtable_t m_ttbl;
 	};
 
-	static const uint64_t all_set = ~((uint64_t) 0);
+	static const uint_least64_t all_set = ~((uint_least64_t) 0);
 
-unsigned truthtable_desc_t::count_bits(uint64_t v)
+unsigned truthtable_desc_t::count_bits(uint_least64_t v)
 {
-	uint64_t ret = 0;
+	uint_least64_t ret = 0;
 	for (; v != 0; v = v >> 1)
 	{
 		ret += (v & 1);
@@ -44,9 +44,9 @@ unsigned truthtable_desc_t::count_bits(uint64_t v)
 	return ret;
 }
 
-uint64_t truthtable_desc_t::set_bits(uint64_t v, uint64_t b)
+uint_least64_t truthtable_desc_t::set_bits(uint_least64_t v, uint_least64_t b)
 {
-	uint64_t ret = 0;
+	uint_least64_t ret = 0;
 	for (size_t i = 0; v != 0; v = v >> 1, ++i)
 	{
 		if (v & 1)
@@ -58,9 +58,9 @@ uint64_t truthtable_desc_t::set_bits(uint64_t v, uint64_t b)
 	return ret;
 }
 
-uint64_t truthtable_desc_t::get_ignored_simple(uint64_t i)
+uint_least64_t truthtable_desc_t::get_ignored_simple(uint_least64_t i)
 {
-	uint64_t m_enable = 0;
+	uint_least64_t m_enable = 0;
 	for (size_t j=0; j<m_size; j++)
 	{
 		if (m_outs[j] != m_outs[i])
@@ -71,10 +71,10 @@ uint64_t truthtable_desc_t::get_ignored_simple(uint64_t i)
 	return m_enable ^ (m_size - 1);
 }
 
-uint64_t truthtable_desc_t::get_ignored_extended(uint64_t state)
+uint_least64_t truthtable_desc_t::get_ignored_extended(uint_least64_t state)
 {
 	// Determine all inputs which may be ignored ...
-	uint64_t ignore = 0;
+	uint_least64_t ignore = 0;
 	for (unsigned j=0; j<m_NI; j++)
 	{
 		if (m_outs[state] == m_outs[state ^ (1 << j)])
@@ -84,17 +84,17 @@ uint64_t truthtable_desc_t::get_ignored_extended(uint64_t state)
 	 * We have to remove those where the ignored inputs
 	 * may change the output
 	 */
-	uint64_t bits = (1<<count_bits(ignore));
+	uint_least64_t bits = (1<<count_bits(ignore));
 	std::vector<bool> t(bits);
 
 	for (size_t j=1; j<bits; j++)
 	{
-		uint64_t tign = set_bits(ignore, j);
+		uint_least64_t tign = set_bits(ignore, j);
 		t[j] = 0;
-		uint64_t bitsk=(1<<count_bits(tign));
+		uint_least64_t bitsk=(1<<count_bits(tign));
 		for (size_t k=0; k<bitsk; k++)
 		{
-			uint64_t b=set_bits(tign, k);
+			uint_least64_t b=set_bits(tign, k);
 			if (m_outs[state] != m_outs[(state & ~tign) | b])
 			{
 				t[j] = 1;
@@ -104,7 +104,7 @@ uint64_t truthtable_desc_t::get_ignored_extended(uint64_t state)
 	}
 	size_t jb=0;
 	size_t jm=0;
-	for (UINT32 j=1; j<bits; j++)
+	for (size_t j=1; j<bits; j++)
 	{
 		size_t nb = count_bits(j);
 		if ((t[j] == 0) && (nb>jb))
@@ -121,7 +121,7 @@ uint64_t truthtable_desc_t::get_ignored_extended(uint64_t state)
 // ----------------------------------------------------------------------------------------
 
 void truthtable_desc_t::help(unsigned cur, plib::pstring_vector_t list,
-		uint64_t state, uint64_t val, std::vector<uint8_t> &timing_index)
+		uint_least64_t state, uint_least64_t val, std::vector<uint_least8_t> &timing_index)
 {
 	pstring elem = list[cur].trim();
 	int start = 0;
@@ -146,7 +146,7 @@ void truthtable_desc_t::help(unsigned cur, plib::pstring_vector_t list,
 		nl_assert_always(false, "unknown input value (not 0, 1, or X)");
 	for (int i = start; i <= end; i++)
 	{
-		const UINT64 nstate = state | (i << cur);
+		const uint_least64_t nstate = state | (i << cur);
 
 		if (cur < m_num_bits - 1)
 		{
@@ -165,7 +165,7 @@ void truthtable_desc_t::help(unsigned cur, plib::pstring_vector_t list,
 	}
 }
 
-void truthtable_desc_t::setup(const plib::pstring_vector_t &truthtable, UINT32 disabled_ignore)
+void truthtable_desc_t::setup(const plib::pstring_vector_t &truthtable, uint_least64_t disabled_ignore)
 {
 	unsigned line = 0;
 
@@ -195,8 +195,8 @@ void truthtable_desc_t::setup(const plib::pstring_vector_t &truthtable, UINT32 d
 		plib::pstring_vector_t times(io[2], ",");
 		nl_assert_always(times.size() == m_NO, "timing count not matching");
 
-		UINT16 val = 0;
-		std::vector<UINT8> tindex;
+		uint_least64_t val = 0;
+		std::vector<uint_least8_t> tindex;
 
 		for (unsigned j=0; j<m_NO; j++)
 		{
@@ -222,7 +222,7 @@ void truthtable_desc_t::setup(const plib::pstring_vector_t &truthtable, UINT32 d
 	}
 
 	// determine ignore
-	std::vector<uint64_t> ign(m_size, all_set);
+	std::vector<uint_least64_t> ign(m_size, all_set);
 
 	for (size_t i=0; i<m_size; i++)
 	{
@@ -240,10 +240,10 @@ void truthtable_desc_t::setup(const plib::pstring_vector_t &truthtable, UINT32 d
 
 				ign[i] = tign;
 				/* don't need to recalculate similar ones */
-				uint64_t bitsk=(1<<count_bits(tign));
-				for (uint64_t k=0; k<bitsk; k++)
+				uint_least64_t bitsk=(1<<count_bits(tign));
+				for (uint_least64_t k=0; k<bitsk; k++)
 				{
-					uint64_t b=set_bits(tign, k);
+					uint_least64_t b=set_bits(tign, k);
 					ign[(i & ~tign) | b] = tign;
 				}
 			}
diff --git a/src/lib/netlist/devices/nld_truthtable.h b/src/lib/netlist/devices/nld_truthtable.h
index d7d431f20d7..d30ff03704c 100644
--- a/src/lib/netlist/devices/nld_truthtable.h
+++ b/src/lib/netlist/devices/nld_truthtable.h
@@ -64,10 +64,10 @@ namespace netlist
 	};
 
 	template<unsigned bits> struct uint_for_size;
-	template<> struct uint_for_size<1> { typedef uint8_t type; };
-	template<> struct uint_for_size<2> { typedef uint16_t type; };
-	template<> struct uint_for_size<4> { typedef uint32_t type; };
-	template<> struct uint_for_size<8> { typedef uint64_t type; };
+	template<> struct uint_for_size<1> { typedef uint_least8_t type; };
+	template<> struct uint_for_size<2> { typedef uint_least16_t type; };
+	template<> struct uint_for_size<4> { typedef uint_least32_t type; };
+	template<> struct uint_for_size<8> { typedef uint_least64_t type; };
 
 	struct packed_int
 	{
@@ -77,39 +77,39 @@ namespace netlist
 		, m_size(sizeof(C))
 		{}
 
-		void set(const size_t pos, const uint64_t val)
+		void set(const size_t pos, const uint_least64_t val)
 		{
 			switch (m_size)
 			{
-				case 1: ((uint8_t *) m_data)[pos] = val; break;
-				case 2: ((uint16_t *) m_data)[pos] = val; break;
-				case 4: ((uint32_t *) m_data)[pos] = val; break;
-				case 8: ((uint64_t *) m_data)[pos] = val; break;
+				case 1: ((uint_least8_t *) m_data)[pos] = val; break;
+				case 2: ((uint_least16_t *) m_data)[pos] = val; break;
+				case 4: ((uint_least32_t *) m_data)[pos] = val; break;
+				case 8: ((uint_least64_t *) m_data)[pos] = val; break;
 				default: { }
 			}
 		}
 
-		UINT64 operator[] (size_t pos) const
+		uint_least64_t operator[] (size_t pos) const
 		{
 			switch (m_size)
 			{
-				case 1: return ((uint8_t *) m_data)[pos]; break;
-				case 2: return ((uint16_t *) m_data)[pos]; break;
-				case 4: return ((uint32_t *) m_data)[pos]; break;
-				case 8: return ((uint64_t *) m_data)[pos]; break;
+				case 1: return ((uint_least8_t *) m_data)[pos]; break;
+				case 2: return ((uint_least16_t *) m_data)[pos]; break;
+				case 4: return ((uint_least32_t *) m_data)[pos]; break;
+				case 8: return ((uint_least64_t *) m_data)[pos]; break;
 				default:
 					return 0; //should never happen
 			}
 		}
 
-		uint64_t adjust(uint64_t val) const
+		uint_least64_t adjust(uint_least64_t val) const
 		{
 			switch (m_size)
 			{
-				case 1: return ((uint8_t) val); break;
-				case 2: return ((uint16_t) val); break;
-				case 4: return ((uint32_t) val); break;
-				case 8: return ((uint64_t) val); break;
+				case 1: return ((uint_least8_t) val); break;
+				case 2: return ((uint_least16_t) val); break;
+				case 4: return ((uint_least32_t) val); break;
+				case 8: return ((uint_least64_t) val); break;
 				default:
 					return 0; //should never happen
 			}
@@ -122,7 +122,7 @@ namespace netlist
 	struct truthtable_desc_t
 	{
 		truthtable_desc_t(int NO, int NI, int has_state, bool *initialized,
-				packed_int outs, UINT8 *timing, netlist_time *timing_nt)
+				packed_int outs, uint_least8_t *timing, netlist_time *timing_nt)
 		: m_NO(NO), m_NI(NI), /*m_has_state(has_state),*/ m_initialized(initialized),
 			m_outs(outs), m_timing(timing), m_timing_nt(timing_nt),
 			m_num_bits(m_NI + has_state * (m_NI + m_NO)),
@@ -130,21 +130,21 @@ namespace netlist
 		{
 		}
 
-		void setup(const plib::pstring_vector_t &desc, UINT32 disabled_ignore);
+		void setup(const plib::pstring_vector_t &desc, uint_least64_t disabled_ignore);
 
 	private:
 		void help(unsigned cur, plib::pstring_vector_t list,
-				uint64_t state, uint64_t val, std::vector<uint8_t> &timing_index);
-		static unsigned count_bits(uint64_t v);
-		static uint64_t set_bits(uint64_t v, uint64_t b);
-		uint64_t get_ignored_simple(uint64_t i);
-		uint64_t get_ignored_extended(uint64_t i);
+				uint_least64_t state, uint_least64_t val, std::vector<uint_least8_t> &timing_index);
+		static unsigned count_bits(uint_least64_t v);
+		static uint_least64_t set_bits(uint_least64_t v, uint_least64_t b);
+		uint_least64_t get_ignored_simple(uint_least64_t i);
+		uint_least64_t get_ignored_extended(uint_least64_t i);
 
 		unsigned m_NO;
 		unsigned m_NI;
 		bool *m_initialized;
 		packed_int m_outs;
-		uint8_t  *m_timing;
+		uint_least8_t  *m_timing;
 		netlist_time *m_timing_nt;
 
 		/* additional values */
@@ -171,7 +171,7 @@ namespace netlist
 			{}
 			bool m_initialized;
 			typename uint_for_size<need_bytes_for_bits<m_NO + m_NI>::value>::type m_outs[m_size];
-			UINT8  m_timing[m_size * m_NO];
+			uint_least8_t m_timing[m_size * m_NO];
 			netlist_time m_timing_nt[16];
 		};
 
@@ -233,7 +233,7 @@ namespace netlist
 			}
 			// Connect output "Q" to input "_Q" if this exists
 			// This enables timed state without having explicit state ....
-			UINT32 disabled_ignore = 0;
+			uint_least64_t disabled_ignore = 0;
 			for (std::size_t i=0; i < m_NO; i++)
 			{
 				pstring tmp = "_" + out[i];
@@ -321,7 +321,7 @@ namespace netlist
 		{
 			netlist_time mt = netlist_time::zero();
 
-			uint64_t state = 0;
+			uint_least64_t state = 0;
 			if (m_NI > 1 && !m_has_state)
 			{
 				auto ign = m_ign;
@@ -385,9 +385,10 @@ namespace netlist
 			}
 		}
 
-		state_var<UINT32> m_last_state;
-		state_var<UINT32> m_ign;
-		state_var<INT32>  m_active;
+		/* FIXME: check width */
+		state_var_u32 m_last_state;
+		state_var_u32 m_ign;
+		state_var_s32  m_active;
 		param_logic_t     m_use_deactivate;
 		truthtable_t *m_ttp;
 		plib::pstring_vector_t m_desc;
diff --git a/src/lib/netlist/devices/nlid_system.h b/src/lib/netlist/devices/nlid_system.h
index 6b681aa6abd..e0eba516e5e 100644
--- a/src/lib/netlist/devices/nlid_system.h
+++ b/src/lib/netlist/devices/nlid_system.h
@@ -415,7 +415,7 @@ namespace netlist
 
 	private:
 
-		state_var<UINT8> m_last_state;
+		state_var_u8 m_last_state;
 	};
 
 	// -----------------------------------------------------------------------------
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 1d4b5b261c4..01d106d79b9 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -171,7 +171,7 @@
 // Type definitions
 // ----------------------------------------------------------------------------------------
 
-using netlist_sig_t = std::uint32_t;
+using netlist_sig_t = std::uint_least32_t;
 
  //============================================================
  //  MACROS / New Syntax
@@ -920,8 +920,8 @@ namespace netlist
 	#if (NL_KEEP_STATISTICS)
 		/* stats */
 		plib::ticks_t stat_total_time;
-		INT32 stat_update_count;
-		INT32 stat_call_count;
+		int_fast32_t stat_update_count;
+		int_fast32_t stat_call_count;
 	#endif
 
 	protected:
diff --git a/src/lib/netlist/nl_config.h b/src/lib/netlist/nl_config.h
index 04e1f0e14c2..19d8e3561ad 100644
--- a/src/lib/netlist/nl_config.h
+++ b/src/lib/netlist/nl_config.h
@@ -8,6 +8,8 @@
 #ifndef NLCONFIG_H_
 #define NLCONFIG_H_
 
+#include <cstdint>
+
 #include "plib/pconfig.h"
 
 //============================================================
@@ -137,8 +139,8 @@
 #endif // !defined(USE_OPENMP)
 
 // Use nano-second resolution - Sufficient for now
-#define NETLIST_INTERNAL_RES        (U64(1000000000))
-//#define NETLIST_INTERNAL_RES      (U64(1000000000000))
+#define NETLIST_INTERNAL_RES        (UINT64_C(1000000000))
+//#define NETLIST_INTERNAL_RES      (UINT64_C(1000000000000))
 
 #define NETLIST_CLOCK               (NETLIST_INTERNAL_RES)
 
diff --git a/src/lib/netlist/nl_time.h b/src/lib/netlist/nl_time.h
index 25c488ccf69..0a4caac1ac6 100644
--- a/src/lib/netlist/nl_time.h
+++ b/src/lib/netlist/nl_time.h
@@ -7,6 +7,8 @@
 #ifndef NLTIME_H_
 #define NLTIME_H_
 
+#include <cstdint>
+
 #include "nl_config.h"
 #include "plib/pstate.h"
 
@@ -31,6 +33,7 @@ namespace netlist
 	public:
 
 		using internal_type = TYPE;
+		using mult_type = std::uint_fast64_t;
 		static constexpr internal_type resolution = RES;
 
 		constexpr ptime() NOEXCEPT : m_time(0) {}
@@ -59,15 +62,15 @@ namespace netlist
 			return lhs;
 		}
 
-		friend ptime operator*(ptime lhs, const UINT64 factor)
+		friend ptime operator*(ptime lhs, const mult_type factor)
 		{
 			lhs.m_time *= static_cast<internal_type>(factor);
 			return lhs;
 		}
 
-		friend UINT64 operator/(const ptime &lhs, const ptime &rhs)
+		friend mult_type operator/(const ptime &lhs, const ptime &rhs)
 		{
-			return static_cast<UINT64>(lhs.m_time / rhs.m_time);
+			return static_cast<mult_type>(lhs.m_time / rhs.m_time);
 		}
 
 		friend bool operator<(const ptime &lhs, const ptime &rhs)
@@ -106,9 +109,9 @@ namespace netlist
 		// for save states ....
 		internal_type *get_internaltype_ptr() { return &m_time; }
 
-		static inline constexpr ptime from_nsec(const internal_type ns) { return ptime(ns, U64(1000000000)); }
-		static inline constexpr ptime from_usec(const internal_type us) { return ptime(us, U64(1000000)); }
-		static inline constexpr ptime from_msec(const internal_type ms) { return ptime(ms, U64(1000)); }
+		static inline constexpr ptime from_nsec(const internal_type ns) { return ptime(ns, UINT64_C(1000000000)); }
+		static inline constexpr ptime from_usec(const internal_type us) { return ptime(us, UINT64_C(1000000)); }
+		static inline constexpr ptime from_msec(const internal_type ms) { return ptime(ms, UINT64_C(1000)); }
 		static inline constexpr ptime from_hz(const internal_type hz) { return ptime(1 , hz); }
 		static inline constexpr ptime from_raw(const internal_type raw) { return ptime(raw, resolution); }
 		static inline constexpr ptime from_double(const double t) { return ptime((internal_type) ( t * (double) resolution), resolution); }
@@ -123,7 +126,7 @@ namespace netlist
 #if (PHAS_INT128)
 	using netlist_time = ptime<UINT128, NETLIST_INTERNAL_RES>;
 #else
-	using netlist_time = ptime<UINT64, NETLIST_INTERNAL_RES>;
+	using netlist_time = ptime<std::uint_fast64_t, NETLIST_INTERNAL_RES>;
 #endif
 }
 
diff --git a/src/lib/netlist/plib/pconfig.h b/src/lib/netlist/plib/pconfig.h
index 4d9f77b5a6a..c70e45d0e96 100644
--- a/src/lib/netlist/plib/pconfig.h
+++ b/src/lib/netlist/plib/pconfig.h
@@ -27,21 +27,13 @@ typedef __uint128_t UINT128;
 typedef __int128_t INT128;
 #endif
 
-#if !(PSTANDALONE)
-#include "osdcomm.h"
-//#include "eminline.h"
-
-#ifndef assert
-#define assert(x) do {} while (0)
-#endif
-
-#include "delegate.h"
-
+#if defined(__GNUC__)
+#define RESTRICT                __restrict__
+#define ATTR_UNUSED             __attribute__((__unused__))
 #else
-#include <stdint.h>
+#define RESTRICT
+#define ATTR_UNUSED
 #endif
-#include <cstddef>
-
 
 //============================================================
 //  Standard defines
@@ -54,27 +46,15 @@ typedef __int128_t INT128;
 		name &operator=(const name &);
 
 //============================================================
-//  Compiling standalone
+//  cut down delegate implementation
 //============================================================
 
-#if !(PSTANDALONE)
-
-/* use MAME */
-#if (USE_DELEGATE_TYPE == DELEGATE_TYPE_INTERNAL)
-#define PHAS_PMF_INTERNAL 1
-#else
-#define PHAS_PMF_INTERNAL 0
-#endif
-
-#else
-
-/* determine PMF approach */
-
 #if defined(__GNUC__)
-	/* does not work in versions over 4.7.x of 32bit MINGW  */
-	#if defined(__MINGW32__) && !defined(__x86_64) && defined(__i386__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)))
+	#if defined(__MINGW32__) && !defined(__x86_64) && defined(__i386__)
 		#define PHAS_PMF_INTERNAL 1
 		#define MEMBER_ABI _thiscall
+	#elif defined(__clang__) && defined(__i386__) && defined(_WIN32)
+		#define PHAS_PMF_INTERNAL 0
 	#elif defined(EMSCRIPTEN)
 		#define PHAS_PMF_INTERNAL 0
 	#elif defined(__arm__) || defined(__ARMEL__)
@@ -83,56 +63,16 @@ typedef __int128_t INT128;
 		#define PHAS_PMF_INTERNAL 1
 	#endif
 #else
-#define PHAS_PMF_INTERNAL 0
+	#define PHAS_PMF_INTERNAL 0
 #endif
 
 #ifndef MEMBER_ABI
 	#define MEMBER_ABI
 #endif
 
-#define RESTRICT                __restrict__
-#define ATTR_PRINTF(x,y)        __attribute__((format(printf, x, y)))
-#define ATTR_UNUSED             __attribute__((__unused__))
-
-/* 8-bit values */
-typedef unsigned char                       UINT8;
-typedef signed char                         INT8;
-
-/* 16-bit values */
-typedef unsigned short                      UINT16;
-typedef signed short                        INT16;
-
-/* 32-bit values */
-#ifndef WINDOWS_H
-typedef unsigned int                        UINT32;
-typedef signed int                          INT32;
-#endif
-
-/* 64-bit values */
-#ifndef WINDOWS_H
-#ifdef _MSC_VER
-typedef signed _int64                      INT64;
-typedef unsigned _int64                    UINT64;
-#else
-typedef uint64_t    UINT64;
-typedef int64_t      INT64;
-#endif
-#endif
-
-/* U64 and S64 are used to wrap long integer constants. */
-#if defined(__GNUC__) || defined(_MSC_VER)
-#define U64(val) val##ULL
-#define S64(val) val##LL
-#else
-#define U64(val) val
-#define S64(val) val
-#endif
-
-#endif
-
 namespace plib {
 
-using ticks_t = INT64;
+using ticks_t = int64_t;
 
 static inline ticks_t ticks()
 {
diff --git a/src/lib/netlist/plib/pparser.h b/src/lib/netlist/plib/pparser.h
index ebf8d1630d1..e6b6dd8f989 100644
--- a/src/lib/netlist/plib/pparser.h
+++ b/src/lib/netlist/plib/pparser.h
@@ -9,6 +9,7 @@
 #define PPARSER_H_
 
 #include <unordered_map>
+#include <cstdint>
 
 #include "pconfig.h"
 #include "pstring.h"
@@ -194,8 +195,7 @@ private:
 	std::unordered_map<pstring, define_t> m_defines;
 	plib::pstring_vector_t m_expr_sep;
 
-	//pstringbuffer m_ret;
-	UINT32 m_ifflag; // 31 if levels
+	std::uint_least32_t m_ifflag; // 31 if levels
 	int m_level;
 	int m_lineno;
 };
diff --git a/src/lib/netlist/plib/pstream.cpp b/src/lib/netlist/plib/pstream.cpp
index 8b09f58fc03..431ae4c7cce 100644
--- a/src/lib/netlist/plib/pstream.cpp
+++ b/src/lib/netlist/plib/pstream.cpp
@@ -21,7 +21,7 @@ namespace plib {
 
 bool pistream::readline(pstring &line)
 {
-	UINT8 c = 0;
+	char c = 0;
 	pstringbuffer buf;
 	if (!this->read(c))
 	{
diff --git a/src/lib/netlist/plib/pstream.h b/src/lib/netlist/plib/pstream.h
index 9da07105df6..42379a7da4b 100644
--- a/src/lib/netlist/plib/pstream.h
+++ b/src/lib/netlist/plib/pstream.h
@@ -108,7 +108,7 @@ public:
 
 	bool readline(pstring &line);
 
-	bool read(UINT8 &c)
+	bool read(char &c)
 	{
 		return (read(&c, 1) == 1);
 	}
diff --git a/src/lib/netlist/plib/pstring.cpp b/src/lib/netlist/plib/pstring.cpp
index cb8011734b4..f6dff95fb12 100644
--- a/src/lib/netlist/plib/pstring.cpp
+++ b/src/lib/netlist/plib/pstring.cpp
@@ -374,8 +374,8 @@ pstr_t *pstring_t<F>::salloc(int n)
 	if (stk == nullptr)
 		stk = plib::palloc_array<std::stack<pstr_t *>>(17);
 	pstr_t *p;
-	unsigned sn= ((32 - countleadbits(n)) + 1) / 2;
-	unsigned size = sizeof(pstr_t) + ((UINT64) 1<<(sn * 2)) + 1;
+	std::size_t sn= ((32 - countleadbits(n)) + 1) / 2;
+	std::size_t size = sizeof(pstr_t) + ((std::size_t) 1<<(sn * 2)) + 1;
 	if (stk[sn].empty())
 		p = (pstr_t *) plib::palloc_array<char>(size);
 	else
diff --git a/src/lib/netlist/plib/pstring.h b/src/lib/netlist/plib/pstring.h
index 72462f9992e..2356acec3d0 100644
--- a/src/lib/netlist/plib/pstring.h
+++ b/src/lib/netlist/plib/pstring.h
@@ -344,7 +344,7 @@ public:
 	operator pstring() const { return pstring(m_ptr); }
 
 	// concatenation operators
-	pstringbuffer& operator+=(const UINT8 c) { UINT8 buf[2] = { c, 0 }; pcat((char *) buf); return *this; }
+	pstringbuffer& operator+=(const char c) { char buf[2] = { c, 0 }; pcat(buf); return *this; }
 	pstringbuffer& operator+=(const pstring &string) { pcat(string); return *this; }
 	pstringbuffer& operator+=(const char *string) { pcat(string); return *this; }
 
diff --git a/src/lib/netlist/plib/ptypes.h b/src/lib/netlist/plib/ptypes.h
index 6c66153c549..4abfad4fb83 100644
--- a/src/lib/netlist/plib/ptypes.h
+++ b/src/lib/netlist/plib/ptypes.h
@@ -27,14 +27,14 @@ namespace plib
 	{
 		static inline constexpr UINT128 max()
 		{
-			return ~((UINT64)0);
+			return ~((UINT128)0);
 		}
 	};
 	template<> struct numeric_limits<INT128>
 	{
 		static inline constexpr INT128 max()
 		{
-			return (~((UINT64)0)) >> 1;
+			return (~((UINT128)0)) >> 1;
 		}
 	};
 #endif

From 5c8a6149abae54508dba4dfebc6d06e4c0fb5b63 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Tue, 14 Jun 2016 21:44:59 +0200
Subject: [PATCH 21/39] Fix previous commit. (nw)

---
 src/devices/machine/netlist.cpp          |  3 --
 src/lib/netlist/devices/nld_7490.cpp     |  6 ---
 src/lib/netlist/devices/nld_7493.cpp     |  5 --
 src/lib/netlist/devices/nld_82S16.cpp    |  6 ---
 src/lib/netlist/devices/nld_9310.cpp     |  7 +--
 src/lib/netlist/devices/nld_9316.cpp     |  8 +--
 src/lib/netlist/devices/nld_legacy.cpp   |  4 --
 src/lib/netlist/devices/nld_mm5837.cpp   |  4 --
 src/lib/netlist/devices/nld_truthtable.h | 13 -----
 src/lib/netlist/devices/nlid_system.h    |  9 ----
 src/lib/netlist/nl_base.cpp              | 20 -------
 src/lib/netlist/nl_base.h                | 69 ++----------------------
 src/lib/netlist/nl_time.h                | 23 --------
 src/lib/netlist/plib/pparser.h           |  3 --
 src/lib/netlist/plib/pstate.h            | 12 -----
 src/lib/netlist/plib/putil.h             |  4 --
 16 files changed, 8 insertions(+), 188 deletions(-)

diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp
index 5b67845a204..7160b696b52 100644
--- a/src/devices/machine/netlist.cpp
+++ b/src/devices/machine/netlist.cpp
@@ -460,13 +460,10 @@ ATTR_COLD void netlist_mame_device_t::save_state()
 				save_pointer((INT16 *) s->m_ptr, s->m_name.cstr(), s->m_count);
 			else if (s->m_dt.size == sizeof(INT8))
 				save_pointer((INT8 *) s->m_ptr, s->m_name.cstr(), s->m_count);
-<<<<<<< HEAD
 #if (PHAS_INT128)
 			else if (s->m_dt.size == sizeof(INT128))
 				save_pointer((INT64 *) s->m_ptr, s->m_name.cstr(), s->m_count * 2);
 #endif
-=======
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 			else
 				netlist().log().fatal("Unknown integral type size {1} for {2}\n", s->m_dt.size, s->m_name.cstr());
 		}
diff --git a/src/lib/netlist/devices/nld_7490.cpp b/src/lib/netlist/devices/nld_7490.cpp
index e1695ae88ce..22deac2ea9a 100644
--- a/src/lib/netlist/devices/nld_7490.cpp
+++ b/src/lib/netlist/devices/nld_7490.cpp
@@ -41,15 +41,9 @@ namespace netlist
 		logic_input_t m_R91;
 		logic_input_t m_R92;
 
-<<<<<<< HEAD
 		state_var_u8 m_cnt;
 		state_var_u8 m_last_A;
 		state_var_u8 m_last_B;
-=======
-		state_var<UINT8> m_cnt;
-		state_var<UINT8> m_last_A;
-		state_var<UINT8> m_last_B;
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 
 		object_array_t<logic_output_t, 4> m_Q;
 	};
diff --git a/src/lib/netlist/devices/nld_7493.cpp b/src/lib/netlist/devices/nld_7493.cpp
index c148f0228bf..8a12333e596 100644
--- a/src/lib/netlist/devices/nld_7493.cpp
+++ b/src/lib/netlist/devices/nld_7493.cpp
@@ -31,13 +31,8 @@ namespace netlist
 		logic_input_t m_I;
 		logic_output_t m_Q;
 
-<<<<<<< HEAD
 		state_var_u8 m_reset;
 		state_var_u8 m_state;
-=======
-		state_var<UINT8> m_reset;
-		state_var<UINT8> m_state;
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 	};
 
 	NETLIB_OBJECT(7493)
diff --git a/src/lib/netlist/devices/nld_82S16.cpp b/src/lib/netlist/devices/nld_82S16.cpp
index 9f06ba09d97..a5992909b02 100644
--- a/src/lib/netlist/devices/nld_82S16.cpp
+++ b/src/lib/netlist/devices/nld_82S16.cpp
@@ -38,13 +38,7 @@ namespace netlist
 		logic_input_t m_DIN;
 		logic_output_t m_DOUTQ;
 
-<<<<<<< HEAD
-		//netlist_state_t<NLUINT8[256]> m_ram;
 		state_var<uint_fast64_t[4]> m_ram; // 256 bits
-=======
-		//netlist_state_t<UINT8[256]> m_ram;
-		state_var<UINT64[4]> m_ram; // 256 bits
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 	};
 
 	NETLIB_OBJECT_DERIVED(82S16_dip, 82S16)
diff --git a/src/lib/netlist/devices/nld_9310.cpp b/src/lib/netlist/devices/nld_9310.cpp
index 6f674f6e5bc..ba53394ef8d 100644
--- a/src/lib/netlist/devices/nld_9310.cpp
+++ b/src/lib/netlist/devices/nld_9310.cpp
@@ -70,15 +70,10 @@ namespace netlist
 		logic_output_t m_QC;
 		logic_output_t m_QD;
 		logic_output_t m_RC;
-<<<<<<< HEAD
+
 		state_var_u8 m_cnt;
 		state_var_u8 m_loadq;
 		state_var_u8 m_ent;
-=======
-		state_var<UINT8> m_cnt;
-		state_var<netlist_sig_t> m_loadq;
-		state_var<netlist_sig_t> m_ent;
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 	};
 
 	NETLIB_OBJECT(9310)
diff --git a/src/lib/netlist/devices/nld_9316.cpp b/src/lib/netlist/devices/nld_9316.cpp
index d877bce0b40..8c6b70c5810 100644
--- a/src/lib/netlist/devices/nld_9316.cpp
+++ b/src/lib/netlist/devices/nld_9316.cpp
@@ -72,15 +72,11 @@ namespace netlist
 		logic_output_t m_RC;
 
 		NETLIB_NAME(9316_subABCD) *m_ABCD;
-<<<<<<< HEAD
+
 		state_var_u8 m_cnt;
 		state_var_u8 m_loadq;
 		state_var_u8 m_ent;
-=======
-		state_var<UINT8> m_cnt;
-		state_var<netlist_sig_t> m_loadq;
-		state_var<netlist_sig_t> m_ent;
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
+
 	};
 
 	NETLIB_OBJECT(9316)
diff --git a/src/lib/netlist/devices/nld_legacy.cpp b/src/lib/netlist/devices/nld_legacy.cpp
index 9dc082a5d22..1f16dbe97b8 100644
--- a/src/lib/netlist/devices/nld_legacy.cpp
+++ b/src/lib/netlist/devices/nld_legacy.cpp
@@ -57,11 +57,7 @@ namespace netlist
 		param_int_t m_L_to_H;
 		param_int_t m_H_to_L;
 
-<<<<<<< HEAD
 		state_var_u8 m_last;
-=======
-		state_var<UINT8> m_last;
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 	};
 
 	NETLIB_RESET(nicRSFF)
diff --git a/src/lib/netlist/devices/nld_mm5837.cpp b/src/lib/netlist/devices/nld_mm5837.cpp
index 00ad0fe3db8..d86fc90b0d7 100644
--- a/src/lib/netlist/devices/nld_mm5837.cpp
+++ b/src/lib/netlist/devices/nld_mm5837.cpp
@@ -61,11 +61,7 @@ namespace netlist
 		const netlist_time m_inc;
 
 		/* state */
-<<<<<<< HEAD
 		state_var_u32 m_shift;
-=======
-		state_var<UINT32> m_shift;
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 
 		/* cache */
 		bool m_is_timestep;
diff --git a/src/lib/netlist/devices/nld_truthtable.h b/src/lib/netlist/devices/nld_truthtable.h
index 792f6803559..d30ff03704c 100644
--- a/src/lib/netlist/devices/nld_truthtable.h
+++ b/src/lib/netlist/devices/nld_truthtable.h
@@ -183,10 +183,7 @@ namespace netlist
 		, m_last_state(*this, "m_last_state", 0)
 		, m_ign(*this, "m_ign", 0)
 		, m_active(*this, "m_active", 1)
-<<<<<<< HEAD
 		, m_use_deactivate(*this, "USE_DEACTIVATE", true)
-=======
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 		, m_ttp(ttp)
 		{
 			while (*desc != nullptr && **desc != 0 )
@@ -205,10 +202,7 @@ namespace netlist
 		, m_last_state(*this, "m_last_state", 0)
 		, m_ign(*this, "m_ign", 0)
 		, m_active(*this, "m_active", 1)
-<<<<<<< HEAD
 		, m_use_deactivate(*this, "USE_DEACTIVATE", true)
-=======
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 		, m_ttp(ttp)
 		{
 			m_desc = desc;
@@ -391,18 +385,11 @@ namespace netlist
 			}
 		}
 
-<<<<<<< HEAD
 		/* FIXME: check width */
 		state_var_u32 m_last_state;
 		state_var_u32 m_ign;
 		state_var_s32  m_active;
 		param_logic_t     m_use_deactivate;
-=======
-		state_var<UINT32> m_last_state;
-		state_var<UINT32> m_ign;
-		state_var<INT32> m_active;
-
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 		truthtable_t *m_ttp;
 		plib::pstring_vector_t m_desc;
 	};
diff --git a/src/lib/netlist/devices/nlid_system.h b/src/lib/netlist/devices/nlid_system.h
index 3d3afbe7df2..7f5aeb7cdb9 100644
--- a/src/lib/netlist/devices/nlid_system.h
+++ b/src/lib/netlist/devices/nlid_system.h
@@ -313,11 +313,7 @@ namespace netlist
 		, m_Q(*this, "Q")
 		{
 
-<<<<<<< HEAD
 			for (int i=0; i < m_N; i++)
-=======
-			for (std::size_t i=0; i < m_N; i++)
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 				m_I.push_back(plib::make_unique<analog_input_t>(*this, plib::pfmt("A{1}")(i)));
 
 			plib::pstring_vector_t cmds(m_func.Value(), " ");
@@ -418,12 +414,7 @@ namespace netlist
 		NETLIB_UPDATEI();
 
 	private:
-
-<<<<<<< HEAD
 		state_var_u8 m_last_state;
-=======
-		state_var<UINT8> m_last_state;
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 	};
 
 	// -----------------------------------------------------------------------------
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index 137e45f008d..c96273e8579 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -572,16 +572,6 @@ net_t::net_t(netlist_t &nl, const pstring &aname, core_terminal_t *mr)
 		nl.m_nets.push_back(std::shared_ptr<net_t>(this, do_nothing_deleter()));
 	else
 		nl.m_nets.push_back(std::shared_ptr<net_t>(this));
-<<<<<<< HEAD
-=======
-
-	netlist().save(*this, m_time, "m_time");
-	netlist().save(*this, m_active, "m_active");
-	netlist().save(*this, m_in_queue, "m_in_queue");
-	netlist().save(*this, m_cur_Analog, "m_cur_Analog");
-	netlist().save(*this, m_cur_Q, "m_cur_Q");
-	netlist().save(*this, m_new_Q, "m_new_Q");
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 }
 
 net_t::~net_t()
@@ -799,10 +789,6 @@ core_terminal_t::core_terminal_t(core_device_t &dev, const pstring &aname, const
 , m_net(nullptr)
 , m_state(*this, "m_state", STATE_NONEX)
 {
-<<<<<<< HEAD
-=======
-	netlist().save(*this, m_state, "m_state");
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 }
 
 void core_terminal_t::reset()
@@ -836,12 +822,6 @@ terminal_t::terminal_t(core_device_t &dev, const pstring &aname)
 , m_gt1(*this, "m_gt1", nullptr)
 {
 	netlist().setup().register_term(*this);
-<<<<<<< HEAD
-=======
-	netlist().save(*this, m_Idr1, "m_Idr1");
-	netlist().save(*this, m_go1, "m_go1");
-	netlist().save(*this, m_gt1, "m_gt1");
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 }
 
 
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index b77dc15b1bb..1f30979bfac 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -171,11 +171,7 @@
 // Type definitions
 // ----------------------------------------------------------------------------------------
 
-<<<<<<< HEAD
 using netlist_sig_t = std::uint_least32_t;
-=======
-using netlist_sig_t = std::uint32_t;
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 
  //============================================================
  //  MACROS / New Syntax
@@ -343,11 +339,6 @@ namespace netlist
 	const logic_family_desc_t *family_CD4XXX();
 
 
-	// -----------------------------------------------------------------------------
-	// object_t
-	// -----------------------------------------------------------------------------
-
-<<<<<<< HEAD
 	// -----------------------------------------------------------------------------
 	// State variables - use to preserve state
 	// -----------------------------------------------------------------------------
@@ -398,8 +389,11 @@ namespace netlist
 	using state_var_u32 = state_var<std::uint_fast32_t>;
 	using state_var_s32 = state_var<std::int_fast32_t>;
 
-=======
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
+	// -----------------------------------------------------------------------------
+	// object_t
+	// -----------------------------------------------------------------------------
+
+
 	class object_t
 	{
 		P_PREVENT_COPYING(object_t)
@@ -685,15 +679,9 @@ namespace netlist
 		state_var<netlist_sig_t> m_new_Q;
 		state_var<netlist_sig_t> m_cur_Q;
 
-<<<<<<< HEAD
 		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 */
-=======
-		netlist_time  m_time;
-		INT32         m_active;
-		UINT8    	  m_in_queue;    /* 0: not in queue, 1: in queue, 2: last was taken */
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 
 	private:
 		plib::linkedlist_t<core_terminal_t> m_list_active;
@@ -1196,53 +1184,6 @@ protected:
 		plib::dynlib *m_lib;                 // external lib needs to be loaded as long as netlist exists
 	};
 
-<<<<<<< HEAD
-=======
-	template <typename T>
-	struct state_var
-	{
-	public:
-		state_var(device_t &dev, const pstring name, const T &value)
-		: m_value(value)
-		{
-			dev.netlist().save(dev, m_value, name);
-		}
-
-		state_var(const state_var &rhs) NOEXCEPT = default;
-		state_var(state_var &&rhs) NOEXCEPT = default;
-		state_var &operator=(const state_var rhs) { m_value = rhs.m_value; return *this; }
-		state_var &operator=(const T rhs) { m_value = rhs; return *this; }
-		operator T & () { return m_value; }
-		T & operator()() { return m_value; }
-		operator const T & () const { return m_value; }
-		const T & operator()() const { return m_value; }
-	private:
-		T m_value;
-	};
-
-	template <typename T, std::size_t N>
-	struct state_var<T[N]>
-	{
-	public:
-		state_var(device_t &dev, const pstring name, const T & value)
-		{
-			dev.netlist().save(dev, m_value, name);
-			for (int i=0; i<N; i++)
-				m_value[i] = value;
-		}
-
-		state_var(const state_var &rhs) NOEXCEPT = default;
-		state_var(state_var &&rhs) NOEXCEPT = default;
-		state_var &operator=(const state_var rhs) { m_value = rhs.m_value; return *this; }
-		state_var &operator=(const T rhs) { m_value = rhs; return *this; }
-		T & operator[](const std::size_t i) { return m_value[i]; }
-		const T & operator[](const std::size_t i) const { return m_value[i]; }
-	private:
-		T m_value[N];
-	};
-
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
-
 	// -----------------------------------------------------------------------------
 	// Support classes for devices
 	// -----------------------------------------------------------------------------
diff --git a/src/lib/netlist/nl_time.h b/src/lib/netlist/nl_time.h
index d7dd63ba5ea..0a4caac1ac6 100644
--- a/src/lib/netlist/nl_time.h
+++ b/src/lib/netlist/nl_time.h
@@ -32,36 +32,20 @@ namespace netlist
 	{
 	public:
 
-<<<<<<< HEAD
 		using internal_type = TYPE;
 		using mult_type = std::uint_fast64_t;
 		static constexpr internal_type resolution = RES;
-=======
-#if (PHAS_INT128)
-		using INTERNALTYPE = UINT128;
-#else
-		using INTERNALTYPE = UINT64;
-#endif
-		static constexpr INTERNALTYPE RESOLUTION = NETLIST_INTERNAL_RES;
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 
 		constexpr ptime() NOEXCEPT : m_time(0) {}
 		constexpr ptime(const ptime &rhs) NOEXCEPT = default;
 		constexpr ptime(ptime &&rhs) NOEXCEPT = default;
 
-<<<<<<< HEAD
 		constexpr explicit ptime(const double t) = delete;
 		//: m_time((internal_type) ( t * (double) resolution)) { }
 		constexpr explicit ptime(const internal_type nom, const internal_type den)
 		: m_time(nom * (resolution / den)) { }
 
 		ptime &operator=(const ptime rhs) { m_time = rhs.m_time; return *this; }
-=======
-		constexpr explicit netlist_time(const double t)
-		: m_time((INTERNALTYPE) ( t * (double) RESOLUTION)) { }
-		constexpr explicit netlist_time(const INTERNALTYPE nom, const INTERNALTYPE den)
-		: m_time(nom * (RESOLUTION / den)) { }
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 
 		ptime &operator+=(const ptime &rhs) { m_time += rhs.m_time; return *this; }
 		ptime &operator-=(const ptime &rhs) { m_time -= rhs.m_time; return *this; }
@@ -139,24 +123,17 @@ namespace netlist
 		internal_type m_time;
 	};
 
-<<<<<<< HEAD
 #if (PHAS_INT128)
 	using netlist_time = ptime<UINT128, NETLIST_INTERNAL_RES>;
 #else
 	using netlist_time = ptime<std::uint_fast64_t, NETLIST_INTERNAL_RES>;
 #endif
-=======
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 }
 
 namespace plib {
 template<> inline void state_manager_t::save_item(const void *owner, netlist::netlist_time &nlt, const pstring &stname)
 {
-<<<<<<< HEAD
 	save_state_ptr(owner, stname, datatype_t(sizeof(netlist::netlist_time::internal_type), false, true, false), 1, nlt.get_internaltype_ptr());
-=======
-	save_state_ptr(owner, stname, datatype_t(sizeof(netlist::netlist_time::INTERNALTYPE), false, true, false), 1, nlt.get_internaltype_ptr());
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 }
 }
 
diff --git a/src/lib/netlist/plib/pparser.h b/src/lib/netlist/plib/pparser.h
index 4d6921d7102..e6b6dd8f989 100644
--- a/src/lib/netlist/plib/pparser.h
+++ b/src/lib/netlist/plib/pparser.h
@@ -9,10 +9,7 @@
 #define PPARSER_H_
 
 #include <unordered_map>
-<<<<<<< HEAD
 #include <cstdint>
-=======
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 
 #include "pconfig.h"
 #include "pstring.h"
diff --git a/src/lib/netlist/plib/pstate.h b/src/lib/netlist/plib/pstate.h
index c44d7bcde16..cbfa2b06d1d 100644
--- a/src/lib/netlist/plib/pstate.h
+++ b/src/lib/netlist/plib/pstate.h
@@ -45,7 +45,6 @@ public:
 	{
 		static inline const datatype_t f()
 		{
-<<<<<<< HEAD
 			return datatype_t(sizeof(T), false, plib::is_integral<T>::value || std::is_enum<T>::value,
 					std::is_floating_point<T>::value); }
 	};
@@ -55,17 +54,6 @@ public:
 		static inline const datatype_t f()
 		{
 			return datatype_t(sizeof(T), true, plib::is_integral<T>::value || std::is_enum<T>::value,
-=======
-			return datatype_t(sizeof(T), false, std::is_integral<T>::value || std::is_enum<T>::value,
-					std::is_floating_point<T>::value); }
-	};
-
-	template<typename T> struct datatype_f<T *>
-	{
-		static inline const datatype_t f()
-		{
-			return datatype_t(sizeof(T), true, std::is_integral<T>::value || std::is_enum<T>::value,
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 					std::is_floating_point<T>::value);
 		}
 	};
diff --git a/src/lib/netlist/plib/putil.h b/src/lib/netlist/plib/putil.h
index d763c6ee20c..5f9d1fa4047 100644
--- a/src/lib/netlist/plib/putil.h
+++ b/src/lib/netlist/plib/putil.h
@@ -24,11 +24,7 @@ namespace plib
 	namespace container
 	{
 		template <class C>
-<<<<<<< HEAD
 		bool contains(C &con, const typename C::value_type &elem)
-=======
-		const bool contains(C &con, const typename C::value_type &elem)
->>>>>>> branch 'netlist_dev' of https://github.com/mamedev/mame.git
 		{
 			return std::find(con.begin(), con.end(), elem) != con.end();
 		}

From cd848c338ab3c2a8dc9c81c26b891ba9d0e375ee Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Tue, 14 Jun 2016 22:44:06 +0200
Subject: [PATCH 22/39] Default PHAS_PMF_INTERNAL=0 for 32bit windows mingw.
 (nw)

---
 src/lib/netlist/plib/pconfig.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/lib/netlist/plib/pconfig.h b/src/lib/netlist/plib/pconfig.h
index c70e45d0e96..4b9c03c8f89 100644
--- a/src/lib/netlist/plib/pconfig.h
+++ b/src/lib/netlist/plib/pconfig.h
@@ -50,6 +50,9 @@ typedef __int128_t INT128;
 //============================================================
 
 #if defined(__GNUC__)
+	/* does not work in versions over 4.7.x of 32bit MINGW  */
+	#if defined(__MINGW32__) && !defined(__x86_64) && defined(__i386__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)))
+		#define PHAS_PMF_INTERNAL 0
 	#if defined(__MINGW32__) && !defined(__x86_64) && defined(__i386__)
 		#define PHAS_PMF_INTERNAL 1
 		#define MEMBER_ABI _thiscall

From 4c9c494270b7cd2d95fa99aceede40a4f73c2923 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Tue, 14 Jun 2016 23:00:52 +0200
Subject: [PATCH 23/39] #if ==> #elif. Ouch. (nw)

---
 src/lib/netlist/plib/pconfig.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/netlist/plib/pconfig.h b/src/lib/netlist/plib/pconfig.h
index 4b9c03c8f89..48a7e740a8f 100644
--- a/src/lib/netlist/plib/pconfig.h
+++ b/src/lib/netlist/plib/pconfig.h
@@ -53,7 +53,7 @@ typedef __int128_t INT128;
 	/* does not work in versions over 4.7.x of 32bit MINGW  */
 	#if defined(__MINGW32__) && !defined(__x86_64) && defined(__i386__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)))
 		#define PHAS_PMF_INTERNAL 0
-	#if defined(__MINGW32__) && !defined(__x86_64) && defined(__i386__)
+	#elif defined(__MINGW32__) && !defined(__x86_64) && defined(__i386__)
 		#define PHAS_PMF_INTERNAL 1
 		#define MEMBER_ABI _thiscall
 	#elif defined(__clang__) && defined(__i386__) && defined(_WIN32)

From 08d615605e4f97213aab98060cfe0526fdba9c75 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Wed, 15 Jun 2016 00:07:30 +0200
Subject: [PATCH 24/39] Fix a merge issue. (nw)

---
 src/devices/machine/ldp1000.h | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/devices/machine/ldp1000.h b/src/devices/machine/ldp1000.h
index 846fc5d9642..b7cf9cbeea4 100644
--- a/src/devices/machine/ldp1000.h
+++ b/src/devices/machine/ldp1000.h
@@ -36,23 +36,6 @@ public:
 	// construction/destruction
 	sony_ldp1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
 
-<<<<<<< HEAD
-	// I/O operations
-	DECLARE_WRITE8_MEMBER( write );
-	DECLARE_READ8_MEMBER( read );
-
-protected:
-	// device-level overrides
-	virtual void device_validity_check(validity_checker &valid) const override;
-	virtual void device_start() override;
-	virtual void device_reset() override;
-	virtual const rom_entry *device_rom_region() const override;
-	
-	virtual void player_vsync(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) override;
-	virtual INT32 player_update(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) override;
-	virtual void player_overlay(bitmap_yuy16 &bitmap) override { }
-
-=======
 	// I/O operations TODO: both actually protected
 	DECLARE_WRITE8_MEMBER( command_w );
 	DECLARE_READ8_MEMBER( status_r );
@@ -95,7 +78,6 @@ private:
 	UINT8 m_internal_bcd[0x10];
 	UINT8 m_index_state;
 	UINT8 m_index_size;
->>>>>>> refs/remotes/origin/master
 };
 
 

From 02e3ea0424d06ab0f74ae3a6f6da12e365f52ad4 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Wed, 15 Jun 2016 22:04:17 +0200
Subject: [PATCH 25/39] Object model optimisation. (nw)

---
 src/lib/netlist/nl_base.cpp  | 23 +++++++-----
 src/lib/netlist/nl_base.h    | 71 +++++++++++++++++++++---------------
 src/lib/netlist/nl_setup.cpp | 12 ++----
 src/lib/netlist/nl_setup.h   |  4 +-
 4 files changed, 60 insertions(+), 50 deletions(-)

diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index c96273e8579..e40ec1dc5d3 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -104,7 +104,8 @@ const logic_family_desc_t *family_CD4XXX()
 
 queue_t::queue_t(netlist_t &nl)
 	: timed_queue<net_t *, netlist_time>(512)
-	, object_t(nl, "QUEUE", QUEUE)
+	, object_t("QUEUE")
+	, netlist_ref(nl)
 	, plib::state_manager_t::callback_t()
 	, m_qsize(0)
 	, m_times(512)
@@ -114,7 +115,6 @@ queue_t::queue_t(netlist_t &nl)
 
 void queue_t::register_state(plib::state_manager_t &manager, const pstring &module)
 {
-	printf("%e\n", netlist_time::never().as_double());
 	netlist().log().debug("register_state\n");
 	manager.save_item(this, m_qsize, module + "." + "qsize");
 	manager.save_item(this, &m_times[0], module + "." + "times", m_times.size());
@@ -155,10 +155,8 @@ void queue_t::on_post_load()
 // object_t
 // ----------------------------------------------------------------------------------------
 
-object_t::object_t(netlist_t &nl, const pstring &aname, const type_t atype)
-	: m_netlist(nl)
-	, m_name(aname)
-	, m_objtype(atype)
+object_t::object_t(const pstring &aname)
+	: m_name(aname)
 {
 }
 
@@ -176,8 +174,9 @@ const pstring &object_t::name() const
 // ----------------------------------------------------------------------------------------
 
 device_object_t::device_object_t(core_device_t &dev, const pstring &aname, const type_t atype)
-: object_t(dev.netlist(), aname, atype)
+: object_t(aname)
 , m_device(dev)
+, m_type(atype)
 {
 }
 
@@ -417,7 +416,9 @@ template class param_template_t<pstring, param_t::MODEL>;
 // ----------------------------------------------------------------------------------------
 
 core_device_t::core_device_t(netlist_t &owner, const pstring &name)
-: object_t(owner, name, DEVICE), logic_family_t()
+	: object_t(name)
+	, logic_family_t()
+	, netlist_ref(owner)
 #if (NL_KEEP_STATISTICS)
 	, stat_total_time(0)
 	, stat_update_count(0)
@@ -429,8 +430,9 @@ core_device_t::core_device_t(netlist_t &owner, const pstring &name)
 }
 
 core_device_t::core_device_t(core_device_t &owner, const pstring &name)
-	: object_t(owner.netlist(), owner.name() + "." + name, DEVICE)
+	: object_t(owner.name() + "." + name)
 	, logic_family_t()
+	, netlist_ref(owner.netlist())
 #if (NL_KEEP_STATISTICS)
 	, stat_total_time(0)
 	, stat_update_count(0)
@@ -558,7 +560,8 @@ struct do_nothing_deleter{
 
 
 net_t::net_t(netlist_t &nl, const pstring &aname, core_terminal_t *mr)
-	: object_t(nl, aname, NET)
+	: object_t(aname)
+	, netlist_ref(nl)
 	, m_new_Q(*this, "m_new_Q", 0)
 	, m_cur_Q (*this, "m_cur_Q", 0)
 	, m_time(*this, "m_time", netlist_time::zero())
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 1f30979bfac..1587cefb99b 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -158,7 +158,7 @@
 #include <vector>
 #include <unordered_map>
 #include <memory>
-#include <cmath>
+//#include <cmath>
 #include <cstdint>
 
 #include "nl_lists.h"
@@ -263,7 +263,7 @@ namespace netlist
 		class NETLIB_NAME(mainclock);
 		class NETLIB_NAME(netlistparams);
 		class NETLIB_NAME(base_proxy);
-		class nld_base_d_to_a_proxy;
+		class NETLIB_NAME(base_d_to_a_proxy);
 	}
 
 	//============================================================
@@ -284,7 +284,6 @@ namespace netlist
 	class setup_t;
 	class netlist_t;
 	class core_device_t;
-	class param_model_t;
 	class device_t;
 
 	// -----------------------------------------------------------------------------
@@ -398,31 +397,18 @@ namespace netlist
 	{
 		P_PREVENT_COPYING(object_t)
 	public:
-		enum type_t {
-			TERMINAL = 0,
-			INPUT    = 1,
-			OUTPUT   = 2,
-			PARAM    = 3,
-			NET      = 4,
-			DEVICE   = 5,
-			QUEUE    = 6
-		};
 
-		object_t(netlist_t &nl, const pstring &aname, const type_t atype);
+		object_t(const pstring &aname);
 		~object_t();
 
 		const pstring &name() const;
 
-		type_t type() const { return m_objtype; }
-		bool is_type(const type_t atype) const { return (m_objtype == atype); }
-
-		netlist_t & netlist() { return m_netlist; }
-		const netlist_t & netlist() const { return m_netlist; }
+		//netlist_t & m_netlist;
+		//netlist_t & netlist() { return m_netlist; }
+		//const netlist_t & netlist() const { return m_netlist; }
 
 	private:
-		netlist_t & m_netlist;
 		pstring m_name;
-		const type_t m_objtype;
 
 	public:
 	    void * operator new (size_t size, void *ptr) { return ptr; }
@@ -431,6 +417,18 @@ namespace netlist
 	    void operator delete (void * mem);
 	};
 
+	struct netlist_ref
+	{
+		netlist_ref(netlist_t &nl) : m_netlist(nl) { }
+
+		netlist_t & netlist() { return m_netlist; }
+		const netlist_t & netlist() const { return m_netlist; }
+
+	private:
+		netlist_t & m_netlist;
+
+	};
+
 	// -----------------------------------------------------------------------------
 	// device_object_t
 	// -----------------------------------------------------------------------------
@@ -439,10 +437,24 @@ namespace netlist
 	{
 		P_PREVENT_COPYING(device_object_t)
 	public:
+		enum type_t {
+			TERMINAL = 0,
+			INPUT    = 1,
+			OUTPUT   = 2,
+			PARAM    = 3,
+		};
+
 		device_object_t(core_device_t &dev, const pstring &aname, const type_t atype);
 		core_device_t &device() const { return m_device; }
+
+		type_t type() const { return m_type; }
+		bool is_type(const type_t atype) const { return (m_type == atype); }
+
+		netlist_t &netlist();
+
 	private:
 		core_device_t & m_device;
+		const type_t m_type;
 	};
 
 
@@ -634,7 +646,7 @@ namespace netlist
 	// net_t
 	// -----------------------------------------------------------------------------
 
-	class net_t : public object_t
+	class net_t : public object_t, public netlist_ref
 	{
 		P_PREVENT_COPYING(net_t)
 	public:
@@ -799,8 +811,6 @@ namespace netlist
 	// param_t
 	// -----------------------------------------------------------------------------
 
-	class device_t;
-
 	class param_t : public device_object_t
 	{
 		P_PREVENT_COPYING(param_t)
@@ -871,7 +881,7 @@ namespace netlist
 	// core_device_t
 	// -----------------------------------------------------------------------------
 
-	class core_device_t : public object_t, public logic_family_t
+	class core_device_t : public object_t, public logic_family_t, public netlist_ref
 	{
 		P_PREVENT_COPYING(core_device_t)
 	public:
@@ -1008,8 +1018,6 @@ namespace netlist
 		NETLIB_UPDATE_TERMINALSI() { }
 
 	private:
-		void register_p(const pstring &name, object_t &obj);
-		void register_sub_p(device_t &dev);
 	};
 
 	// -----------------------------------------------------------------------------
@@ -1037,9 +1045,10 @@ namespace netlist
 	// queue_t
 	// -----------------------------------------------------------------------------
 
-	class queue_t : public timed_queue<net_t *, netlist_time>,
-							public object_t,
-							public plib::state_manager_t::callback_t
+	class queue_t :	public timed_queue<net_t *, netlist_time>,
+					public object_t,
+					public netlist_ref,
+					public plib::state_manager_t::callback_t
 	{
 	public:
 		queue_t(netlist_t &nl);
@@ -1373,6 +1382,10 @@ protected:
 			m_value[i] = value;
 	}
 
+	inline netlist_t &device_object_t::netlist()
+	{
+		return m_device.netlist();
+	}
 
 }
 
diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp
index 72fdac657d9..5b7099a9e14 100644
--- a/src/lib/netlist/nl_setup.cpp
+++ b/src/lib/netlist/nl_setup.cpp
@@ -181,7 +181,7 @@ void setup_t::register_dippins_arr(const pstring &terms)
 	}
 }
 
-pstring setup_t::objtype_as_str(object_t &in) const
+pstring setup_t::objtype_as_str(device_object_t &in) const
 {
 	switch (in.type())
 	{
@@ -191,14 +191,8 @@ pstring setup_t::objtype_as_str(object_t &in) const
 			return "INPUT";
 		case terminal_t::OUTPUT:
 			return "OUTPUT";
-		case terminal_t::NET:
-			return "NET";
 		case terminal_t::PARAM:
 			return "PARAM";
-		case terminal_t::DEVICE:
-			return "DEVICE";
-		case terminal_t::QUEUE:
-			return "QUEUE";
 	}
 	// FIXME: noreturn
 	log().fatal("Unknown object type {1}\n", (unsigned) in.type());
@@ -385,12 +379,12 @@ core_terminal_t *setup_t::find_terminal(const pstring &terminal_in, bool require
 	return term;
 }
 
-core_terminal_t *setup_t::find_terminal(const pstring &terminal_in, object_t::type_t atype, bool required)
+core_terminal_t *setup_t::find_terminal(const pstring &terminal_in, device_object_t::type_t atype, bool required)
 {
 	const pstring &tname = resolve_alias(terminal_in);
 	auto ret = m_terminals.find(tname);
 	/* look for default */
-	if (ret == m_terminals.end() && atype == object_t::OUTPUT)
+	if (ret == m_terminals.end() && atype == device_object_t::OUTPUT)
 	{
 		/* look for ".Q" std output */
 		ret = m_terminals.find(tname + ".Q");
diff --git a/src/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h
index 109f58fb43b..39ef1c514ff 100644
--- a/src/lib/netlist/nl_setup.h
+++ b/src/lib/netlist/nl_setup.h
@@ -189,7 +189,7 @@ namespace netlist
 	private:
 
 		core_terminal_t *find_terminal(const pstring &outname_in, bool required = true);
-		core_terminal_t *find_terminal(const pstring &outname_in, object_t::type_t atype, bool required = true);
+		core_terminal_t *find_terminal(const pstring &outname_in, device_object_t::type_t atype, bool required = true);
 
 		void connect_terminals(core_terminal_t &in, core_terminal_t &out);
 		void connect_input_output(core_terminal_t &in, core_terminal_t &out);
@@ -198,7 +198,7 @@ namespace netlist
 		bool connect_input_input(core_terminal_t &t1, core_terminal_t &t2);
 
 		// helpers
-		pstring objtype_as_str(object_t &in) const;
+		pstring objtype_as_str(device_object_t &in) const;
 
 		const pstring resolve_alias(const pstring &name) const;
 		devices::nld_base_proxy *get_d_a_proxy(core_terminal_t &out);

From a1b97d3064ddad5fe86eb718bd37a53d4a17c8a2 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Fri, 17 Jun 2016 18:39:17 +0200
Subject: [PATCH 26/39] Truthtable refactoring. (nw)

---
 src/devices/machine/netlist.h              |   4 +-
 src/lib/netlist/devices/nld_truthtable.cpp |  19 ++--
 src/lib/netlist/devices/nld_truthtable.h   |  43 +++++---
 src/lib/netlist/nl_base.h                  |  16 ---
 src/lib/netlist/nl_parser.cpp              |  20 ++--
 src/lib/netlist/nl_setup.cpp               |  10 ++
 src/lib/netlist/nl_setup.h                 | 116 ++++++++++++---------
 7 files changed, 133 insertions(+), 95 deletions(-)

diff --git a/src/devices/machine/netlist.h b/src/devices/machine/netlist.h
index 98b9c03244d..fe0ff740e8a 100644
--- a/src/devices/machine/netlist.h
+++ b/src/devices/machine/netlist.h
@@ -67,11 +67,11 @@
 // Extensions to interface netlist with MAME code ....
 // ----------------------------------------------------------------------------------------
 
-class netlist_source_memregion_t : public netlist::setup_t::source_t
+class netlist_source_memregion_t : public netlist::source_t
 {
 public:
 	netlist_source_memregion_t(pstring name)
-	: netlist::setup_t::source_t(), m_name(name)
+	: netlist::source_t(), m_name(name)
 	{
 	}
 
diff --git a/src/lib/netlist/devices/nld_truthtable.cpp b/src/lib/netlist/devices/nld_truthtable.cpp
index 9ed524e58b1..4821532de26 100644
--- a/src/lib/netlist/devices/nld_truthtable.cpp
+++ b/src/lib/netlist/devices/nld_truthtable.cpp
@@ -7,6 +7,7 @@
 
 #include "nld_truthtable.h"
 #include "plib/plists.h"
+#include "nl_setup.h"
 
 namespace netlist
 {
@@ -261,18 +262,17 @@ void truthtable_desc_t::setup(const plib::pstring_vector_t &truthtable, uint_lea
 
 #define ENTRYX(n, m, h)    case (n * 1000 + m * 10 + h): \
 	{ using xtype = netlist_factory_truthtable_t<n, m, h>; \
-		return plib::owned_ptr<netlist_base_factory_truthtable_t>::Create<xtype>(name,classname,def_param); } break
+		ret = new xtype(desc.name, desc.classname, desc.def_param); } break
 
 #define ENTRYY(n, m)   ENTRYX(n, m, 0); ENTRYX(n, m, 1)
 
 #define ENTRY(n) ENTRYY(n, 1); ENTRYY(n, 2); ENTRYY(n, 3); ENTRYY(n, 4); ENTRYY(n, 5); ENTRYY(n, 6)
 
-plib::owned_ptr<netlist_base_factory_truthtable_t> nl_tt_factory_create(const unsigned ni, const unsigned no,
-		const unsigned has_state,
-		const pstring &name, const pstring &classname,
-		const pstring &def_param)
+void nl_tt_factory_create(setup_t &setup, tt_desc &desc)
 {
-	switch (ni * 1000 + no * 10 + has_state)
+	netlist_base_factory_truthtable_t *ret;
+
+	switch (desc.ni * 1000 + desc.no * 10 + desc.has_state)
 	{
 		ENTRY(1);
 		ENTRY(2);
@@ -285,10 +285,13 @@ plib::owned_ptr<netlist_base_factory_truthtable_t> nl_tt_factory_create(const un
 		ENTRY(9);
 		ENTRY(10);
 		default:
-			pstring msg = plib::pfmt("unable to create truthtable<{1},{2},{3}>")(ni)(no)(has_state);
+			pstring msg = plib::pfmt("unable to create truthtable<{1},{2},{3}>")(desc.ni)(desc.no)(desc.has_state);
 			nl_assert_always(false, msg);
 	}
-	//return nullptr;
+	ret->m_desc = desc.desc;
+	if (desc.family != "")
+		ret->m_family = setup.family_from_model(desc.family);
+	setup.factory().register_device(plib::owned_ptr<netlist_base_factory_truthtable_t>(ret, true));
 }
 
 	} //namespace devices
diff --git a/src/lib/netlist/devices/nld_truthtable.h b/src/lib/netlist/devices/nld_truthtable.h
index d30ff03704c..99a178bc9b8 100644
--- a/src/lib/netlist/devices/nld_truthtable.h
+++ b/src/lib/netlist/devices/nld_truthtable.h
@@ -17,34 +17,40 @@
 #include "nl_factory.h"
 #include "plib/plists.h"
 
-#define NETLIB_TRUTHTABLE(cname, nIN, nOUT, state)                               \
-	class NETLIB_NAME(cname) : public nld_truthtable_t<nIN, nOUT, state>         \
+#define NETLIB_TRUTHTABLE(cname, nIN, nOUT, state)                              \
+	class NETLIB_NAME(cname) : public nld_truthtable_t<nIN, nOUT, state>        \
 	{                                                                           \
 	public:                                                                     \
 		template <class C>                                                      \
-		NETLIB_NAME(cname)(C &owner, const pstring &name)                        \
+		NETLIB_NAME(cname)(C &owner, const pstring &name)                       \
 		: nld_truthtable_t<nIN, nOUT, state>(owner, name, nullptr, &m_ttbl, m_desc) { }   \
 	private:                                                                    \
 		static truthtable_t m_ttbl;                                             \
 		static const char *m_desc[];                                            \
 	}
 
-#define TRUTHTABLE_START(cname, in, out, has_state, def_params) \
+#define TRUTHTABLE_START(cname, in, out, has_statep, def_params) \
 	{ \
-	auto ttd = netlist::devices::nl_tt_factory_create(in, out, has_state, \
-			# cname, # cname, "+" def_params);
+		netlist::devices::tt_desc desc; \
+		desc.name = #cname ; \
+		desc.classname = #cname ; \
+		desc.ni = in; \
+		desc.no = out; \
+		desc.has_state = has_statep; \
+		desc.def_param = pstring("+") + def_params; \
+		desc.family = "";
 
 #define TT_HEAD(x) \
-	ttd->m_desc.push_back(x);
+		desc.desc.push_back(x);
 
 #define TT_LINE(x) \
-	ttd->m_desc.push_back(x);
+		desc.desc.push_back(x);
 
 #define TT_FAMILY(x) \
-	ttd->m_family = setup.family_from_model(x);
+		desc.family = x;
 
 #define TRUTHTABLE_END() \
-	setup.factory().register_device(std::move(ttd)); \
+		netlist::devices::nl_tt_factory_create(setup, desc);		\
 	}
 
 namespace netlist
@@ -411,10 +417,19 @@ namespace netlist
 		const logic_family_desc_t *m_family;
 	};
 
-	plib::owned_ptr<netlist_base_factory_truthtable_t> nl_tt_factory_create(const unsigned ni, const unsigned no,
-			const unsigned has_state,
-			const pstring &name, const pstring &classname,
-			const pstring &def_param);
+	struct tt_desc
+	{
+		pstring name;
+		pstring classname;
+		unsigned ni;
+		unsigned no;
+		unsigned has_state;
+		pstring def_param;
+		plib::pstring_vector_t desc;
+		pstring family;
+	};
+
+	void nl_tt_factory_create(setup_t &setup, tt_desc &desc);
 
 	} //namespace devices
 } // namespace netlist
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 1587cefb99b..9ae08fd8786 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -965,22 +965,6 @@ namespace netlist
 	#endif
 	};
 
-	// -----------------------------------------------------------------------------
-	// param_ref_t
-	// -----------------------------------------------------------------------------
-
-	struct param_ref_t
-	{
-		param_ref_t(const pstring name, core_device_t &device, param_t &param)
-		: m_name(name)
-		, m_device(device)
-		, m_param(param)
-		{ }
-		pstring m_name;
-		core_device_t &m_device;
-		param_t &m_param;
-	};
-
 	// -----------------------------------------------------------------------------
 	// device_t
 	// -----------------------------------------------------------------------------
diff --git a/src/lib/netlist/nl_parser.cpp b/src/lib/netlist/nl_parser.cpp
index 14aabdf4a0e..7ec3fdca2be 100644
--- a/src/lib/netlist/nl_parser.cpp
+++ b/src/lib/netlist/nl_parser.cpp
@@ -158,8 +158,14 @@ void parser_t::net_truthtable_start()
 	pstring def_param = get_string();
 	require_token(m_tok_param_right);
 
-	plib::owned_ptr<netlist::devices::netlist_base_factory_truthtable_t> ttd = netlist::devices::nl_tt_factory_create(ni, no, hs,
-			name, name, "+" + def_param);
+	netlist::devices::tt_desc desc;
+	desc.classname = name;
+	desc.name = name;
+	desc.ni = ni;
+	desc.no = no;
+	desc.has_state = hs;
+	desc.def_param = "+" + def_param;
+	desc.family = "";
 
 	while (true)
 	{
@@ -168,19 +174,19 @@ void parser_t::net_truthtable_start()
 		if (token.is(m_tok_TT_HEAD))
 		{
 			require_token(m_tok_param_left);
-			ttd->m_desc.push_back(get_string());
+			desc.desc.push_back(get_string());
 			require_token(m_tok_param_right);
 		}
 		else if (token.is(m_tok_TT_LINE))
 		{
 			require_token(m_tok_param_left);
-			ttd->m_desc.push_back(get_string());
+			desc.desc.push_back(get_string());
 			require_token(m_tok_param_right);
 		}
 		else if (token.is(m_tok_TT_FAMILY))
 		{
 			require_token(m_tok_param_left);
-			ttd->m_family = m_setup.family_from_model(get_string());
+			desc.family = get_string();
 			require_token(m_tok_param_right);
 		}
 		else
@@ -188,7 +194,7 @@ void parser_t::net_truthtable_start()
 			require_token(token, m_tok_TRUTHTABLE_END);
 			require_token(m_tok_param_left);
 			require_token(m_tok_param_right);
-			m_setup.factory().register_device(std::move(ttd));
+			netlist::devices::nl_tt_factory_create(m_setup, desc);
 			return;
 		}
 	}
@@ -431,7 +437,7 @@ nl_double parser_t::eval_param(const token_t tok)
 		val = tok.str();
 		ret = val.as_double(&e);
 		if (e)
-			error("Error with parameter ...\n");
+			error(plib::pfmt("Error with parameter {1}...\n")(val));
 	}
 	return ret * facs[f];
 
diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp
index 5b7099a9e14..a9c6c1249e6 100644
--- a/src/lib/netlist/nl_setup.cpp
+++ b/src/lib/netlist/nl_setup.cpp
@@ -788,6 +788,16 @@ void setup_t::start_devices()
 	netlist().start();
 }
 
+plib::plog_base<NL_DEBUG> &setup_t::log()
+{
+	return netlist().log();
+}
+const plib::plog_base<NL_DEBUG> &setup_t::log() const
+{
+	return netlist().log();
+}
+
+
 // ----------------------------------------------------------------------------------------
 // Model / family
 // ----------------------------------------------------------------------------------------
diff --git a/src/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h
index 39ef1c514ff..caf9fddff92 100644
--- a/src/lib/netlist/nl_setup.h
+++ b/src/lib/netlist/nl_setup.h
@@ -11,7 +11,13 @@
 #include <memory>
 #include <stack>
 #include <unordered_map>
+#include <vector>
 
+#include "plib/pstring.h"
+#include "plib/palloc.h"
+#include "plib/pfmtlog.h"
+#include "plib/putil.h"
+#include "nl_config.h"
 #include "nl_base.h"
 #include "nl_factory.h"
 
@@ -34,51 +40,83 @@
 #define NET_REGISTER_DEV(type, name)                                            \
 		setup.register_dev(# type, # name);
 
-#define NET_CONNECT(name, input, output)                                         \
+#define NET_CONNECT(name, input, output)                                        \
 		setup.register_link(# name "." # input, # output);
 
-#define NET_C(term1, ...)                                                          \
+#define NET_C(term1, ...)                                                       \
 		setup.register_link_arr( # term1 ", " # __VA_ARGS__);
 
-#define PARAM(name, val)                                                          \
+#define PARAM(name, val)                                                        \
 		setup.register_param(# name, val);
 
-#define NETDEV_PARAMI(name, param, val)                                          \
+#define NETDEV_PARAMI(name, param, val)                                         \
 		setup.register_param(# name "." # param, val);
 
 #define NETLIST_NAME(name) netlist ## _ ## name
 
-#define NETLIST_EXTERNAL(name)                                                \
+#define NETLIST_EXTERNAL(name)                                                 \
 		void NETLIST_NAME(name)(netlist::setup_t &setup);
 
-#define NETLIST_START(name)                                                   \
-void NETLIST_NAME(name)(netlist::setup_t &setup)                    \
+#define NETLIST_START(name)                                                    \
+void NETLIST_NAME(name)(netlist::setup_t &setup)                               \
 {
 #define NETLIST_END()  }
 
-#define LOCAL_SOURCE(name)                                                    \
+#define LOCAL_SOURCE(name)                                                     \
 		setup.register_source(std::make_shared<netlist::source_proc_t>(# name, &NETLIST_NAME(name)));
 
-#define LOCAL_LIB_ENTRY(name)                                                 \
-		LOCAL_SOURCE(name)                                                    \
+#define LOCAL_LIB_ENTRY(name)                                                  \
+		LOCAL_SOURCE(name)                                                     \
 		setup.register_lib_entry(# name);
 
-#define INCLUDE(name)                                                         \
+#define INCLUDE(name)                                                          \
 		setup.include(# name);
 
-#define SUBMODEL(model, name)                                                \
-		setup.namespace_push(# name);                                         \
-		NETLIST_NAME(model)(setup);                                           \
+#define SUBMODEL(model, name)                                                  \
+		setup.namespace_push(# name);                                          \
+		NETLIST_NAME(model)(setup);                                            \
 		setup.namespace_pop();
 
-// ----------------------------------------------------------------------------------------
-// netlist_setup_t
-// ----------------------------------------------------------------------------------------
-
 namespace netlist
 {
-	// Forward definition so we keep nl_factory.h out of the public
-	class factory_list_t;
+
+	// -----------------------------------------------------------------------------
+	// param_ref_t
+	// -----------------------------------------------------------------------------
+
+	struct param_ref_t
+	{
+		param_ref_t(const pstring name, core_device_t &device, param_t &param)
+		: m_name(name)
+		, m_device(device)
+		, m_param(param)
+		{ }
+		pstring m_name;
+		core_device_t &m_device;
+		param_t &m_param;
+	};
+
+	// ----------------------------------------------------------------------------------------
+	// A Generic netlist sources implementation
+	// ----------------------------------------------------------------------------------------
+
+	class source_t
+	{
+	public:
+		using list_t = std::vector<std::shared_ptr<source_t>>;
+
+		source_t()
+		{}
+
+		virtual ~source_t() { }
+
+		virtual bool parse(setup_t &setup, const pstring &name) = 0;
+	private:
+	};
+
+	// ----------------------------------------------------------------------------------------
+	// setup_t
+	// ----------------------------------------------------------------------------------------
 
 
 	class setup_t
@@ -86,24 +124,6 @@ namespace netlist
 		P_PREVENT_COPYING(setup_t)
 	public:
 
-		// ----------------------------------------------------------------------------------------
-		// A Generic netlist sources implementation
-		// ----------------------------------------------------------------------------------------
-
-		class source_t
-		{
-		public:
-			using list_t = std::vector<std::shared_ptr<source_t>>;
-
-			source_t()
-			{}
-
-			virtual ~source_t() { }
-
-			virtual bool parse(setup_t &setup, const pstring &name) = 0;
-		private:
-		};
-
 		using link_t = std::pair<pstring, pstring>;
 
 		setup_t(netlist_t &netlist);
@@ -179,8 +199,8 @@ namespace netlist
 
 		void model_parse(const pstring &model, model_map_t &map);
 
-		plib::plog_base<NL_DEBUG> &log() { return netlist().log(); }
-		const plib::plog_base<NL_DEBUG> &log() const { return netlist().log(); }
+		plib::plog_base<NL_DEBUG> &log();
+		const plib::plog_base<NL_DEBUG> &log() const;
 
 		std::vector<std::pair<pstring, base_factory_t *>> m_device_factory;
 
@@ -232,12 +252,12 @@ namespace netlist
 	// ----------------------------------------------------------------------------------------
 
 
-	class source_string_t : public setup_t::source_t
+	class source_string_t : public source_t
 	{
 	public:
 
 		source_string_t(const pstring &source)
-		: setup_t::source_t(), m_str(source)
+		: source_t(), m_str(source)
 		{
 		}
 
@@ -247,12 +267,12 @@ namespace netlist
 		pstring m_str;
 	};
 
-	class source_file_t : public setup_t::source_t
+	class source_file_t : public source_t
 	{
 	public:
 
 		source_file_t(const pstring &filename)
-		: setup_t::source_t(), m_filename(filename)
+		: source_t(), m_filename(filename)
 		{
 		}
 
@@ -262,11 +282,11 @@ namespace netlist
 		pstring m_filename;
 	};
 
-	class source_mem_t : public setup_t::source_t
+	class source_mem_t : public source_t
 	{
 	public:
 		source_mem_t(const char *mem)
-		: setup_t::source_t(), m_str(mem)
+		: source_t(), m_str(mem)
 		{
 		}
 
@@ -276,11 +296,11 @@ namespace netlist
 		pstring m_str;
 	};
 
-	class source_proc_t : public setup_t::source_t
+	class source_proc_t : public source_t
 	{
 	public:
 		source_proc_t(pstring name, void (*setup_func)(setup_t &))
-		: setup_t::source_t(),
+		: source_t(),
 			m_setup_func(setup_func),
 			m_setup_func_name(name)
 		{

From f8c01a00ef01d30060e5c1de6c44968fd5603955 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Fri, 17 Jun 2016 22:35:34 +0200
Subject: [PATCH 27/39] More truthtable refactoring. Removed half-finished code
 for internal state support. As implemented, this would have had no support
 for timing delays. (nw)

---
 src/lib/netlist/devices/nld_74279.cpp      |  4 +-
 src/lib/netlist/devices/nld_9312.cpp       |  2 +-
 src/lib/netlist/devices/nld_truthtable.cpp | 18 ++---
 src/lib/netlist/devices/nld_truthtable.h   | 88 ++++++----------------
 src/lib/netlist/macro/nlm_cd4xxx.cpp       |  2 +-
 src/lib/netlist/macro/nlm_other.cpp        |  2 +-
 src/lib/netlist/macro/nlm_ttl74xx.cpp      | 54 ++++++-------
 src/lib/netlist/nl_parser.cpp              |  7 +-
 src/lib/netlist/nl_setup.cpp               |  7 ++
 src/lib/netlist/nl_setup.h                 | 48 ++++++++++++
 10 files changed, 119 insertions(+), 113 deletions(-)

diff --git a/src/lib/netlist/devices/nld_74279.cpp b/src/lib/netlist/devices/nld_74279.cpp
index 7fb75f946fb..7bcbadff855 100644
--- a/src/lib/netlist/devices/nld_74279.cpp
+++ b/src/lib/netlist/devices/nld_74279.cpp
@@ -13,8 +13,8 @@ namespace netlist
 	namespace devices
 	{
 
-		NETLIB_TRUTHTABLE(74279A, 3, 1, 0);
-		NETLIB_TRUTHTABLE(74279B, 4, 1, 0);
+		NETLIB_TRUTHTABLE(74279A, 3, 1);
+		NETLIB_TRUTHTABLE(74279B, 4, 1);
 
 		NETLIB_OBJECT(74279_dip)
 		{
diff --git a/src/lib/netlist/devices/nld_9312.cpp b/src/lib/netlist/devices/nld_9312.cpp
index 0191a905ebc..33b6d8e7a87 100644
--- a/src/lib/netlist/devices/nld_9312.cpp
+++ b/src/lib/netlist/devices/nld_9312.cpp
@@ -32,7 +32,7 @@ namespace netlist
 	/* The truthtable implementation is a lot faster than
 	 * the carefully crafted code :-(
 	 */
-	NETLIB_TRUTHTABLE(9312, 12, 2, 0);
+	NETLIB_TRUTHTABLE(9312, 12, 2);
 	#else
 
 	NETLIB_OBJECT(9312)
diff --git a/src/lib/netlist/devices/nld_truthtable.cpp b/src/lib/netlist/devices/nld_truthtable.cpp
index 4821532de26..5840a6bbd90 100644
--- a/src/lib/netlist/devices/nld_truthtable.cpp
+++ b/src/lib/netlist/devices/nld_truthtable.cpp
@@ -14,7 +14,7 @@ namespace netlist
 	namespace devices
 	{
 
-	template<unsigned m_NI, unsigned m_NO, int has_state>
+	template<unsigned m_NI, unsigned m_NO>
 	class netlist_factory_truthtable_t : public netlist_base_factory_truthtable_t
 	{
 		P_PREVENT_COPYING(netlist_factory_truthtable_t)
@@ -26,11 +26,11 @@ namespace netlist
 
 		plib::owned_ptr<device_t> Create(netlist_t &anetlist, const pstring &name) override
 		{
-			typedef nld_truthtable_t<m_NI, m_NO, has_state> tt_type;
+			typedef nld_truthtable_t<m_NI, m_NO> tt_type;
 			return plib::owned_ptr<device_t>::Create<tt_type>(anetlist, name, m_family, &m_ttbl, m_desc);
 		}
 	private:
-		typename nld_truthtable_t<m_NI, m_NO, has_state>::truthtable_t m_ttbl;
+		typename nld_truthtable_t<m_NI, m_NO>::truthtable_t m_ttbl;
 	};
 
 	static const uint_least64_t all_set = ~((uint_least64_t) 0);
@@ -260,19 +260,17 @@ void truthtable_desc_t::setup(const plib::pstring_vector_t &truthtable, uint_lea
 
 }
 
-#define ENTRYX(n, m, h)    case (n * 1000 + m * 10 + h): \
-	{ using xtype = netlist_factory_truthtable_t<n, m, h>; \
+#define ENTRYY(n, m)    case (n * 100 + m): \
+	{ using xtype = netlist_factory_truthtable_t<n, m>; \
 		ret = new xtype(desc.name, desc.classname, desc.def_param); } break
 
-#define ENTRYY(n, m)   ENTRYX(n, m, 0); ENTRYX(n, m, 1)
-
 #define ENTRY(n) ENTRYY(n, 1); ENTRYY(n, 2); ENTRYY(n, 3); ENTRYY(n, 4); ENTRYY(n, 5); ENTRYY(n, 6)
 
-void nl_tt_factory_create(setup_t &setup, tt_desc &desc)
+void tt_factory_create(setup_t &setup, tt_desc &desc)
 {
 	netlist_base_factory_truthtable_t *ret;
 
-	switch (desc.ni * 1000 + desc.no * 10 + desc.has_state)
+	switch (desc.ni * 100 + desc.no)
 	{
 		ENTRY(1);
 		ENTRY(2);
@@ -285,7 +283,7 @@ void nl_tt_factory_create(setup_t &setup, tt_desc &desc)
 		ENTRY(9);
 		ENTRY(10);
 		default:
-			pstring msg = plib::pfmt("unable to create truthtable<{1},{2},{3}>")(desc.ni)(desc.no)(desc.has_state);
+			pstring msg = plib::pfmt("unable to create truthtable<{1},{2}>")(desc.ni)(desc.no);
 			nl_assert_always(false, msg);
 	}
 	ret->m_desc = desc.desc;
diff --git a/src/lib/netlist/devices/nld_truthtable.h b/src/lib/netlist/devices/nld_truthtable.h
index 99a178bc9b8..2f27a076781 100644
--- a/src/lib/netlist/devices/nld_truthtable.h
+++ b/src/lib/netlist/devices/nld_truthtable.h
@@ -13,45 +13,22 @@
 #include <new>
 #include <cstdint>
 
-#include "nl_base.h"
+#include "nl_setup.h"
 #include "nl_factory.h"
 #include "plib/plists.h"
 
-#define NETLIB_TRUTHTABLE(cname, nIN, nOUT, state)                              \
-	class NETLIB_NAME(cname) : public nld_truthtable_t<nIN, nOUT, state>        \
+#define NETLIB_TRUTHTABLE(cname, nIN, nOUT)                             		\
+	class NETLIB_NAME(cname) : public nld_truthtable_t<nIN, nOUT>		        \
 	{                                                                           \
 	public:                                                                     \
 		template <class C>                                                      \
 		NETLIB_NAME(cname)(C &owner, const pstring &name)                       \
-		: nld_truthtable_t<nIN, nOUT, state>(owner, name, nullptr, &m_ttbl, m_desc) { }   \
+		: nld_truthtable_t<nIN, nOUT>(owner, name, nullptr, &m_ttbl, m_desc) { }   \
 	private:                                                                    \
 		static truthtable_t m_ttbl;                                             \
 		static const char *m_desc[];                                            \
 	}
 
-#define TRUTHTABLE_START(cname, in, out, has_statep, def_params) \
-	{ \
-		netlist::devices::tt_desc desc; \
-		desc.name = #cname ; \
-		desc.classname = #cname ; \
-		desc.ni = in; \
-		desc.no = out; \
-		desc.has_state = has_statep; \
-		desc.def_param = pstring("+") + def_params; \
-		desc.family = "";
-
-#define TT_HEAD(x) \
-		desc.desc.push_back(x);
-
-#define TT_LINE(x) \
-		desc.desc.push_back(x);
-
-#define TT_FAMILY(x) \
-		desc.family = x;
-
-#define TRUTHTABLE_END() \
-		netlist::devices::nl_tt_factory_create(setup, desc);		\
-	}
 
 namespace netlist
 {
@@ -127,11 +104,11 @@ namespace netlist
 
 	struct truthtable_desc_t
 	{
-		truthtable_desc_t(int NO, int NI, int has_state, bool *initialized,
+		truthtable_desc_t(int NO, int NI, bool *initialized,
 				packed_int outs, uint_least8_t *timing, netlist_time *timing_nt)
-		: m_NO(NO), m_NI(NI), /*m_has_state(has_state),*/ m_initialized(initialized),
+		: m_NO(NO), m_NI(NI),  m_initialized(initialized),
 			m_outs(outs), m_timing(timing), m_timing_nt(timing_nt),
-			m_num_bits(m_NI + has_state * (m_NI + m_NO)),
+			m_num_bits(m_NI),
 			m_size(1 << (m_num_bits))
 		{
 		}
@@ -160,15 +137,15 @@ namespace netlist
 
 	};
 
-	template<unsigned m_NI, unsigned m_NO, int m_has_state>
+	template<unsigned m_NI, unsigned m_NO>
 	NETLIB_OBJECT(truthtable_t)
 	{
 	private:
 		family_setter_t m_fam;
 	public:
 
-		static const int m_num_bits = m_NI + m_has_state * (m_NI + m_NO);
-		static const int m_size = (1 << (m_num_bits));
+		static constexpr int m_num_bits = m_NI;
+		static constexpr int m_size = (1 << (m_num_bits));
 
 		struct truthtable_t
 		{
@@ -186,7 +163,6 @@ namespace netlist
 				truthtable_t *ttp, const char *desc[])
 		: device_t(owner, name)
 		, m_fam(*this, fam)
-		, m_last_state(*this, "m_last_state", 0)
 		, m_ign(*this, "m_ign", 0)
 		, m_active(*this, "m_active", 1)
 		, m_use_deactivate(*this, "USE_DEACTIVATE", true)
@@ -205,7 +181,6 @@ namespace netlist
 				truthtable_t *ttp, const plib::pstring_vector_t &desc)
 		: device_t(owner, name)
 		, m_fam(*this, fam)
-		, m_last_state(*this, "m_last_state", 0)
 		, m_ign(*this, "m_ign", 0)
 		, m_active(*this, "m_active", 1)
 		, m_use_deactivate(*this, "USE_DEACTIVATE", true)
@@ -255,8 +230,9 @@ namespace netlist
 
 			m_ign = 0;
 
-			truthtable_desc_t desc(m_NO, m_NI, m_has_state,
-					&m_ttp->m_initialized, packed_int(m_ttp->m_outs), m_ttp->m_timing, m_ttp->m_timing_nt);
+			truthtable_desc_t desc(m_NO, m_NI, &m_ttp->m_initialized,
+					packed_int(m_ttp->m_outs),
+					m_ttp->m_timing, m_ttp->m_timing_nt);
 
 			desc.setup(m_desc, disabled_ignore * 0);
 	#if 0
@@ -278,7 +254,6 @@ namespace netlist
 			for (std::size_t i=0; i<m_NO;i++)
 				if (this->m_Q[i].net().num_cons()>0)
 					m_active++;
-			m_last_state = 0;
 		}
 
 		NETLIB_UPDATEI()
@@ -289,7 +264,7 @@ namespace netlist
 	public:
 		void inc_active() override
 		{
-			if (m_NI > 1 && m_has_state == 0 && m_use_deactivate)
+			if (m_NI > 1 && m_use_deactivate)
 				if (++m_active == 1)
 				{
 					process<false>();
@@ -304,7 +279,7 @@ namespace netlist
 			 * can decide for each individual gate whether it is benefitial to
 			 * ignore deactivation.
 			 */
-			if (m_NI > 1 && m_has_state == 0 && m_use_deactivate)
+			if (m_NI > 1 && m_use_deactivate)
 				if (--m_active == 0)
 				{
 					for (std::size_t i = 0; i< m_NI; i++)
@@ -328,7 +303,7 @@ namespace netlist
 			netlist_time mt = netlist_time::zero();
 
 			uint_least64_t state = 0;
-			if (m_NI > 1 && !m_has_state)
+			if (m_NI > 1)
 			{
 				auto ign = m_ign;
 				if (!doOUT)
@@ -360,9 +335,6 @@ namespace netlist
 			}
 			auto nstate = state;
 
-			if (m_has_state)
-				nstate |= (m_last_state << m_NI);
-
 			const auto outstate = m_ttp->m_outs[nstate];
 			const auto out = outstate & ((1 << m_NO) - 1);
 
@@ -379,10 +351,7 @@ namespace netlist
 				for (std::size_t i = 0; i < m_NO; i++)
 					m_Q[i].net().set_Q_time((out >> i) & 1, mt + m_ttp->m_timing_nt[m_ttp->m_timing[timebase + i]]);
 
-			if (m_has_state)
-				m_last_state = (state << m_NO) | out;
-
-			if (m_NI > 1 && !m_has_state)
+			if (m_NI > 1)
 			{
 				auto ign(m_ign);
 				for (std::size_t i = 0; ign != 0; ign >>= 1, i++)
@@ -392,11 +361,10 @@ namespace netlist
 		}
 
 		/* FIXME: check width */
-		state_var_u32 m_last_state;
-		state_var_u32 m_ign;
-		state_var_s32  m_active;
-		param_logic_t     m_use_deactivate;
-		truthtable_t *m_ttp;
+		state_var_u32		m_ign;
+		state_var_s32		m_active;
+		param_logic_t		m_use_deactivate;
+		truthtable_t *		m_ttp;
 		plib::pstring_vector_t m_desc;
 	};
 
@@ -417,19 +385,7 @@ namespace netlist
 		const logic_family_desc_t *m_family;
 	};
 
-	struct tt_desc
-	{
-		pstring name;
-		pstring classname;
-		unsigned ni;
-		unsigned no;
-		unsigned has_state;
-		pstring def_param;
-		plib::pstring_vector_t desc;
-		pstring family;
-	};
-
-	void nl_tt_factory_create(setup_t &setup, tt_desc &desc);
+	void tt_factory_create(setup_t &setup, tt_desc &desc);
 
 	} //namespace devices
 } // namespace netlist
diff --git a/src/lib/netlist/macro/nlm_cd4xxx.cpp b/src/lib/netlist/macro/nlm_cd4xxx.cpp
index f7eda575bab..d622881abb4 100644
--- a/src/lib/netlist/macro/nlm_cd4xxx.cpp
+++ b/src/lib/netlist/macro/nlm_cd4xxx.cpp
@@ -155,7 +155,7 @@ NETLIST_END()
 
 NETLIST_START(CD4XXX_lib)
 
-	TRUTHTABLE_START(CD4001_NOR, 2, 1, 0, "")
+	TRUTHTABLE_START(CD4001_NOR, 2, 1, "")
 		TT_HEAD("A , B | Q ")
 		TT_LINE("0,0|1|85")
 		TT_LINE("X,1|0|120")
diff --git a/src/lib/netlist/macro/nlm_other.cpp b/src/lib/netlist/macro/nlm_other.cpp
index 9a5e54af737..6fd73a29fe8 100644
--- a/src/lib/netlist/macro/nlm_other.cpp
+++ b/src/lib/netlist/macro/nlm_other.cpp
@@ -45,7 +45,7 @@ NETLIST_START(MC14584B_DIP)
 NETLIST_END()
 
 NETLIST_START(otheric_lib)
-	TRUTHTABLE_START(MC14584B_GATE, 1, 1, 0, "")
+	TRUTHTABLE_START(MC14584B_GATE, 1, 1, "")
 		TT_HEAD(" A | Q ")
 		TT_LINE(" 0 | 1 |100")
 		TT_LINE(" 1 | 0 |100")
diff --git a/src/lib/netlist/macro/nlm_ttl74xx.cpp b/src/lib/netlist/macro/nlm_ttl74xx.cpp
index 25bf7573c03..41065012690 100644
--- a/src/lib/netlist/macro/nlm_ttl74xx.cpp
+++ b/src/lib/netlist/macro/nlm_ttl74xx.cpp
@@ -542,7 +542,7 @@ NETLIST_END()
 
 NETLIST_START(TTL74XX_lib)
 
-	TRUTHTABLE_START(TTL_7400_GATE, 2, 1, 0, "")
+	TRUTHTABLE_START(TTL_7400_GATE, 2, 1, "")
 		TT_HEAD("A,B|Q ")
 		TT_LINE("0,X|1|22")
 		TT_LINE("X,0|1|22")
@@ -550,7 +550,7 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7400_NAND, 2, 1, 0, "A,B")
+	TRUTHTABLE_START(TTL_7400_NAND, 2, 1, "A,B")
 		TT_HEAD("A,B|Q ")
 		TT_LINE("0,X|1|22")
 		TT_LINE("X,0|1|22")
@@ -558,7 +558,7 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7402_GATE, 2, 1, 0, "")
+	TRUTHTABLE_START(TTL_7402_GATE, 2, 1, "")
 		TT_HEAD("A,B|Q ")
 		TT_LINE("0,0|1|22")
 		TT_LINE("X,1|0|15")
@@ -566,7 +566,7 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7402_NOR, 2, 1, 0, "A,B")
+	TRUTHTABLE_START(TTL_7402_NOR, 2, 1, "A,B")
 		TT_HEAD("A,B|Q ")
 		TT_LINE("0,0|1|22")
 		TT_LINE("X,1|0|15")
@@ -574,21 +574,21 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7404_GATE, 1, 1, 0, "")
+	TRUTHTABLE_START(TTL_7404_GATE, 1, 1, "")
 		TT_HEAD(" A | Q ")
 		TT_LINE(" 0 | 1 |22")
 		TT_LINE(" 1 | 0 |15")
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7404_INVERT, 1, 1, 0, "A")
+	TRUTHTABLE_START(TTL_7404_INVERT, 1, 1, "A")
 		TT_HEAD(" A | Q ")
 		TT_LINE(" 0 | 1 |22")
 		TT_LINE(" 1 | 0 |15")
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7408_GATE, 2, 1, 0, "")
+	TRUTHTABLE_START(TTL_7408_GATE, 2, 1, "")
 		TT_HEAD("A,B|Q ")
 		TT_LINE("0,X|0|15")
 		TT_LINE("X,0|0|15")
@@ -596,7 +596,7 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7408_AND, 2, 1, 0, "A,B")
+	TRUTHTABLE_START(TTL_7408_AND, 2, 1, "A,B")
 		TT_HEAD("A,B|Q ")
 		TT_LINE("0,X|0|15")
 		TT_LINE("X,0|0|15")
@@ -604,7 +604,7 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7410_NAND, 3, 1, 0, "A,B,C")
+	TRUTHTABLE_START(TTL_7410_NAND, 3, 1, "A,B,C")
 		TT_HEAD("A,B,C|Q ")
 		TT_LINE("0,X,X|1|22")
 		TT_LINE("X,0,X|1|22")
@@ -613,7 +613,7 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7410_GATE, 3, 1, 0, "")
+	TRUTHTABLE_START(TTL_7410_GATE, 3, 1, "")
 		TT_HEAD("A,B,C|Q ")
 		TT_LINE("0,X,X|1|22")
 		TT_LINE("X,0,X|1|22")
@@ -622,7 +622,7 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7411_AND, 3, 1, 0, "A,B,C")
+	TRUTHTABLE_START(TTL_7411_AND, 3, 1, "A,B,C")
 		TT_HEAD("A,B,C|Q ")
 		TT_LINE("0,X,X|0|15")
 		TT_LINE("X,0,X|0|15")
@@ -631,7 +631,7 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7411_GATE, 3, 1, 0, "")
+	TRUTHTABLE_START(TTL_7411_GATE, 3, 1, "")
 		TT_HEAD("A,B,C|Q ")
 		TT_LINE("0,X,X|0|15")
 		TT_LINE("X,0,X|0|15")
@@ -640,7 +640,7 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7416_GATE, 1, 1, 0, "")
+	TRUTHTABLE_START(TTL_7416_GATE, 1, 1, "")
 		TT_HEAD(" A | Q ")
 		TT_LINE(" 0 | 1 |15")
 		TT_LINE(" 1 | 0 |23")
@@ -648,7 +648,7 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XXOC")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7420_GATE, 4, 1, 0, "")
+	TRUTHTABLE_START(TTL_7420_GATE, 4, 1, "")
 		TT_HEAD("A,B,C,D|Q ")
 		TT_LINE("0,X,X,X|1|22")
 		TT_LINE("X,0,X,X|1|22")
@@ -658,7 +658,7 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7420_NAND, 4, 1, 0, "A,B,C,D")
+	TRUTHTABLE_START(TTL_7420_NAND, 4, 1, "A,B,C,D")
 		TT_HEAD("A,B,C,D|Q ")
 		TT_LINE("0,X,X,X|1|22")
 		TT_LINE("X,0,X,X|1|22")
@@ -668,7 +668,7 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7425_GATE, 4, 1, 0, "")
+	TRUTHTABLE_START(TTL_7425_GATE, 4, 1, "")
 		TT_HEAD("A,B,C,D|Q ")
 		TT_LINE("1,X,X,X|0|15")
 		TT_LINE("X,1,X,X|0|15")
@@ -678,7 +678,7 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7425_NOR, 4, 1, 0, "A,B,C,D")
+	TRUTHTABLE_START(TTL_7425_NOR, 4, 1, "A,B,C,D")
 		TT_HEAD("A,B,C,D|Q ")
 		TT_LINE("1,X,X,X|0|15")
 		TT_LINE("X,1,X,X|0|15")
@@ -688,7 +688,7 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7427_GATE, 3, 1, 0, "")
+	TRUTHTABLE_START(TTL_7427_GATE, 3, 1, "")
 		TT_HEAD("A,B,C|Q ")
 		TT_LINE("1,X,X|0|15")
 		TT_LINE("X,1,X|0|15")
@@ -697,7 +697,7 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7427_NOR, 3, 1, 0, "A,B,C")
+	TRUTHTABLE_START(TTL_7427_NOR, 3, 1, "A,B,C")
 		TT_HEAD("A,B,C|Q ")
 		TT_LINE("1,X,X|0|15")
 		TT_LINE("X,1,X|0|15")
@@ -706,7 +706,7 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7430_GATE, 8, 1, 0, "")
+	TRUTHTABLE_START(TTL_7430_GATE, 8, 1, "")
 		TT_HEAD("A,B,C,D,E,F,G,H|Q ")
 		TT_LINE("0,X,X,X,X,X,X,X|1|22")
 		TT_LINE("X,0,X,X,X,X,X,X|1|22")
@@ -720,7 +720,7 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7430_NAND, 8, 1, 0, "A,B,C,D,E,F,G,H")
+	TRUTHTABLE_START(TTL_7430_NAND, 8, 1, "A,B,C,D,E,F,G,H")
 		TT_HEAD("A,B,C,D,E,F,G,H|Q ")
 		TT_LINE("0,X,X,X,X,X,X,X|1|22")
 		TT_LINE("X,0,X,X,X,X,X,X|1|22")
@@ -734,7 +734,7 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7432_GATE, 2, 1, 0, "")
+	TRUTHTABLE_START(TTL_7432_GATE, 2, 1, "")
 		TT_HEAD("A,B|Q ")
 		TT_LINE("1,X|1|22")
 		TT_LINE("X,1|1|22")
@@ -742,7 +742,7 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7432_OR, 2, 1, 0, "A,B")
+	TRUTHTABLE_START(TTL_7432_OR, 2, 1, "A,B")
 		TT_HEAD("A,B|Q ")
 		TT_LINE("1,X|1|22")
 		TT_LINE("X,1|1|22")
@@ -754,7 +754,7 @@ NETLIST_START(TTL74XX_lib)
 	 *         Netlist currently does not model over currents (should it ever?)
 	 */
 
-	TRUTHTABLE_START(TTL_7437_GATE, 2, 1, 0, "")
+	TRUTHTABLE_START(TTL_7437_GATE, 2, 1, "")
 		TT_HEAD("A,B|Q ")
 		TT_LINE("0,X|1|22")
 		TT_LINE("X,0|1|22")
@@ -762,7 +762,7 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7437_NAND, 2, 1, 0, "A,B")
+	TRUTHTABLE_START(TTL_7437_NAND, 2, 1, "A,B")
 		TT_HEAD("A,B|Q ")
 		TT_LINE("0,X|1|22")
 		TT_LINE("X,0|1|22")
@@ -770,7 +770,7 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7486_GATE, 2, 1, 0, "")
+	TRUTHTABLE_START(TTL_7486_GATE, 2, 1, "")
 		TT_HEAD("A,B|Q ")
 		TT_LINE("0,0|0|15")
 		TT_LINE("0,1|1|22")
@@ -779,7 +779,7 @@ NETLIST_START(TTL74XX_lib)
 		TT_FAMILY("74XX")
 	TRUTHTABLE_END()
 
-	TRUTHTABLE_START(TTL_7486_XOR, 2, 1, 0, "A,B")
+	TRUTHTABLE_START(TTL_7486_XOR, 2, 1, "A,B")
 		TT_HEAD("A,B|Q ")
 		TT_LINE("0,0|0|15")
 		TT_LINE("0,1|1|22")
diff --git a/src/lib/netlist/nl_parser.cpp b/src/lib/netlist/nl_parser.cpp
index 7ec3fdca2be..b4e3c14cf4d 100644
--- a/src/lib/netlist/nl_parser.cpp
+++ b/src/lib/netlist/nl_parser.cpp
@@ -153,17 +153,14 @@ void parser_t::net_truthtable_start()
 	require_token(m_tok_comma);
 	unsigned no = get_number_long();
 	require_token(m_tok_comma);
-	unsigned hs = get_number_long();
-	require_token(m_tok_comma);
 	pstring def_param = get_string();
 	require_token(m_tok_param_right);
 
-	netlist::devices::tt_desc desc;
+	netlist::tt_desc desc;
 	desc.classname = name;
 	desc.name = name;
 	desc.ni = ni;
 	desc.no = no;
-	desc.has_state = hs;
 	desc.def_param = "+" + def_param;
 	desc.family = "";
 
@@ -194,7 +191,7 @@ void parser_t::net_truthtable_start()
 			require_token(token, m_tok_TRUTHTABLE_END);
 			require_token(m_tok_param_left);
 			require_token(m_tok_param_right);
-			netlist::devices::nl_tt_factory_create(m_setup, desc);
+			netlist::devices::tt_factory_create(m_setup, desc);
 			return;
 		}
 	}
diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp
index a9c6c1249e6..81e2514d90a 100644
--- a/src/lib/netlist/nl_setup.cpp
+++ b/src/lib/netlist/nl_setup.cpp
@@ -16,6 +16,7 @@
 #include "nl_parser.h"
 #include "nl_factory.h"
 #include "devices/net_lib.h"
+#include "devices/nld_truthtable.h"
 #include "devices/nlid_system.h"
 #include "analog/nld_twoterm.h"
 #include "solver/nld_solver.h"
@@ -936,6 +937,12 @@ nl_double setup_t::model_value(model_map_t &map, const pstring &entity)
 	return tmp.as_double() * factor;
 }
 
+void setup_t::tt_factory_create(tt_desc &desc)
+{
+	devices::tt_factory_create(*this, desc);
+}
+
+
 // ----------------------------------------------------------------------------------------
 // Sources
 // ----------------------------------------------------------------------------------------
diff --git a/src/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h
index caf9fddff92..bb0bbaf0c14 100644
--- a/src/lib/netlist/nl_setup.h
+++ b/src/lib/netlist/nl_setup.h
@@ -60,6 +60,7 @@
 #define NETLIST_START(name)                                                    \
 void NETLIST_NAME(name)(netlist::setup_t &setup)                               \
 {
+
 #define NETLIST_END()  }
 
 #define LOCAL_SOURCE(name)                                                     \
@@ -77,9 +78,52 @@ void NETLIST_NAME(name)(netlist::setup_t &setup)                               \
 		NETLIST_NAME(model)(setup);                                            \
 		setup.namespace_pop();
 
+// -----------------------------------------------------------------------------
+// truthtable defines
+// -----------------------------------------------------------------------------
+
+#define TRUTHTABLE_START(cname, in, out, def_params) \
+	{ \
+		netlist::tt_desc desc; \
+		desc.name = #cname ; \
+		desc.classname = #cname ; \
+		desc.ni = in; \
+		desc.no = out; \
+		desc.def_param = pstring("+") + def_params; \
+		desc.family = "";
+
+#define TT_HEAD(x) \
+		desc.desc.push_back(x);
+
+#define TT_LINE(x) \
+		desc.desc.push_back(x);
+
+#define TT_FAMILY(x) \
+		desc.family = x;
+
+#define TRUTHTABLE_END() \
+		netlist::devices::tt_factory_create(setup, desc);		\
+	}
+
+
 namespace netlist
 {
 
+	// -----------------------------------------------------------------------------
+	// truthtable desc
+	// -----------------------------------------------------------------------------
+
+	struct tt_desc
+	{
+		pstring name;
+		pstring classname;
+		unsigned ni;
+		unsigned no;
+		pstring def_param;
+		plib::pstring_vector_t desc;
+		pstring family;
+	};
+
 	// -----------------------------------------------------------------------------
 	// param_ref_t
 	// -----------------------------------------------------------------------------
@@ -204,6 +248,10 @@ namespace netlist
 
 		std::vector<std::pair<pstring, base_factory_t *>> m_device_factory;
 
+		/* FIXME: truth table trampoline */
+
+		void tt_factory_create(tt_desc &desc);
+
 	protected:
 
 	private:

From 9cd5169f51bd8adea46a64f2d2d2b54fa6eefd8b Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Sat, 18 Jun 2016 13:48:13 +0200
Subject: [PATCH 28/39] Use unique_ptr for factory. (nw)

---
 src/lib/netlist/devices/nld_truthtable.cpp |  2 +-
 src/lib/netlist/nl_factory.h               | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/lib/netlist/devices/nld_truthtable.cpp b/src/lib/netlist/devices/nld_truthtable.cpp
index 5840a6bbd90..29895ae8b4c 100644
--- a/src/lib/netlist/devices/nld_truthtable.cpp
+++ b/src/lib/netlist/devices/nld_truthtable.cpp
@@ -289,7 +289,7 @@ void tt_factory_create(setup_t &setup, tt_desc &desc)
 	ret->m_desc = desc.desc;
 	if (desc.family != "")
 		ret->m_family = setup.family_from_model(desc.family);
-	setup.factory().register_device(plib::owned_ptr<netlist_base_factory_truthtable_t>(ret, true));
+	setup.factory().register_device(std::unique_ptr<netlist_base_factory_truthtable_t>(ret));
 }
 
 	} //namespace devices
diff --git a/src/lib/netlist/nl_factory.h b/src/lib/netlist/nl_factory.h
index b85e85bf6b8..f97dad9bf5a 100644
--- a/src/lib/netlist/nl_factory.h
+++ b/src/lib/netlist/nl_factory.h
@@ -65,7 +65,7 @@ namespace netlist
 		}
 	};
 
-	class factory_list_t : public std::vector<plib::owned_ptr<base_factory_t>>
+	class factory_list_t : public std::vector<std::unique_ptr<base_factory_t>>
 	{
 	public:
 		factory_list_t(setup_t &m_setup);
@@ -75,10 +75,10 @@ namespace netlist
 		void register_device(const pstring &name, const pstring &classname,
 				const pstring &def_param)
 		{
-			register_device(plib::owned_ptr<base_factory_t>::Create<factory_t<device_class>>(name, classname, def_param));
+			register_device(std::unique_ptr<base_factory_t>(new factory_t<device_class>(name, classname, def_param)));
 		}
 
-		void register_device(plib::owned_ptr<base_factory_t> factory)
+		void register_device(std::unique_ptr<base_factory_t> factory)
 		{
 			for (auto & e : *this)
 				if (e->name() == factory->name())
@@ -104,14 +104,14 @@ namespace netlist
 	// factory_creator_ptr_t
 	// -----------------------------------------------------------------------------
 
-	using factory_creator_ptr_t = plib::owned_ptr<base_factory_t> (*)(const pstring &name, const pstring &classname,
+	using factory_creator_ptr_t = std::unique_ptr<base_factory_t> (*)(const pstring &name, const pstring &classname,
 			const pstring &def_param);
 
 	template <typename T>
-	plib::owned_ptr<base_factory_t> factory_creator_t(const pstring &name, const pstring &classname,
+	std::unique_ptr<base_factory_t> factory_creator_t(const pstring &name, const pstring &classname,
 			const pstring &def_param)
 	{
-		return plib::owned_ptr<base_factory_t>::Create<factory_t<T>>(name, classname, def_param);
+		return std::unique_ptr<base_factory_t>(new factory_t<T>(name, classname, def_param));
 	}
 
 }

From 2dce3f7cea539be39867be6f9f332571a7772a44 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Sat, 18 Jun 2016 17:27:18 +0200
Subject: [PATCH 29/39] Make help2man ./nltool produce usuable output. (nw)

---
 src/lib/netlist/build/makefile   | 31 +++++++++++--
 src/lib/netlist/plib/poptions.h  | 78 +++++++++++++++++++++++---------
 src/lib/netlist/plib/pstring.cpp |  2 +-
 src/lib/netlist/prg/nltool.cpp   | 50 ++++++++++++--------
 src/lib/netlist/prg/nlwav.cpp    | 12 ++---
 5 files changed, 120 insertions(+), 53 deletions(-)

diff --git a/src/lib/netlist/build/makefile b/src/lib/netlist/build/makefile
index c1729cc0c39..aa3b841f595 100644
--- a/src/lib/netlist/build/makefile
+++ b/src/lib/netlist/build/makefile
@@ -23,7 +23,7 @@ CDEFS = -DPSTANDALONE=1 -DPTR64=1
 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
 
-CC = @g++-5
+CC = g++-5
 LD = @g++-5
 MD = @mkdir
 RM = @rm
@@ -101,6 +101,13 @@ NLOBJS := \
 	$(NLOBJ)/solver/nld_solver.o \
 	$(NLOBJ)/tools/nl_convert.o \
 
+ALL_OBJS = $(OBJS) $(NLOBJ)/prg/nltool.o $(NLOBJ)/prg/nlwav.o
+SOURCES = $(patsubst $(OBJ)%, $(SRC)%, $(ALL_OBJS:.o=.cpp))
+
+#-------------------------------------------------
+# all
+#-------------------------------------------------
+
 all:	maketree $(TARGETS)
 
 #-------------------------------------------------
@@ -108,7 +115,7 @@ all:	maketree $(TARGETS)
 #-------------------------------------------------
 
 clean:
-	$(RM) -rf $(OBJS) $(TARGETS)
+	$(RM) -rf $(OBJS) $(TARGETS) .depend
 
 #-------------------------------------------------
 # nltool
@@ -131,6 +138,20 @@ $(sort $(OBJDIRS)):
 
 maketree: $(sort $(OBJDIRS))
 
+#-------------------------------------------------
+# depends
+#-------------------------------------------------
+
+depend: .depend
+
+.depend: $(SOURCES)
+	@echo creating .depend
+	@rm -f ./.depend
+	@for i in $(SOURCES); do \
+		$(CC) $(CFLAGS) -MM $$i -MT `echo $$i | sed -e 's/$(SRC)/$(OBJ)/' -e 's/.cpp/.o/' ` >>./.depend; \
+	done
+
+-include .depend
 
 #-------------------------------------------------
 # generic rules
@@ -138,15 +159,15 @@ maketree: $(sort $(OBJDIRS))
 
 $(OBJ)/%.o: $(SRC)/%.cpp
 	@echo Compiling $<...
-	$(CC) $(CDEFS) $(CFLAGS) -c $< -o $@
+	@$(CC) $(CDEFS) $(CFLAGS) -c $< -o $@
 
 $(OBJ)/%.pp: $(SRC)/%.cpp | $(OSPREBUILD)
 	@echo Compiling $<...
-	$(CC) $(CDEFS) $(CFLAGS) -E $< -o $@
+	@$(CC) $(CDEFS) $(CFLAGS) -E $< -o $@
 
 $(OBJ)/%.s: $(SRC)/%.cpp | $(OSPREBUILD)
 	@echo Compiling $<...
-	$(CC) $(CDEFS) $(CFLAGS) -S $< -o $@
+	@$(CC) $(CDEFS) $(CFLAGS) -S $< -o $@
 
 $(OBJ)/%.a:
 	@echo Archiving $@...
diff --git a/src/lib/netlist/plib/poptions.h b/src/lib/netlist/plib/poptions.h
index 3ab1adb78c6..9e1219f00fe 100644
--- a/src/lib/netlist/plib/poptions.h
+++ b/src/lib/netlist/plib/poptions.h
@@ -31,7 +31,7 @@ public:
 	: m_short(""), m_long(""), m_help(""), m_has_argument(false)
 	{}
 
-	option(pstring ashort, pstring along, pstring help, bool has_argument, options *parent = nullptr);
+	option(options &parent, pstring ashort, pstring along, pstring help, bool has_argument);
 
 	virtual ~option()
 	{
@@ -41,18 +41,22 @@ public:
 
 	virtual int parse(ATTR_UNUSED pstring argument) { return 0; }
 
+	pstring short_opt() { return m_short; }
+	pstring long_opt() { return m_long; }
+	pstring help() { return m_help; }
+	bool has_argument() { return m_has_argument ; }
+private:
 	pstring m_short;
 	pstring m_long;
 	pstring m_help;
 	bool m_has_argument;
-private:
 };
 
 class option_str : public option
 {
 public:
-	option_str(pstring ashort, pstring along, pstring defval, pstring help, options *parent = nullptr)
-	: option(ashort, along, help, true, parent), m_val(defval)
+	option_str(options &parent, pstring ashort, pstring along, pstring defval, pstring help)
+	: option(parent, ashort, along, help, true), m_val(defval)
 	{}
 
 	virtual int parse(pstring argument) override { m_val = argument; return 0; }
@@ -65,8 +69,8 @@ private:
 class option_str_limit : public option
 {
 public:
-	option_str_limit(pstring ashort, pstring along, pstring defval, pstring limit, pstring help, options *parent = nullptr)
-	: option(ashort, along, help, true, parent), m_val(defval), m_limit(limit, ":")
+	option_str_limit(options &parent, pstring ashort, pstring along, pstring defval, pstring limit, pstring help)
+	: option(parent, ashort, along, help, true), m_val(defval), m_limit(limit, ":")
 	{}
 
 	virtual int parse(pstring argument) override
@@ -81,6 +85,8 @@ public:
 	}
 
 	pstring operator ()() { return m_val; }
+	const plib::pstring_vector_t &limit() { return m_limit; }
+
 private:
 	pstring m_val;
 	plib::pstring_vector_t m_limit;
@@ -89,8 +95,8 @@ private:
 class option_bool : public option
 {
 public:
-	option_bool(pstring ashort, pstring along, pstring help, options *parent = nullptr)
-	: option(ashort, along, help, false, parent), m_val(false)
+	option_bool(options &parent, pstring ashort, pstring along, pstring help)
+	: option(parent, ashort, along, help, false), m_val(false)
 	{}
 
 	virtual int parse(ATTR_UNUSED pstring argument) override { m_val = true; return 0; }
@@ -103,8 +109,8 @@ private:
 class option_double : public option
 {
 public:
-	option_double(pstring ashort, pstring along, double defval, pstring help, options *parent = nullptr)
-	: option(ashort, along, help, true, parent), m_val(defval)
+	option_double(options &parent, pstring ashort, pstring along, double defval, pstring help)
+	: option(parent, ashort, along, help, true), m_val(defval)
 	{}
 
 	virtual int parse(pstring argument) override
@@ -166,7 +172,7 @@ public:
 				return i;
 			if (opt == nullptr)
 				return i;
-			if (opt->m_has_argument)
+			if (opt->has_argument())
 			{
 				i++; // FIXME: are there more arguments?
 				if (opt->parse(argv[i]) != 0)
@@ -186,17 +192,46 @@ public:
 		for (auto & opt : m_opts )
 		{
 			pstring line = "";
-			if (opt->m_short != "")
-				line += "  -" + opt->m_short;
-			if (opt->m_long != "")
+			if (opt->short_opt() != "")
+				line += "  -" + opt->short_opt();
+			if (opt->long_opt() != "")
 			{
 				if (line != "")
 					line += ", ";
 				else
-					line = "     ";
-				line += "--" + opt->m_long;
+					line = "      ";
+				line += "--" + opt->long_opt();
+				if (opt->has_argument())
+				{
+					line += "=";
+					option_str_limit *ol = dynamic_cast<option_str_limit *>(opt);
+					if (ol)
+					{
+						for (auto &v : ol->limit())
+						{
+							line += v + "|";
+						}
+						line = line.left(line.len() - 1);
+					}
+					else
+						line += "Value";
+				}
+			}
+			line = line.rpad(" ", 20) + " ";
+			if (line.len() > 21)
+			{
+				ret += line + "\n";
+				line = pstring("").rpad(" ", 21);
+			}
+			for (auto &s : pstring_vector_t(opt->help(), " "))
+			{
+				if (line.len() + s.len() > 72)
+				{
+					ret += line + "\n";
+					line = pstring("").rpad(" ", 21);
+				}
+				line += s + " ";
 			}
-			line = line.rpad(" ", 20).cat(opt->m_help);
 			ret = ret + line + "\n";
 		}
 		return ret;
@@ -209,7 +244,7 @@ private:
 	{
 		for (auto & opt : m_opts)
 		{
-			if (opt->m_short == arg)
+			if (opt->short_opt() == arg)
 				return opt;
 		}
 		return nullptr;
@@ -218,7 +253,7 @@ private:
 	{
 		for (auto & opt : m_opts)
 		{
-			if (opt->m_long == arg)
+			if (opt->long_opt() == arg)
 				return opt;
 		}
 		return nullptr;
@@ -228,11 +263,10 @@ private:
 	pstring m_app;
 };
 
-option::option(pstring ashort, pstring along, pstring help, bool has_argument, options *parent)
+option::option(options &parent, pstring ashort, pstring along, pstring help, bool has_argument)
 : m_short(ashort), m_long(along), m_help(help), m_has_argument(has_argument)
 {
-	if (parent != nullptr)
-		parent->register_option(this);
+	parent.register_option(this);
 }
 
 }
diff --git a/src/lib/netlist/plib/pstring.cpp b/src/lib/netlist/plib/pstring.cpp
index f6dff95fb12..20573f5bfa5 100644
--- a/src/lib/netlist/plib/pstring.cpp
+++ b/src/lib/netlist/plib/pstring.cpp
@@ -258,7 +258,7 @@ const pstring_t<F> pstring_t<F>::rpad(const pstring_t &ws, const unsigned cnt) c
 	pstring_t ret(*this);
 	while (ret.len() < cnt)
 		ret += ws;
-	return pstring_t(ret).substr(0, cnt);
+	return ret;
 }
 
 
diff --git a/src/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp
index 5687cd42078..aedad0dcb30 100644
--- a/src/lib/netlist/prg/nltool.cpp
+++ b/src/lib/netlist/prg/nltool.cpp
@@ -26,16 +26,17 @@ class tool_options_t : public plib::options
 public:
 	tool_options_t() :
 		plib::options(),
-		opt_ttr ("t", "time_to_run", 1.0,   "time to run the emulation (seconds)", this),
-		opt_name("n", "name",        "",      "netlist in file to run; default is first one", this),
-		opt_logs("l", "logs",        "",      "colon separated list of terminals to log", this),
-		opt_file("f", "file",        "-",     "file to process (default is stdin)", this),
-		opt_type("y", "type",        "spice", "spice:eagle", "type of file to be converted: spice,eagle", this),
-		opt_cmd ("c", "cmd",         "run",   "run|convert|listdevices|static", this),
-		opt_inp( "i", "input",       "",      "input file to process (default is none)", this),
-		opt_verb("v", "verbose",              "be verbose - this produces lots of output", this),
-		opt_quiet("q", "quiet",               "be quiet - no warnings", this),
-		opt_help("h", "help",                 "display help", this)
+		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;
@@ -43,10 +44,11 @@ public:
 	plib::option_str    opt_logs;
 	plib::option_str    opt_file;
 	plib::option_str_limit opt_type;
-	plib::option_str    opt_cmd;
+	plib::option_str_limit opt_cmd;
 	plib::option_str    opt_inp;
 	plib::option_bool   opt_verb;
 	plib::option_bool   opt_quiet;
+	plib::option_bool   opt_version;
 	plib::option_bool   opt_help;
 };
 
@@ -133,14 +135,12 @@ private:
 
 void usage(tool_options_t &opts)
 {
-	perr("{}",
-		"Usage:\n"
-		"  nltool --help\n"
-		"  nltool [options]\n"
+	pout("{}",
+		"Usage: nltool [options]\n"
 		"\n"
-		"Where:\n"
+		"Options:\n"
 	);
-	perr("{}\n", opts.help().cstr());
+	pout("{}\n", opts.help().cstr());
 }
 
 struct input_t
@@ -351,7 +351,7 @@ int main(int argc, char *argv[])
 	tool_options_t opts;
 	int ret;
 
-	perr("{}", "WARNING: This is Work In Progress! - It may fail anytime\n");
+	//perr("{}", "WARNING: This is Work In Progress! - It may fail anytime\n");
 	//perr("Update dispatching using method {}\n", pmf_verbose[NL_PMF_TYPE]);
 	if ((ret = opts.parse(argc, argv)) != argc)
 	{
@@ -363,7 +363,19 @@ int main(int argc, char *argv[])
 	if (opts.opt_help())
 	{
 		usage(opts);
-		return 1;
+		return 0;
+	}
+
+	if (opts.opt_version())
+	{
+		pout(
+			"nltool (netlist) 0.1\n"
+			"Copyright (C) 2016 Couriersud\n"
+			"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>.\n"
+			"This is free software: you are free to change and redistribute it.\n"
+			"There is NO WARRANTY, to the extent permitted by law.\n\n"
+			"Written by Couriersud.\n");
+		return 0;
 	}
 
 	pstring cmd = opts.opt_cmd();
diff --git a/src/lib/netlist/prg/nlwav.cpp b/src/lib/netlist/prg/nlwav.cpp
index d822b78d231..d5a9e9866c5 100644
--- a/src/lib/netlist/prg/nlwav.cpp
+++ b/src/lib/netlist/prg/nlwav.cpp
@@ -13,12 +13,12 @@ class nlwav_options_t : public plib::options
 public:
 	nlwav_options_t() :
 		plib::options(),
-		opt_inp( "i", "input",       "",      "input file", this),
-		opt_out( "o", "output",      "",      "output file", this),
-		opt_amp( "a", "amp",    10000.0,      "amplification after mean correction", this),
-		opt_verb("v", "verbose",              "be verbose - this produces lots of output", this),
-		opt_quiet("q", "quiet",               "be quiet - no warnings", this),
-		opt_help("h", "help",                 "display help", this)
+		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_help(*this,	"h", "help",                 "display help")
 	{}
 	plib::option_str    opt_inp;
 	plib::option_str    opt_out;

From 1e58b218ed1de42c001b685bb724c9ac08443fda Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Sat, 18 Jun 2016 19:52:20 +0200
Subject: [PATCH 30/39] More help2man compatibility. (nw)

---
 src/lib/netlist/plib/poptions.h | 67 +++++++++++++++++++++++++--------
 src/lib/netlist/prg/nltool.cpp  |  9 ++---
 src/lib/netlist/prg/nlwav.cpp   | 50 +++++++++++++++---------
 3 files changed, 86 insertions(+), 40 deletions(-)

diff --git a/src/lib/netlist/plib/poptions.h b/src/lib/netlist/plib/poptions.h
index 9e1219f00fe..b8965614c42 100644
--- a/src/lib/netlist/plib/poptions.h
+++ b/src/lib/netlist/plib/poptions.h
@@ -159,10 +159,15 @@ public:
 		{
 			pstring arg(argv[i]);
 			option *opt = nullptr;
+			pstring opt_arg;
+			bool has_equal_arg = false;
 
 			if (arg.startsWith("--"))
 			{
-				opt = getopt_long(arg.substr(2));
+				auto v = pstring_vector_t(arg.substr(2),"=");
+				opt = getopt_long(v[0]);
+				has_equal_arg = (v.size() > 1);
+				if (has_equal_arg) opt_arg = v[1];
 			}
 			else if (arg.startsWith("-"))
 			{
@@ -174,21 +179,59 @@ public:
 				return i;
 			if (opt->has_argument())
 			{
-				i++; // FIXME: are there more arguments?
-				if (opt->parse(argv[i]) != 0)
-					return i - 1;
+				if (has_equal_arg)
+				{
+					if (opt->parse(opt_arg) != 0)
+						return i;
+				}
+				else
+				{
+					i++; // FIXME: are there more arguments?
+					if (opt->parse(argv[i]) != 0)
+						return i - 1;
+				}
 			}
 			else
+			{
+				if (has_equal_arg)
+					return i;
 				opt->parse("");
+			}
 			i++;
 		}
 		return argc;
 	}
 
-	pstring help()
+	pstring split_paragraphs(pstring text, unsigned width, unsigned ident,
+			unsigned firstline_ident)
+	{
+		auto paragraphs = pstring_vector_t(text,"\n");
+		pstring ret("");
+
+		for (auto &p : paragraphs)
+		{
+			pstring line = pstring("").rpad(" ", firstline_ident);
+			for (auto &s : pstring_vector_t(p, " "))
+			{
+				if (line.len() + s.len() > width)
+				{
+					ret += line + "\n";
+					line = pstring("").rpad(" ", ident);
+				}
+				line += s + " ";
+			}
+			ret += line + "\n";
+		}
+		return ret;
+	}
+
+	pstring help(pstring description, pstring usage, unsigned width = 72, unsigned ident = 20)
 	{
 		pstring ret;
 
+		ret = split_paragraphs(description, width, 0, 0) + "\n";
+		ret += "Usage:\t" + usage + "\n\nOptions:\n";
+
 		for (auto & opt : m_opts )
 		{
 			pstring line = "";
@@ -221,18 +264,10 @@ public:
 			if (line.len() > 21)
 			{
 				ret += line + "\n";
-				line = pstring("").rpad(" ", 21);
+				ret += split_paragraphs(opt->help(), 72, 21, 21);
 			}
-			for (auto &s : pstring_vector_t(opt->help(), " "))
-			{
-				if (line.len() + s.len() > 72)
-				{
-					ret += line + "\n";
-					line = pstring("").rpad(" ", 21);
-				}
-				line += s + " ";
-			}
-			ret = ret + line + "\n";
+			else
+				ret += split_paragraphs(line + opt->help(), 72, 21, 0);
 		}
 		return ret;
 	}
diff --git a/src/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp
index aedad0dcb30..ca87f9fb36d 100644
--- a/src/lib/netlist/prg/nltool.cpp
+++ b/src/lib/netlist/prg/nltool.cpp
@@ -135,12 +135,9 @@ private:
 
 void usage(tool_options_t &opts)
 {
-	pout("{}",
-		"Usage: nltool [options]\n"
-		"\n"
-		"Options:\n"
-	);
-	pout("{}\n", opts.help().cstr());
+	pout("{}\n", opts.help(
+			"nltool serves as the Swiss Army knife to run, test and convert netlists.",
+			"nltool [options]").cstr());
 }
 
 struct input_t
diff --git a/src/lib/netlist/prg/nlwav.cpp b/src/lib/netlist/prg/nlwav.cpp
index d5a9e9866c5..0f560cbe62d 100644
--- a/src/lib/netlist/prg/nlwav.cpp
+++ b/src/lib/netlist/prg/nlwav.cpp
@@ -18,16 +18,24 @@ public:
 		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_help(*this,	"h", "help",                 "display help")
+		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;
 	plib::option_double opt_amp;
 	plib::option_bool   opt_verb;
 	plib::option_bool   opt_quiet;
+	plib::option_bool   opt_version;
 	plib::option_bool   opt_help;
 };
 
+plib::pstdout pout_strm;
+plib::pstderr perr_strm;
+
+plib::pstream_fmt_writer_t pout(pout_strm);
+plib::pstream_fmt_writer_t perr(perr_strm);
+
 /* http://de.wikipedia.org/wiki/RIFF_WAVE */
 class wav_t
 {
@@ -196,26 +204,20 @@ void convert(nlwav_options_t &opts)
 		//printf("%f %f\n", t, v);
 #endif
 	}
-	printf("Mean (low freq filter): %f\n", mean);
-	printf("Mean (static):          %f\n", means / (double) n);
-	printf("Amp + %f\n", 32000.0 / (maxsam- mean));
-	printf("Amp - %f\n", -32000.0 / (minsam- mean));
+	pout("Mean (low freq filter): {}\n", mean);
+	pout("Mean (static):          {}\n", means / (double) n);
+	pout("Amp + {}\n", 32000.0 / (maxsam- mean));
+	pout("Amp - {}\n", -32000.0 / (minsam- mean));
 	wo.close();
 	fo.close();
 	fin.close();
 
 }
 
-void usage(nlwav_options_t &opts)
+void usage(plib::pstream_fmt_writer_t &fw, nlwav_options_t &opts)
 {
-	fprintf(stderr,
-		"Usage:\n"
-		"  nltool -help\n"
-		"  nltool [options]\n"
-		"\n"
-		"Where:\n"
-	);
-	fprintf(stderr, "%s\n", opts.help().cstr());
+	fw("{}\n", opts.help("Convert netlist log files into wav files.\n",
+			"nltool [options]").cstr());
 }
 
 
@@ -226,15 +228,27 @@ int main(int argc, char *argv[])
 
 	if ((ret = opts.parse(argc, argv)) != argc)
 	{
-		fprintf(stderr, "Error parsing %s\n", argv[ret]);
-		usage(opts);
+		perr("Error parsing {}\n", argv[ret]);
+		usage(perr, opts);
 		return 1;
 	}
 
 	if (opts.opt_help())
 	{
-		usage(opts);
-		return 1;
+		usage(pout, opts);
+		return 0;
+	}
+
+	if (opts.opt_version())
+	{
+		pout(
+			"nlwav (netlist) 0.1\n"
+			"Copyright (C) 2016 Couriersud\n"
+			"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>.\n"
+			"This is free software: you are free to change and redistribute it.\n"
+			"There is NO WARRANTY, to the extent permitted by law.\n\n"
+			"Written by Couriersud.\n");
+		return 0;
 	}
 
 	convert(opts);

From 35eff0a2c108db7f19f4afdf517eb87bb4e10912 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Sun, 19 Jun 2016 15:31:35 +0200
Subject: [PATCH 31/39] Simplify device 9316. (nw)

---
 src/lib/netlist/devices/nld_9316.cpp | 63 ++++------------------------
 1 file changed, 8 insertions(+), 55 deletions(-)

diff --git a/src/lib/netlist/devices/nld_9316.cpp b/src/lib/netlist/devices/nld_9316.cpp
index 8c6b70c5810..809d530ae2f 100644
--- a/src/lib/netlist/devices/nld_9316.cpp
+++ b/src/lib/netlist/devices/nld_9316.cpp
@@ -60,8 +60,13 @@ namespace netlist
 		NETLIB_UPDATEI();
 
 	public:
-		inline void update_outputs_all(const uint_fast8_t cnt, const netlist_time out_delay);
-		inline void update_outputs(const uint_fast8_t cnt);
+		void update_outputs_all(const uint_fast8_t cnt, const netlist_time out_delay)
+		{
+			OUTLOGIC(m_QA, (cnt >> 0) & 1, out_delay);
+			OUTLOGIC(m_QB, (cnt >> 1) & 1, out_delay);
+			OUTLOGIC(m_QC, (cnt >> 2) & 1, out_delay);
+			OUTLOGIC(m_QD, (cnt >> 3) & 1, out_delay);
+		}
 
 		logic_input_t m_CLK;
 
@@ -173,7 +178,7 @@ namespace netlist
 					break;
 				default:
 					m_cnt++;
-					update_outputs(m_cnt);
+					update_outputs_all(m_cnt, NLTIME_FROM_NS(20));
 					break;
 			}
 		}
@@ -209,58 +214,6 @@ namespace netlist
 		}
 	}
 
-	inline NETLIB_FUNC_VOID(9316_sub, update_outputs_all, (const uint_fast8_t cnt, const netlist_time out_delay))
-	{
-		OUTLOGIC(m_QA, (cnt >> 0) & 1, out_delay);
-		OUTLOGIC(m_QB, (cnt >> 1) & 1, out_delay);
-		OUTLOGIC(m_QC, (cnt >> 2) & 1, out_delay);
-		OUTLOGIC(m_QD, (cnt >> 3) & 1, out_delay);
-	}
-
-	inline NETLIB_FUNC_VOID(9316_sub, update_outputs, (const uint_fast8_t cnt))
-	{
-		/* static */ const netlist_time out_delay = NLTIME_FROM_NS(20);
-	#if 0
-	//    for (int i=0; i<4; i++)
-	//        OUTLOGIC(m_Q[i], (cnt >> i) & 1, delay[i]);
-		OUTLOGIC(m_QA, (cnt >> 0) & 1, out_delay);
-		OUTLOGIC(m_QB, (cnt >> 1) & 1, out_delay);
-		OUTLOGIC(m_QC, (cnt >> 2) & 1, out_delay);
-		OUTLOGIC(m_QD, (cnt >> 3) & 1, out_delay);
-	#else
-		if ((cnt & 1) == 1)
-			OUTLOGIC(m_QA, 1, out_delay);
-		else
-		{
-			OUTLOGIC(m_QA, 0, out_delay);
-			switch (cnt)
-			{
-			case 0x00:
-				OUTLOGIC(m_QB, 0, out_delay);
-				OUTLOGIC(m_QC, 0, out_delay);
-				OUTLOGIC(m_QD, 0, out_delay);
-				break;
-			case 0x02:
-			case 0x06:
-			case 0x0A:
-			case 0x0E:
-				OUTLOGIC(m_QB, 1, out_delay);
-				break;
-			case 0x04:
-			case 0x0C:
-				OUTLOGIC(m_QB, 0, out_delay);
-				OUTLOGIC(m_QC, 1, out_delay);
-				break;
-			case 0x08:
-				OUTLOGIC(m_QB, 0, out_delay);
-				OUTLOGIC(m_QC, 0, out_delay);
-				OUTLOGIC(m_QD, 1, out_delay);
-				break;
-			}
-
-		}
-	#endif
-	}
 
 	NETLIB_DEVICE_IMPL(9316)
 	NETLIB_DEVICE_IMPL(9316_dip)

From dc18d613a5c0ccae1a931c16bd014fdf7ef8d081 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Sun, 19 Jun 2016 17:03:13 +0200
Subject: [PATCH 32/39] Moved options code from include to cpp file. Minor
 modifications to 7493 and 9316 Introduced perftime_t and perfcount_t for
 gathering statistics. These templates do not create any code if statistics
 are not kept. (nw)

---
 scripts/src/netlist.lua              |   1 +
 src/lib/netlist/build/makefile       |   1 +
 src/lib/netlist/devices/nld_7493.cpp |   4 +-
 src/lib/netlist/devices/nld_9316.cpp |  15 +-
 src/lib/netlist/nl_base.cpp          |  39 +++--
 src/lib/netlist/nl_base.h            |  20 +--
 src/lib/netlist/nl_config.h          |  20 +--
 src/lib/netlist/nl_lists.h           |  15 +-
 src/lib/netlist/nl_time.h            |  22 +--
 src/lib/netlist/plib/pconfig.h       |  56 +++++++
 src/lib/netlist/plib/poptions.cpp    | 226 +++++++++++++++++++++++++++
 src/lib/netlist/plib/poptions.h      | 205 +++---------------------
 12 files changed, 362 insertions(+), 262 deletions(-)
 create mode 100644 src/lib/netlist/plib/poptions.cpp

diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index c038f14a28e..d6a34753ccb 100644
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@@ -43,6 +43,7 @@ project "netlist"
 		MAME_DIR .. "src/lib/netlist/plib/plists.h",
     MAME_DIR .. "src/lib/netlist/plib/pdynlib.cpp",
     MAME_DIR .. "src/lib/netlist/plib/pdynlib.h",
+    MAME_DIR .. "src/lib/netlist/plib/poptions.cpp",
 		MAME_DIR .. "src/lib/netlist/plib/poptions.h",
 		MAME_DIR .. "src/lib/netlist/plib/pparser.cpp",
 		MAME_DIR .. "src/lib/netlist/plib/pparser.h",
diff --git a/src/lib/netlist/build/makefile b/src/lib/netlist/build/makefile
index aa3b841f595..569a10d6f07 100644
--- a/src/lib/netlist/build/makefile
+++ b/src/lib/netlist/build/makefile
@@ -51,6 +51,7 @@ POBJS := \
 	$(POBJ)/palloc.o \
 	$(POBJ)/pdynlib.o \
 	$(POBJ)/pfmtlog.o \
+	$(POBJ)/poptions.o \
 	$(POBJ)/pparser.o \
 	$(POBJ)/pstate.o \
 	$(POBJ)/pstream.o \
diff --git a/src/lib/netlist/devices/nld_7493.cpp b/src/lib/netlist/devices/nld_7493.cpp
index 8a12333e596..31faa5191dc 100644
--- a/src/lib/netlist/devices/nld_7493.cpp
+++ b/src/lib/netlist/devices/nld_7493.cpp
@@ -101,8 +101,8 @@ namespace netlist
 
 	NETLIB_UPDATE(7493ff)
 	{
-		const netlist_time out_delay = NLTIME_FROM_NS(18);
-		if (m_reset != 0)
+		constexpr netlist_time out_delay = NLTIME_FROM_NS(18);
+		if (m_reset)
 		{
 			m_state ^= 1;
 			OUTLOGIC(m_Q, m_state, out_delay);
diff --git a/src/lib/netlist/devices/nld_9316.cpp b/src/lib/netlist/devices/nld_9316.cpp
index 809d530ae2f..3033ace81bc 100644
--- a/src/lib/netlist/devices/nld_9316.cpp
+++ b/src/lib/netlist/devices/nld_9316.cpp
@@ -44,15 +44,15 @@ namespace netlist
 	{
 		NETLIB_CONSTRUCTOR(9316_sub)
 		, m_CLK(*this, "CLK")
+		, m_cnt(*this, "m_cnt", 0)
+		, m_loadq(*this, "m_loadq", 0)
+		, m_ent(*this, "m_ent", 0)
 		, m_QA(*this, "QA")
 		, m_QB(*this, "QB")
 		, m_QC(*this, "QC")
 		, m_QD(*this, "QD")
 		, m_RC(*this, "RC")
 		, m_ABCD(nullptr)
-		, m_cnt(*this, "m_cnt", 0)
-		, m_loadq(*this, "m_loadq", 0)
-		, m_ent(*this, "m_ent", 0)
 		{
 		}
 
@@ -70,6 +70,10 @@ namespace netlist
 
 		logic_input_t m_CLK;
 
+		state_var_u8 m_cnt;
+		state_var_u8 m_loadq;
+		state_var_u8 m_ent;
+
 		logic_output_t m_QA;
 		logic_output_t m_QB;
 		logic_output_t m_QC;
@@ -77,11 +81,6 @@ namespace netlist
 		logic_output_t m_RC;
 
 		NETLIB_NAME(9316_subABCD) *m_ABCD;
-
-		state_var_u8 m_cnt;
-		state_var_u8 m_loadq;
-		state_var_u8 m_ent;
-
 	};
 
 	NETLIB_OBJECT(9316)
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index e40ec1dc5d3..41dbf0b0755 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -341,7 +341,7 @@ void netlist_t::process_queue(const netlist_time &delta)
 		while (e.m_object != nullptr)
 		{
 			e.m_object->update_devs();
-			add_to_stat(m_perf_out_processed, 1);
+			m_perf_out_processed.inc();
 			e = m_queue.pop();
 			m_time = e.m_exec_time;
 		}
@@ -367,7 +367,7 @@ void netlist_t::process_queue(const netlist_time &delta)
 			if (e.m_object == nullptr)
 				break;
 			e.m_object->update_devs();
-			add_to_stat(m_perf_out_processed, 1);
+			m_perf_out_processed.inc();
 		}
 		mc_net.set_time(mc_time);
 	}
@@ -375,19 +375,26 @@ void netlist_t::process_queue(const netlist_time &delta)
 
 void netlist_t::print_stats() const
 {
-#if (NL_KEEP_STATISTICS)
+	if (nperftime_t::enabled)
 	{
-		for (auto & entry : m_devices)
+		std::vector<size_t> index;
+		for (size_t i=0; i<m_devices.size(); i++)
+			index.push_back(i);
+
+		std::sort(index.begin(), index.end(),
+				[&](size_t i1, size_t i2) { return m_devices[i1]->m_stat_total_time.total() < m_devices[i2]->m_stat_total_time.total(); });
+
+		for (auto & j : index)
 		{
+			auto entry = m_devices[j].get();
 			log().verbose("Device {1:20} : {2:12} {3:12} {4:15}", entry->name(),
-					entry->stat_call_count, entry->stat_update_count,
-					(long int) entry->stat_total_time / (entry->stat_update_count + 1));
+					entry->m_stat_call_count(), entry->m_stat_total_time.count(),
+					entry->m_stat_total_time.total());
 		}
 
-		log().verbose("Queue Pushes {1:15}", queue().m_prof_call);
-		log().verbose("Queue Moves  {1:15}", queue().m_prof_sortmove);
+		log().verbose("Queue Pushes {1:15}", queue().m_prof_call());
+		log().verbose("Queue Moves  {1:15}", queue().m_prof_sortmove());
 	}
-#endif
 }
 
 // ----------------------------------------------------------------------------------------
@@ -419,11 +426,6 @@ core_device_t::core_device_t(netlist_t &owner, const pstring &name)
 	: object_t(name)
 	, logic_family_t()
 	, netlist_ref(owner)
-#if (NL_KEEP_STATISTICS)
-	, stat_total_time(0)
-	, stat_update_count(0)
-	, stat_call_count(0)
-#endif
 {
 	if (logic_family() == nullptr)
 		set_logic_family(family_TTL());
@@ -433,11 +435,6 @@ core_device_t::core_device_t(core_device_t &owner, const pstring &name)
 	: object_t(owner.name() + "." + name)
 	, logic_family_t()
 	, netlist_ref(owner.netlist())
-#if (NL_KEEP_STATISTICS)
-	, stat_total_time(0)
-	, stat_update_count(0)
-	, stat_call_count(0)
-#endif
 {
 	set_logic_family(owner.logic_family());
 	if (logic_family() == nullptr)
@@ -586,7 +583,7 @@ void net_t::inc_active(core_terminal_t &term)
 {
 	m_active++;
 	m_list_active.push_front(&term);
-	nl_assert(m_active <= num_cons());
+	nl_assert(m_active <= (int) num_cons());
 	if (m_active == 1)
 	{
 		if (netlist().use_deactivate())
@@ -656,7 +653,7 @@ void net_t::update_devs()
 
 	for (auto & p : m_list_active)
 	{
-		inc_stat(p.device().stat_call_count);
+		p.device().m_stat_call_count.inc();
 		if ((p.state() & mask) != 0)
 			p.device().update_dev();
 	}
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 9ae08fd8786..ce3fae1c135 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -892,10 +892,9 @@ namespace netlist
 
 		void update_dev()
 		{
-			begin_timing(stat_total_time);
-			inc_stat(stat_update_count);
+			m_stat_total_time.begin();
 			do_update();
-			end_timing(stat_total_time);
+			m_stat_total_time.end();
 		}
 
 		void do_update() NOEXCEPT
@@ -928,12 +927,9 @@ namespace netlist
 		nl_double TERMANALOG(const terminal_t &term) const { return term.net().Q_Analog(); }
 		void OUTANALOG(analog_output_t &out, const nl_double val) { out.set_Q(val); }
 
-	#if (NL_KEEP_STATISTICS)
 		/* stats */
-		plib::ticks_t stat_total_time;
-		int_fast32_t stat_update_count;
-		int_fast32_t stat_call_count;
-	#endif
+		nperftime_t  m_stat_total_time;
+		nperfcount_t m_stat_call_count;
 
 	protected:
 
@@ -1151,12 +1147,10 @@ namespace netlist
 
 protected:
 
-	#if (NL_KEEP_STATISTICS)
 		// performance
-		int m_perf_out_processed;
-		int m_perf_inp_processed;
-		int m_perf_inp_active;
-	#endif
+		nperfcount_t m_perf_out_processed;
+		nperfcount_t m_perf_inp_processed;
+		nperfcount_t m_perf_inp_active;
 
 	private:
 		plib::state_manager_t 		m_state;
diff --git a/src/lib/netlist/nl_config.h b/src/lib/netlist/nl_config.h
index 19d8e3561ad..6a6dec27fdd 100644
--- a/src/lib/netlist/nl_config.h
+++ b/src/lib/netlist/nl_config.h
@@ -111,18 +111,20 @@
 //  Performance tracking
 //============================================================
 
+namespace netlist
+{
 #if NL_KEEP_STATISTICS
-#define add_to_stat(v,x)        do { v += (x); } while (0)
-#define inc_stat(v)             add_to_stat(v, 1)
-#define begin_timing(v)         do { v -= plib::profile_ticks(); } while (0)
-#define end_timing(v)           do { v += plib::profile_ticks(); } while (0)
+//#define add_to_stat(v,x)        do { v += (x); } while (0)
+//#define inc_stat(v)             add_to_stat(v, 1)
+//#define begin_timing(v)         do { v -= plib::profile_ticks(); } while (0)
+//#define end_timing(v)           do { v += plib::profile_ticks(); } while (0)
+using nperftime_t = plib::perftime_t<true>;
+using nperfcount_t = plib::perfcount_t<true>;
 #else
-#define add_to_stat(v,x)        do { } while (0)
-#define inc_stat(v)             add_to_stat(v, 1)
-#define begin_timing(v)         do { } while (0)
-#define end_timing(v)           do { } while (0)
+using nperftime_t = plib::perftime_t<false>;
+using nperfcount_t = plib::perfcount_t<false>;
 #endif
-
+}
 //============================================================
 //  General
 //============================================================
diff --git a/src/lib/netlist/nl_lists.h b/src/lib/netlist/nl_lists.h
index 475e0e285c2..dee4f416069 100644
--- a/src/lib/netlist/nl_lists.h
+++ b/src/lib/netlist/nl_lists.h
@@ -36,10 +36,6 @@ namespace netlist
 
 		timed_queue(unsigned list_size)
 		: m_list(list_size)
-#if (NL_KEEP_STATISTICS)
-		, m_prof_sortmove(0)
-		, m_prof_call(0)
-#endif
 		{
 	#if HAS_OPENMP && USE_OPENMP
 			m_lock = 0;
@@ -60,11 +56,11 @@ namespace netlist
 			for (; t > (i - 1)->m_exec_time; --i)
 			{
 				*(i) = *(i-1);
-				inc_stat(m_prof_sortmove);
+				m_prof_sortmove.inc();
 			}
 			*i = { t, o };
 			++m_end;
-			inc_stat(m_prof_call);
+			m_prof_call.inc();
 	#if HAS_OPENMP && USE_OPENMP
 			m_lock = 0;
 	#endif
@@ -132,12 +128,9 @@ namespace netlist
 		std::vector<entry_t> m_list;
 
 	public:
-	#if (NL_KEEP_STATISTICS)
 		// profiling
-		std::size_t   m_prof_sortmove;
-		std::size_t   m_prof_call;
-	#endif
-
+		nperfcount_t m_prof_sortmove;
+		nperfcount_t m_prof_call;
 };
 
 }
diff --git a/src/lib/netlist/nl_time.h b/src/lib/netlist/nl_time.h
index 0a4caac1ac6..974ba4c669c 100644
--- a/src/lib/netlist/nl_time.h
+++ b/src/lib/netlist/nl_time.h
@@ -42,7 +42,7 @@ namespace netlist
 
 		constexpr explicit ptime(const double t) = delete;
 		//: m_time((internal_type) ( t * (double) resolution)) { }
-		constexpr explicit ptime(const internal_type nom, const internal_type den)
+		constexpr explicit ptime(const internal_type nom, const internal_type den) NOEXCEPT
 		: m_time(nom * (resolution / den)) { }
 
 		ptime &operator=(const ptime rhs) { m_time = rhs.m_time; return *this; }
@@ -100,7 +100,7 @@ namespace netlist
 
 		friend bool operator!=(const ptime &lhs, const ptime &rhs)
 		{
-			return lhs.m_time != rhs.m_time;
+			return !(lhs == rhs);
 		}
 
 		constexpr internal_type as_raw() const { return m_time; }
@@ -109,16 +109,16 @@ namespace netlist
 		// for save states ....
 		internal_type *get_internaltype_ptr() { return &m_time; }
 
-		static inline constexpr ptime from_nsec(const internal_type ns) { return ptime(ns, UINT64_C(1000000000)); }
-		static inline constexpr ptime from_usec(const internal_type us) { return ptime(us, UINT64_C(1000000)); }
-		static inline constexpr ptime from_msec(const internal_type ms) { return ptime(ms, UINT64_C(1000)); }
-		static inline constexpr ptime from_hz(const internal_type hz) { return ptime(1 , hz); }
-		static inline constexpr ptime from_raw(const internal_type raw) { return ptime(raw, resolution); }
-		static inline constexpr ptime from_double(const double t) { return ptime((internal_type) ( t * (double) resolution), resolution); }
+		static constexpr ptime from_nsec(const internal_type ns) { return ptime(ns, UINT64_C(1000000000)); }
+		static constexpr ptime from_usec(const internal_type us) { return ptime(us, UINT64_C(1000000)); }
+		static constexpr ptime from_msec(const internal_type ms) { return ptime(ms, UINT64_C(1000)); }
+		static constexpr ptime from_hz(const internal_type hz) { return ptime(1 , hz); }
+		static constexpr ptime from_raw(const internal_type raw) { return ptime(raw, resolution); }
+		static constexpr ptime from_double(const double t) { return ptime((internal_type) ( t * (double) resolution), resolution); }
 
-		static inline constexpr ptime zero() { return ptime(0, resolution); }
-		static inline constexpr ptime quantum() { return ptime(1, resolution); }
-		static inline constexpr ptime never() { return ptime(plib::numeric_limits<internal_type>::max(), resolution); }
+		static constexpr ptime zero() { return ptime(0, resolution); }
+		static constexpr ptime quantum() { return ptime(1, resolution); }
+		static constexpr ptime never() { return ptime(plib::numeric_limits<internal_type>::max(), resolution); }
 	private:
 		internal_type m_time;
 	};
diff --git a/src/lib/netlist/plib/pconfig.h b/src/lib/netlist/plib/pconfig.h
index 48a7e740a8f..01c590602ac 100644
--- a/src/lib/netlist/plib/pconfig.h
+++ b/src/lib/netlist/plib/pconfig.h
@@ -99,6 +99,62 @@ static inline ticks_t profile_ticks()
 static inline ticks_t profile_ticks() { return ticks(); }
 #endif
 
+template<bool enabled_>
+struct perfcount_t
+{
+	perfcount_t() : m_count(0) { }
+	typedef uint_least64_t type;
+	type operator()() const { return m_count; }
+	void inc() { ++m_count; }
+	void reset() { m_count = 0; }
+	constexpr static bool enabled = enabled_;
+private:
+	type m_count;
+};
+
+template<>
+struct perfcount_t<false>
+{
+	typedef uint_least64_t type;
+	constexpr type operator()() const { return 0; }
+	void inc() const { }
+	void reset() const { }
+	constexpr static bool enabled = false;
+};
+
+
+template<bool enabled_>
+struct perftime_t
+{
+	perftime_t() : m_time(0), m_count(0) { }
+	typedef ticks_t type;
+	type operator()() const { return m_time; }
+	void begin() { m_time -= profile_ticks(); }
+	void end() { m_time += profile_ticks(); ++m_count; }
+	void reset() { m_time = 0; m_count = 0; }
+	type average() const { return (m_count == 0) ? 0 : m_time / m_count; }
+	type total() const { return m_time; }
+	type count() const { return m_count; }
+	constexpr static bool enabled = enabled_;
+private:
+	type m_time;
+	int_least64_t m_count;
+};
+
+template<>
+struct perftime_t<false>
+{
+	typedef ticks_t type;
+	constexpr type operator()() const { return 0; }
+	void begin()  const { }
+	void end() const { }
+	void reset() const { }
+	constexpr type average() const { return 0; }
+	constexpr type total() const { return 0; }
+	constexpr type count() const { return 0; }
+	constexpr static bool enabled = false;
+};
+
 /*
  * 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/poptions.cpp b/src/lib/netlist/plib/poptions.cpp
new file mode 100644
index 00000000000..8b2db8cf19e
--- /dev/null
+++ b/src/lib/netlist/plib/poptions.cpp
@@ -0,0 +1,226 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+/*
+ * poptions.cpp
+ *
+ */
+
+#include "poptions.h"
+
+namespace plib {
+
+/***************************************************************************
+    Options
+***************************************************************************/
+
+	option::option()
+	: m_short(""), m_long(""), m_help(""), m_has_argument(false)
+	{}
+
+	option::option(options &parent, pstring ashort, pstring along, pstring help, bool has_argument)
+	: m_short(ashort), m_long(along), m_help(help), m_has_argument(has_argument)
+	{
+		parent.register_option(this);
+	}
+
+	option::~option()
+	{
+	}
+
+	int option_str::parse(pstring argument)
+	{
+		m_val = argument;
+		return 0;
+	}
+
+	int option_str_limit::parse(pstring argument)
+	{
+		if (plib::container::contains(m_limit, argument))
+		{
+			m_val = argument;
+			return 0;
+		}
+		else
+			return 1;
+	}
+
+	int option_bool::parse(ATTR_UNUSED pstring argument)
+	{
+		m_val = true;
+		return 0;
+	}
+
+	int option_double::parse(pstring argument)
+	{
+		bool err = false;
+		m_val = argument.as_double(&err);
+		return (err ? 1 : 0);
+	}
+
+	options::options()
+	{
+
+	}
+
+	options::options(option *o[])
+	{
+		int i=0;
+		while (o[i] != nullptr)
+		{
+			m_opts.push_back(o[i]);
+			i++;
+		}
+	}
+
+	options::~options()
+	{
+		m_opts.clear();
+	}
+
+	void options::register_option(option *opt)
+	{
+		m_opts.push_back(opt);
+	}
+
+	int options::parse(int argc, char *argv[])
+	{
+		m_app = argv[0];
+
+		for (int i=1; i<argc; )
+		{
+			pstring arg(argv[i]);
+			option *opt = nullptr;
+			pstring opt_arg;
+			bool has_equal_arg = false;
+
+			if (arg.startsWith("--"))
+			{
+				auto v = pstring_vector_t(arg.substr(2),"=");
+				opt = getopt_long(v[0]);
+				has_equal_arg = (v.size() > 1);
+				if (has_equal_arg) opt_arg = v[1];
+			}
+			else if (arg.startsWith("-"))
+			{
+				opt = getopt_short(arg.substr(1));
+			}
+			else
+				return i;
+			if (opt == nullptr)
+				return i;
+			if (opt->has_argument())
+			{
+				if (has_equal_arg)
+				{
+					if (opt->parse(opt_arg) != 0)
+						return i;
+				}
+				else
+				{
+					i++; // FIXME: are there more arguments?
+					if (opt->parse(argv[i]) != 0)
+						return i - 1;
+				}
+			}
+			else
+			{
+				if (has_equal_arg)
+					return i;
+				opt->parse("");
+			}
+			i++;
+		}
+		return argc;
+	}
+
+	pstring options::split_paragraphs(pstring text, unsigned width, unsigned ident,
+			unsigned firstline_ident)
+	{
+		auto paragraphs = pstring_vector_t(text,"\n");
+		pstring ret("");
+
+		for (auto &p : paragraphs)
+		{
+			pstring line = pstring("").rpad(" ", firstline_ident);
+			for (auto &s : pstring_vector_t(p, " "))
+			{
+				if (line.len() + s.len() > width)
+				{
+					ret += line + "\n";
+					line = pstring("").rpad(" ", ident);
+				}
+				line += s + " ";
+			}
+			ret += line + "\n";
+		}
+		return ret;
+	}
+
+	pstring options::help(pstring description, pstring usage,
+			unsigned width, unsigned ident)
+	{
+		pstring ret;
+
+		ret = split_paragraphs(description, width, 0, 0) + "\n";
+		ret += "Usage:\t" + usage + "\n\nOptions:\n";
+
+		for (auto & opt : m_opts )
+		{
+			pstring line = "";
+			if (opt->short_opt() != "")
+				line += "  -" + opt->short_opt();
+			if (opt->long_opt() != "")
+			{
+				if (line != "")
+					line += ", ";
+				else
+					line = "      ";
+				line += "--" + opt->long_opt();
+				if (opt->has_argument())
+				{
+					line += "=";
+					option_str_limit *ol = dynamic_cast<option_str_limit *>(opt);
+					if (ol)
+					{
+						for (auto &v : ol->limit())
+						{
+							line += v + "|";
+						}
+						line = line.left(line.len() - 1);
+					}
+					else
+						line += "Value";
+				}
+			}
+			line = line.rpad(" ", 20) + " ";
+			if (line.len() > 21)
+			{
+				ret += line + "\n";
+				ret += split_paragraphs(opt->help(), 72, 21, 21);
+			}
+			else
+				ret += split_paragraphs(line + opt->help(), 72, 21, 0);
+		}
+		return ret;
+	}
+
+	option *options::getopt_short(pstring arg)
+	{
+		for (auto & opt : m_opts)
+		{
+			if (opt->short_opt() == arg)
+				return opt;
+		}
+		return nullptr;
+	}
+	option *options::getopt_long(pstring arg)
+	{
+		for (auto & opt : m_opts)
+		{
+			if (opt->long_opt() == arg)
+				return opt;
+		}
+		return nullptr;
+	}
+
+} // namespace plib
diff --git a/src/lib/netlist/plib/poptions.h b/src/lib/netlist/plib/poptions.h
index b8965614c42..6ddac682d66 100644
--- a/src/lib/netlist/plib/poptions.h
+++ b/src/lib/netlist/plib/poptions.h
@@ -27,19 +27,14 @@ class options;
 class option
 {
 public:
-	option()
-	: m_short(""), m_long(""), m_help(""), m_has_argument(false)
-	{}
-
+	option();
 	option(options &parent, pstring ashort, pstring along, pstring help, bool has_argument);
 
-	virtual ~option()
-	{
-	}
+	virtual ~option();
 
 	/* no_argument options will be called with "" argument */
 
-	virtual int parse(ATTR_UNUSED pstring argument) { return 0; }
+	virtual int parse(ATTR_UNUSED pstring argument) = 0;
 
 	pstring short_opt() { return m_short; }
 	pstring long_opt() { return m_long; }
@@ -59,7 +54,7 @@ public:
 	: option(parent, ashort, along, help, true), m_val(defval)
 	{}
 
-	virtual int parse(pstring argument) override { m_val = argument; return 0; }
+	virtual int parse(pstring argument) override;
 
 	pstring operator ()() { return m_val; }
 private:
@@ -73,16 +68,7 @@ public:
 	: option(parent, ashort, along, help, true), m_val(defval), m_limit(limit, ":")
 	{}
 
-	virtual int parse(pstring argument) override
-	{
-		if (plib::container::contains(m_limit, argument))
-		{
-			m_val = argument;
-			return 0;
-		}
-		else
-			return 1;
-	}
+	virtual int parse(pstring argument) override;
 
 	pstring operator ()() { return m_val; }
 	const plib::pstring_vector_t &limit() { return m_limit; }
@@ -99,7 +85,7 @@ public:
 	: option(parent, ashort, along, help, false), m_val(false)
 	{}
 
-	virtual int parse(ATTR_UNUSED pstring argument) override { m_val = true; return 0; }
+	virtual int parse(ATTR_UNUSED pstring argument) override;
 
 	bool operator ()() { return m_val; }
 private:
@@ -113,12 +99,7 @@ public:
 	: option(parent, ashort, along, help, true), m_val(defval)
 	{}
 
-	virtual int parse(pstring argument) override
-	{
-		bool err = false;
-		m_val = argument.as_double(&err);
-		return (err ? 1 : 0);
-	}
+	virtual int parse(pstring argument) override;
 
 	double operator ()() { return m_val; }
 private:
@@ -129,180 +110,30 @@ class options
 {
 public:
 
-	options() {}
+	options();
+	options(option *o[]);
 
-	options(option *o[])
-	{
-		int i=0;
-		while (o[i] != nullptr)
-		{
-			m_opts.push_back(o[i]);
-			i++;
-		}
-	}
+	~options();
 
-	~options()
-	{
-		m_opts.clear();
-	}
+	void register_option(option *opt);
+	int parse(int argc, char *argv[]);
 
-	void register_option(option *opt)
-	{
-		m_opts.push_back(opt);
-	}
+	pstring help(pstring description, pstring usage,
+			unsigned width = 72, unsigned ident = 20);
 
-	int parse(int argc, char *argv[])
-	{
-		m_app = argv[0];
-
-		for (int i=1; i<argc; )
-		{
-			pstring arg(argv[i]);
-			option *opt = nullptr;
-			pstring opt_arg;
-			bool has_equal_arg = false;
-
-			if (arg.startsWith("--"))
-			{
-				auto v = pstring_vector_t(arg.substr(2),"=");
-				opt = getopt_long(v[0]);
-				has_equal_arg = (v.size() > 1);
-				if (has_equal_arg) opt_arg = v[1];
-			}
-			else if (arg.startsWith("-"))
-			{
-				opt = getopt_short(arg.substr(1));
-			}
-			else
-				return i;
-			if (opt == nullptr)
-				return i;
-			if (opt->has_argument())
-			{
-				if (has_equal_arg)
-				{
-					if (opt->parse(opt_arg) != 0)
-						return i;
-				}
-				else
-				{
-					i++; // FIXME: are there more arguments?
-					if (opt->parse(argv[i]) != 0)
-						return i - 1;
-				}
-			}
-			else
-			{
-				if (has_equal_arg)
-					return i;
-				opt->parse("");
-			}
-			i++;
-		}
-		return argc;
-	}
-
-	pstring split_paragraphs(pstring text, unsigned width, unsigned ident,
-			unsigned firstline_ident)
-	{
-		auto paragraphs = pstring_vector_t(text,"\n");
-		pstring ret("");
-
-		for (auto &p : paragraphs)
-		{
-			pstring line = pstring("").rpad(" ", firstline_ident);
-			for (auto &s : pstring_vector_t(p, " "))
-			{
-				if (line.len() + s.len() > width)
-				{
-					ret += line + "\n";
-					line = pstring("").rpad(" ", ident);
-				}
-				line += s + " ";
-			}
-			ret += line + "\n";
-		}
-		return ret;
-	}
-
-	pstring help(pstring description, pstring usage, unsigned width = 72, unsigned ident = 20)
-	{
-		pstring ret;
-
-		ret = split_paragraphs(description, width, 0, 0) + "\n";
-		ret += "Usage:\t" + usage + "\n\nOptions:\n";
-
-		for (auto & opt : m_opts )
-		{
-			pstring line = "";
-			if (opt->short_opt() != "")
-				line += "  -" + opt->short_opt();
-			if (opt->long_opt() != "")
-			{
-				if (line != "")
-					line += ", ";
-				else
-					line = "      ";
-				line += "--" + opt->long_opt();
-				if (opt->has_argument())
-				{
-					line += "=";
-					option_str_limit *ol = dynamic_cast<option_str_limit *>(opt);
-					if (ol)
-					{
-						for (auto &v : ol->limit())
-						{
-							line += v + "|";
-						}
-						line = line.left(line.len() - 1);
-					}
-					else
-						line += "Value";
-				}
-			}
-			line = line.rpad(" ", 20) + " ";
-			if (line.len() > 21)
-			{
-				ret += line + "\n";
-				ret += split_paragraphs(opt->help(), 72, 21, 21);
-			}
-			else
-				ret += split_paragraphs(line + opt->help(), 72, 21, 0);
-		}
-		return ret;
-	}
 	pstring app() { return m_app; }
 
 private:
+	static pstring split_paragraphs(pstring text, unsigned width, unsigned ident,
+			unsigned firstline_ident);
 
-	option *getopt_short(pstring arg)
-	{
-		for (auto & opt : m_opts)
-		{
-			if (opt->short_opt() == arg)
-				return opt;
-		}
-		return nullptr;
-	}
-	option *getopt_long(pstring arg)
-	{
-		for (auto & opt : m_opts)
-		{
-			if (opt->long_opt() == arg)
-				return opt;
-		}
-		return nullptr;
-	}
+	option *getopt_short(pstring arg);
+	option *getopt_long(pstring arg);
 
 	std::vector<option *> m_opts;
 	pstring m_app;
 };
 
-option::option(options &parent, pstring ashort, pstring along, pstring help, bool has_argument)
-: m_short(ashort), m_long(along), m_help(help), m_has_argument(has_argument)
-{
-	parent.register_option(this);
-}
 
 }
 

From a2fd86dcf01aedbcbe84c463aedd5b9f5367bd58 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Mon, 20 Jun 2016 23:01:37 +0200
Subject: [PATCH 33/39] Added improved profiling support to netlist. Statistics
 output now proposes devices for which whole device activation/deactivation be
 disabled. No significant improvement for pong, but breakout experiences a 10%
 improvement. (nw)

---
 src/lib/netlist/nl_base.cpp      |  47 +++++++++++--
 src/lib/netlist/nl_base.h        |   9 ++-
 src/lib/netlist/plib/pconfig.h   | 110 ++++++++++++++++++++++++++++---
 src/mame/machine/nl_breakout.cpp |  30 +++++++++
 src/mame/machine/nl_pong.cpp     |  36 ++++++++++
 5 files changed, 213 insertions(+), 19 deletions(-)

diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index 41dbf0b0755..62154987d3b 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -334,6 +334,8 @@ void netlist_t::process_queue(const netlist_time &delta)
 
 	m_queue.push(stop, nullptr);
 
+	m_stat_mainloop.begin();
+
 	if (m_mainclock == nullptr)
 	{
 		queue_t::entry_t e(m_queue.pop());
@@ -371,6 +373,7 @@ void netlist_t::process_queue(const netlist_time &delta)
 		}
 		mc_net.set_time(mc_time);
 	}
+	m_stat_mainloop.end();
 }
 
 void netlist_t::print_stats() const
@@ -384,16 +387,48 @@ void netlist_t::print_stats() const
 		std::sort(index.begin(), index.end(),
 				[&](size_t i1, size_t i2) { return m_devices[i1]->m_stat_total_time.total() < m_devices[i2]->m_stat_total_time.total(); });
 
+		nperftime_t::type total_time(0);
+		uint_least64_t total_count(0);
+
 		for (auto & j : index)
 		{
 			auto entry = m_devices[j].get();
-			log().verbose("Device {1:20} : {2:12} {3:12} {4:15}", entry->name(),
+			log().verbose("Device {1:20} : {2:12} {3:12} {4:15} {5:12}", entry->name(),
 					entry->m_stat_call_count(), entry->m_stat_total_time.count(),
-					entry->m_stat_total_time.total());
+					entry->m_stat_total_time.total(), entry->m_stat_inc_active());
+			total_time += entry->m_stat_total_time.total();
+			total_count += entry->m_stat_total_time.count();
 		}
 
-		log().verbose("Queue Pushes {1:15}", queue().m_prof_call());
-		log().verbose("Queue Moves  {1:15}", queue().m_prof_sortmove());
+		nperftime_t overhead;
+		nperftime_t test;
+		overhead.begin();
+		for (int j=0; j<100000;j++)
+		{
+			test.begin();
+			test.end();
+		}
+		overhead.end();
+
+		uint_least64_t total_overhead = (uint_least64_t) overhead()*(uint_least64_t)total_count/(uint_least64_t)200000;
+
+		log().verbose("Queue Pushes   {1:15}", queue().m_prof_call());
+		log().verbose("Queue Moves    {1:15}", queue().m_prof_sortmove());
+
+		log().verbose("Total loop     {1:15}", m_stat_mainloop());
+		/* Only one serialization should be counted in total time */
+		/* But two are contained in m_stat_mainloop */
+		log().verbose("Total devices  {1:15}", total_time);
+		log().verbose("");
+		log().verbose("Take the next lines with a grain of salt. They depend on the measurement implementation.");
+		log().verbose("Total overhead {1:15}", total_overhead);
+		log().verbose("Overhead per pop  {1:11}", (m_stat_mainloop()-2*total_overhead - (total_time - total_overhead ))/queue().m_prof_call());
+		log().verbose("");
+		for (auto &entry : m_devices)
+		{
+			if (entry->m_stat_inc_active() > 3 * entry->m_stat_total_time.count())
+				log().verbose("PARAM({}.USE_DEACTIVATE, 0)", entry->name());
+		}
 	}
 }
 
@@ -426,6 +461,7 @@ core_device_t::core_device_t(netlist_t &owner, const pstring &name)
 	: object_t(name)
 	, logic_family_t()
 	, netlist_ref(owner)
+	, m_static_update()
 {
 	if (logic_family() == nullptr)
 		set_logic_family(family_TTL());
@@ -435,6 +471,7 @@ core_device_t::core_device_t(core_device_t &owner, const pstring &name)
 	: object_t(owner.name() + "." + name)
 	, logic_family_t()
 	, netlist_ref(owner.netlist())
+	, m_static_update()
 {
 	set_logic_family(owner.logic_family());
 	if (logic_family() == nullptr)
@@ -604,8 +641,6 @@ void net_t::inc_active(core_terminal_t &term)
 				m_in_queue = 2;
 			}
 		}
-		//else if (netlist().use_deactivate())
-		//  m_cur_Q = m_new_Q;
 	}
 }
 
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index ce3fae1c135..a9a767ea49d 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -911,7 +911,7 @@ namespace netlist
 		void set_delegate_pointer();
 		void stop_dev();
 
-		void do_inc_active() { inc_active();  }
+		void do_inc_active() { m_stat_inc_active.inc(); inc_active();  }
 		void do_dec_active() { dec_active(); }
 		void do_reset() { reset(); }
 
@@ -930,6 +930,7 @@ namespace netlist
 		/* stats */
 		nperftime_t  m_stat_total_time;
 		nperfcount_t m_stat_call_count;
+		nperfcount_t m_stat_inc_active;
 
 	protected:
 
@@ -1051,7 +1052,7 @@ namespace netlist
 	// -----------------------------------------------------------------------------
 
 
-	class netlist_t : public plib::plog_dispatch_intf //, public device_owner_t
+	class netlist_t : public plib::plog_dispatch_intf
 	{
 		P_PREVENT_COPYING(netlist_t)
 	public:
@@ -1157,7 +1158,9 @@ protected:
 		/* mostly rw */
 		netlist_time                m_time;
 		queue_t                     m_queue;
-		/* mostly rw */
+
+		nperftime_t					m_stat_mainloop;
+		/* mostly ro */
 		bool                        m_use_deactivate;
 
 		devices::NETLIB_NAME(mainclock) *    m_mainclock;
diff --git a/src/lib/netlist/plib/pconfig.h b/src/lib/netlist/plib/pconfig.h
index 01c590602ac..4538db13d2d 100644
--- a/src/lib/netlist/plib/pconfig.h
+++ b/src/lib/netlist/plib/pconfig.h
@@ -12,9 +12,22 @@
 #include <thread>
 #include <chrono>
 
-#ifndef PSTANDALONE
-	#define PSTANDALONE (0)
-#endif
+/*
+ * Define this for more accurate measurements if you processor supports
+ * RDTSCP.
+ */
+#define PHAS_RDTSCP (1)
+
+/*
+ * Define this to use accurate timing measurements. Only works
+ * if PHAS_RDTSCP == 1
+ */
+#define PUSE_ACCURATE_STATS (1)
+
+/*
+ * Set this to one if you want to use 128 bit int for ptime.
+ * This is for tests only.
+ */
 
 #define PHAS_INT128 (0)
 
@@ -88,15 +101,92 @@ static inline ticks_t ticks_per_second()
 
 #if defined(__x86_64__) &&  !defined(_clang__) && !defined(_MSC_VER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6))
 
-static inline ticks_t profile_ticks()
+
+/* Based on "How to Benchmark Code Execution Times on Intel® IA-32 and IA-64
+ * Instruction Set Architectures", Intel, 2010
+ *
+ */
+#if PUSE_ACCURATE_STATS && PHAS_RDTSCP
+/*
+ * kills performance completely, but is accurate
+ * cpuid serializes, but clobbers ebx and ecx
+ *
+ */
+static inline ticks_t profile_ticks_begin()
 {
-    unsigned hi, lo;
-    __asm__ __volatile__ ("rdtsc" : "=a"(lo), "=d"(hi));
-    return ( (unsigned long long)lo)|( ((unsigned long long)hi)<<32 );
+    int64_t v;
+    __asm__ __volatile__ (
+    		"cpuid;"
+    		//"xor %%eax, %%eax\n\t"
+    		"rdtsc;"
+    		"shl $32, %%rdx;"
+    		"or %%edx, %%eax;"
+    		: "=a"(v) /* outputs */
+			: "a"(0x0)                /* inputs */
+			: "%ebx", "%ecx", "%rdx"  /* clobbers*/
+    );
+    return v;
 }
+static inline ticks_t profile_ticks_end()
+{
+	int64_t v;
+    __asm__ __volatile__ (
+    		"rdtscp;"
+    		"shl $32, %%rdx;"
+    		"or %%eax, %%edx;"
+    		"mov %%rdx, %%r10;"
+    		"xor %%eax, %%eax\n\t"
+    		"cpuid;"
+    		"mov %%r10, %0;"
+    		: "=r" (v)
+			:
+			:	"%rax", "%ebx", "%ecx", "%rdx", "%r10"
+    );
+    return v;
+}
+#elif PHAS_RDTSCP
+static inline ticks_t profile_ticks_begin()
+{
+    union {
+    	struct {
+    		unsigned lo, hi;
+    	} v32;
+    	int64_t v64;
+    } v;
+    __asm__ __volatile__ (
+    		"rdtscp" : "=a"(v.v32.lo), "=d"(v.v32.hi) /* outputs */
+			   : /*"a"(0)*/             /* inputs */
+			   : "%ecx"     /* clobbers*/
+    );
+    return v.v64;
+}
+static inline ticks_t profile_ticks_end()
+{
+	return profile_ticks_begin();
+}
+#else
+static inline ticks_t profile_ticks_begin()
+{
+    union {
+    	struct {
+    		unsigned lo, hi;
+    	} v32;
+    	int64_t v64;
+    } v;
+    __asm__ __volatile__ (
+    		"rdtsc" : "=a"(v.v32.lo), "=d"(v.v32.hi) /* outputs */
+    );
+    return v.v64;
+}
+static inline ticks_t profile_ticks_end()
+{
+	return profile_ticks_begin();
+}
+#endif
 
 #else
-static inline ticks_t profile_ticks() { return ticks(); }
+static inline ticks_t profile_ticks_begin() { return ticks(); }
+static inline ticks_t profile_ticks_end() { return ticks(); }
 #endif
 
 template<bool enabled_>
@@ -129,8 +219,8 @@ struct perftime_t
 	perftime_t() : m_time(0), m_count(0) { }
 	typedef ticks_t type;
 	type operator()() const { return m_time; }
-	void begin() { m_time -= profile_ticks(); }
-	void end() { m_time += profile_ticks(); ++m_count; }
+	void begin() { m_time -= profile_ticks_begin(); }
+	void end() { m_time += profile_ticks_end(); ++m_count; }
 	void reset() { m_time = 0; m_count = 0; }
 	type average() const { return (m_count == 0) ? 0 : m_time / m_count; }
 	type total() const { return m_time; }
diff --git a/src/mame/machine/nl_breakout.cpp b/src/mame/machine/nl_breakout.cpp
index 1cfd879c91a..bdabf1df0f9 100644
--- a/src/mame/machine/nl_breakout.cpp
+++ b/src/mame/machine/nl_breakout.cpp
@@ -275,6 +275,7 @@ CIRCUIT_LAYOUT( breakout )
 	CHIP("H5", 9312)
 	CHIP("H6", 9310)
 	CHIP("H7", 7408)    //sometimes looks like N7 on schematic
+	//PARAM(H7.USE_DEACTIVATE, 0)
 	CHIP("H8", 7474)
 	CHIP("H9", 7474)
 
@@ -1700,6 +1701,35 @@ CIRCUIT_LAYOUT( breakout )
 
 	NET_C(GND, D9.1, D9.2, D9.13, D9.3, D9.4, D9.5)
 
+	PARAM(A3.1.sub.USE_DEACTIVATE, 0)
+	PARAM(B6.s3.USE_DEACTIVATE, 0)
+	PARAM(C4.s3.USE_DEACTIVATE, 0)
+	PARAM(C4.s4.USE_DEACTIVATE, 0)
+	PARAM(C5.s3.USE_DEACTIVATE, 0)
+	PARAM(C5.s4.USE_DEACTIVATE, 0)
+	PARAM(D3.2.sub.USE_DEACTIVATE, 0)
+	PARAM(E2.s2.USE_DEACTIVATE, 0)
+	PARAM(E3.s2.USE_DEACTIVATE, 0)
+	PARAM(E5.s4.USE_DEACTIVATE, 0)
+	PARAM(E8.2.sub.USE_DEACTIVATE, 0)
+	PARAM(E9.s6.USE_DEACTIVATE, 0)
+	PARAM(F5.2.sub.USE_DEACTIVATE, 0)
+	PARAM(H2.s1.USE_DEACTIVATE, 0)
+	PARAM(H3.s1.USE_DEACTIVATE, 0)
+	PARAM(H6.sub.USE_DEACTIVATE, 0)
+	PARAM(J3.s4.USE_DEACTIVATE, 0)
+	PARAM(J5.USE_DEACTIVATE, 0)
+	PARAM(J6.sub.USE_DEACTIVATE, 0)
+	PARAM(J8.1.USE_DEACTIVATE, 0)
+	PARAM(J8.3.USE_DEACTIVATE, 0)
+	PARAM(K4.s4.USE_DEACTIVATE, 0)
+	PARAM(M3.s2.USE_DEACTIVATE, 0)
+	PARAM(M3.s4.USE_DEACTIVATE, 0)
+	PARAM(M4.s2.USE_DEACTIVATE, 0)
+	PARAM(M6.sub.USE_DEACTIVATE, 0)
+	PARAM(M8.s1.USE_DEACTIVATE, 0)
+	PARAM(N6.sub.USE_DEACTIVATE, 0)
+	PARAM(N7.s3.USE_DEACTIVATE, 0)
 CIRCUIT_LAYOUT_END
 
 /*
diff --git a/src/mame/machine/nl_pong.cpp b/src/mame/machine/nl_pong.cpp
index 456448ab067..db75baac851 100644
--- a/src/mame/machine/nl_pong.cpp
+++ b/src/mame/machine/nl_pong.cpp
@@ -578,4 +578,40 @@ NETLIST_START(pong_fast)
 
 	ALIAS(videomix, RV3.2)
 
+	PARAM(clk.USE_DEACTIVATE, 0)
+	PARAM(ic_e1d.USE_DEACTIVATE, 0)
+	PARAM(ic_e1c.USE_DEACTIVATE, 0)
+	PARAM(ic_f1.A.USE_DEACTIVATE, 0)
+	PARAM(ic_f1.D.USE_DEACTIVATE, 0)
+	PARAM(ic_g1d.USE_DEACTIVATE, 0)
+	PARAM(ic_h1a.USE_DEACTIVATE, 0)
+	PARAM(ic_h1d.USE_DEACTIVATE, 0)
+	PARAM(ic_h3b.sub.USE_DEACTIVATE, 0)
+	PARAM(ic_g6b.sub.USE_DEACTIVATE, 0)
+	PARAM(ic_c2a.sub.USE_DEACTIVATE, 0)
+	PARAM(hit_sound.USE_DEACTIVATE, 0)
+	PARAM(topbothitsound.USE_DEACTIVATE, 0)
+	PARAM(ic_c9b.USE_DEACTIVATE, 0)
+	PARAM(ic_b8.D.USE_DEACTIVATE, 0)
+	PARAM(ic_b7a.USE_DEACTIVATE, 0)
+	PARAM(ic_a7b.USE_DEACTIVATE, 0)
+	PARAM(ic_c9a.USE_DEACTIVATE, 0)
+	PARAM(ic_a8.D.USE_DEACTIVATE, 0)
+	PARAM(ic_b7d.USE_DEACTIVATE, 0)
+	PARAM(ic_a7a.USE_DEACTIVATE, 0)
+	PARAM(ic_g1a.USE_DEACTIVATE, 0)
+	PARAM(ic_c8a.sub.USE_DEACTIVATE, 0)
+	PARAM(ic_c8b.sub.USE_DEACTIVATE, 0)
+	PARAM(ic_d8b.USE_DEACTIVATE, 0)
+	PARAM(ic_d6a.sub.USE_DEACTIVATE, 0)
+	PARAM(ic_d6b.sub.USE_DEACTIVATE, 0)
+	PARAM(ic_c6a.sub.USE_DEACTIVATE, 0)
+	PARAM(ic_c6b.sub.USE_DEACTIVATE, 0)
+	PARAM(ic_e5b.USE_DEACTIVATE, 0)
+	PARAM(ic_e4c.USE_DEACTIVATE, 0)
+	PARAM(ic_d4b.USE_DEACTIVATE, 0)
+	PARAM(ic_g1b.USE_DEACTIVATE, 0)
+
+
+
 NETLIST_END()

From ecc2434d7f18be99c7bcce7a96a34f46ed88eee6 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Mon, 20 Jun 2016 23:51:03 +0200
Subject: [PATCH 34/39] Fix compile. (nw)

---
 src/lib/netlist/nl_base.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index 62154987d3b..cdae5b7e2ad 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -461,7 +461,9 @@ core_device_t::core_device_t(netlist_t &owner, const pstring &name)
 	: object_t(name)
 	, logic_family_t()
 	, netlist_ref(owner)
+#if (NL_PMF_TYPE > NL_PMF_TYPE_VIRTUAL)
 	, m_static_update()
+#endif
 {
 	if (logic_family() == nullptr)
 		set_logic_family(family_TTL());
@@ -471,7 +473,9 @@ core_device_t::core_device_t(core_device_t &owner, const pstring &name)
 	: object_t(owner.name() + "." + name)
 	, logic_family_t()
 	, netlist_ref(owner.netlist())
+#if (NL_PMF_TYPE > NL_PMF_TYPE_VIRTUAL)
 	, m_static_update()
+#endif
 {
 	set_logic_family(owner.logic_family());
 	if (logic_family() == nullptr)

From f93171a9bc8e8ef8518985950e0ea03caf15cfaa Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Tue, 21 Jun 2016 01:34:03 +0200
Subject: [PATCH 35/39] Simplify conditional activation/deactivation.
 Introduced HINT(device, hint) to clarify that hints are inheritent and not
 specific to devices. (nw)

---
 src/lib/netlist/devices/nld_truthtable.h |  9 ++-
 src/lib/netlist/nl_base.cpp              | 35 +++++++----
 src/lib/netlist/nl_base.h                | 27 ++++++---
 src/lib/netlist/nl_parser.cpp            | 12 ++++
 src/lib/netlist/nl_parser.h              |  2 +
 src/lib/netlist/nl_setup.cpp             |  1 +
 src/lib/netlist/nl_setup.h               |  3 +
 src/mame/machine/nl_breakout.cpp         | 58 +++++++++---------
 src/mame/machine/nl_pong.cpp             | 77 +++++++++++-------------
 9 files changed, 126 insertions(+), 98 deletions(-)

diff --git a/src/lib/netlist/devices/nld_truthtable.h b/src/lib/netlist/devices/nld_truthtable.h
index 2f27a076781..157aea166fc 100644
--- a/src/lib/netlist/devices/nld_truthtable.h
+++ b/src/lib/netlist/devices/nld_truthtable.h
@@ -165,7 +165,6 @@ namespace netlist
 		, m_fam(*this, fam)
 		, m_ign(*this, "m_ign", 0)
 		, m_active(*this, "m_active", 1)
-		, m_use_deactivate(*this, "USE_DEACTIVATE", true)
 		, m_ttp(ttp)
 		{
 			while (*desc != nullptr && **desc != 0 )
@@ -183,7 +182,6 @@ namespace netlist
 		, m_fam(*this, fam)
 		, m_ign(*this, "m_ign", 0)
 		, m_active(*this, "m_active", 1)
-		, m_use_deactivate(*this, "USE_DEACTIVATE", true)
 		, m_ttp(ttp)
 		{
 			m_desc = desc;
@@ -192,6 +190,8 @@ namespace netlist
 
 		void startxx()
 		{
+			set_hint_deactivate(true);
+
 			pstring header = m_desc[0];
 
 			plib::pstring_vector_t io(header,"|");
@@ -264,7 +264,7 @@ namespace netlist
 	public:
 		void inc_active() override
 		{
-			if (m_NI > 1 && m_use_deactivate)
+			if (m_NI > 1)
 				if (++m_active == 1)
 				{
 					process<false>();
@@ -279,7 +279,7 @@ namespace netlist
 			 * can decide for each individual gate whether it is benefitial to
 			 * ignore deactivation.
 			 */
-			if (m_NI > 1 && m_use_deactivate)
+			if (m_NI > 1)
 				if (--m_active == 0)
 				{
 					for (std::size_t i = 0; i< m_NI; i++)
@@ -363,7 +363,6 @@ namespace netlist
 		/* FIXME: check width */
 		state_var_u32		m_ign;
 		state_var_s32		m_active;
-		param_logic_t		m_use_deactivate;
 		truthtable_t *		m_ttp;
 		plib::pstring_vector_t m_desc;
 	};
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index cdae5b7e2ad..ab75172a57c 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -189,7 +189,6 @@ netlist_t::netlist_t(const pstring &aname)
 	: m_state()
 	, m_time(netlist_time::zero())
 	, m_queue(*this)
-	, m_use_deactivate(0)
 	, m_mainclock(nullptr)
 	, m_solver(nullptr)
 	, m_gnd(nullptr)
@@ -247,8 +246,6 @@ void netlist_t::start()
 	m_gnd = get_single_device<devices::NETLIB_NAME(gnd)>("gnd");
 	m_params = get_single_device<devices::NETLIB_NAME(netlistparams)>("parameter");
 
-	m_use_deactivate = (m_params->m_use_deactivate.Value() ? true : false);
-
 	/* create devices */
 
 	for (auto & e : setup().m_device_factory)
@@ -263,6 +260,24 @@ void netlist_t::start()
 		}
 	}
 
+	bool use_deactivate = (m_params->m_use_deactivate.Value() ? true : false);
+
+
+	for (auto &d : m_devices)
+	{
+		if (use_deactivate)
+		{
+			auto p = setup().m_param_values.find(d->name() + ".HINT_NO_DEACTIVATE");
+			if (p != setup().m_param_values.end())
+			{
+				//FIXME: Error checking
+				auto v = p->second.as_long();
+				d->set_hint_deactivate(!v);
+			}
+		}
+		else
+			d->set_hint_deactivate(false);
+	}
 }
 
 void netlist_t::stop()
@@ -461,6 +476,7 @@ core_device_t::core_device_t(netlist_t &owner, const pstring &name)
 	: object_t(name)
 	, logic_family_t()
 	, netlist_ref(owner)
+	, m_hint_deactivate(false)
 #if (NL_PMF_TYPE > NL_PMF_TYPE_VIRTUAL)
 	, m_static_update()
 #endif
@@ -473,6 +489,7 @@ core_device_t::core_device_t(core_device_t &owner, const pstring &name)
 	: object_t(owner.name() + "." + name)
 	, logic_family_t()
 	, netlist_ref(owner.netlist())
+	, m_hint_deactivate(false)
 #if (NL_PMF_TYPE > NL_PMF_TYPE_VIRTUAL)
 	, m_static_update()
 #endif
@@ -627,11 +644,7 @@ void net_t::inc_active(core_terminal_t &term)
 	nl_assert(m_active <= (int) num_cons());
 	if (m_active == 1)
 	{
-		if (netlist().use_deactivate())
-		{
-			railterminal().device().do_inc_active();
-			//m_cur_Q = m_new_Q;
-		}
+		railterminal().device().do_inc_active();
 		if (m_in_queue == 0)
 		{
 			if (m_time > netlist().time())
@@ -653,7 +666,7 @@ void net_t::dec_active(core_terminal_t &term)
 	--m_active;
 	nl_assert(m_active >= 0);
 	m_list_active.remove(&term);
-	if (m_active == 0 && netlist().use_deactivate())
+	if (m_active == 0)
 		railterminal().device().do_dec_active();
 }
 
@@ -981,10 +994,6 @@ nl_double param_model_t::model_value(const pstring &entity)
 }
 
 
-} // namespace
-
-namespace netlist
-{
 	namespace devices
 	{
 
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index a9a767ea49d..2461ff46d2f 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -911,9 +911,21 @@ namespace netlist
 		void set_delegate_pointer();
 		void stop_dev();
 
-		void do_inc_active() { m_stat_inc_active.inc(); inc_active();  }
-		void do_dec_active() { dec_active(); }
+		void do_inc_active()
+		{
+			if (m_hint_deactivate)
+			{
+				m_stat_inc_active.inc();
+				inc_active();
+			}
+		}
+		void do_dec_active()
+		{
+			if (m_hint_deactivate)
+				dec_active();
+		}
 		void do_reset() { reset(); }
+		void set_hint_deactivate(bool v) { m_hint_deactivate = v; }
 
 		netlist_sig_t INPLOGIC_PASSIVE(logic_input_t &inp);
 		netlist_sig_t INPLOGIC(const logic_input_t &inp) const
@@ -950,12 +962,12 @@ namespace netlist
 		virtual bool needs_update_after_param_change() const { return false; }
 
 	private:
-
-		#if (NL_PMF_TYPE == NL_PMF_TYPE_GNUC_PMF)
+		bool m_hint_deactivate;
+	#if (NL_PMF_TYPE == NL_PMF_TYPE_GNUC_PMF)
 		typedef void (core_device_t::*net_update_delegate)();
-		#elif ((NL_PMF_TYPE == NL_PMF_TYPE_GNUC_PMF_CONV) || (NL_PMF_TYPE == NL_PMF_TYPE_INTERNAL))
+	#elif ((NL_PMF_TYPE == NL_PMF_TYPE_GNUC_PMF_CONV) || (NL_PMF_TYPE == NL_PMF_TYPE_INTERNAL))
 		using net_update_delegate = MEMBER_ABI void (*)(core_device_t *);
-		#endif
+	#endif
 
 	#if (NL_PMF_TYPE > NL_PMF_TYPE_VIRTUAL)
 		net_update_delegate m_static_update;
@@ -1078,8 +1090,6 @@ namespace netlist
 		void process_queue(const netlist_time &delta);
 		void abort_current_queue_slice() { m_queue.retime(m_time, nullptr); }
 
-		bool use_deactivate() const { return m_use_deactivate; }
-
 		void rebuild_lists(); /* must be called after post_load ! */
 
 		void set_setup(setup_t *asetup) { m_setup = asetup;  }
@@ -1161,7 +1171,6 @@ protected:
 
 		nperftime_t					m_stat_mainloop;
 		/* mostly ro */
-		bool                        m_use_deactivate;
 
 		devices::NETLIB_NAME(mainclock) *    m_mainclock;
 		devices::NETLIB_NAME(solver) *       m_solver;
diff --git a/src/lib/netlist/nl_parser.cpp b/src/lib/netlist/nl_parser.cpp
index b4e3c14cf4d..bc27913e6b0 100644
--- a/src/lib/netlist/nl_parser.cpp
+++ b/src/lib/netlist/nl_parser.cpp
@@ -45,6 +45,7 @@ bool parser_t::parse(const pstring nlname)
 	m_tok_NET_C = register_token("NET_C");
 	m_tok_FRONTIER = register_token("OPTIMIZE_FRONTIER");
 	m_tok_PARAM = register_token("PARAM");
+	m_tok_HINT = register_token("HINT");
 	m_tok_NET_MODEL = register_token("NET_MODEL");
 	m_tok_INCLUDE = register_token("INCLUDE");
 	m_tok_LOCAL_SOURCE = register_token("LOCAL_SOURCE");
@@ -120,6 +121,8 @@ void parser_t::parse_netlist(ATTR_UNUSED const pstring &nlname)
 			frontier();
 		else if (token.is(m_tok_PARAM))
 			netdev_param();
+		else if (token.is(m_tok_HINT))
+			netdev_hint();
 		else if (token.is(m_tok_NET_MODEL))
 			net_model();
 		else if (token.is(m_tok_SUBMODEL))
@@ -342,6 +345,15 @@ void parser_t::netdev_param()
 	require_token(m_tok_param_right);
 }
 
+void parser_t::netdev_hint()
+{
+	pstring dev(get_identifier());
+	require_token(m_tok_comma);
+	pstring hint(get_identifier());
+	m_setup.register_param(dev + ".HINT_" + hint, 1);
+	require_token(m_tok_param_right);
+}
+
 void parser_t::device(const pstring &dev_type)
 {
 	if (m_setup.is_library_item(dev_type))
diff --git a/src/lib/netlist/nl_parser.h b/src/lib/netlist/nl_parser.h
index 7338fb01abd..5c915e69997 100644
--- a/src/lib/netlist/nl_parser.h
+++ b/src/lib/netlist/nl_parser.h
@@ -27,6 +27,7 @@ namespace netlist
 		void net_alias();
 		void dippins();
 		void netdev_param();
+		void netdev_hint();
 		void net_c();
 		void frontier();
 		void device(const pstring &dev_type);
@@ -54,6 +55,7 @@ namespace netlist
 		token_id_t m_tok_DIPPINS;
 		token_id_t m_tok_FRONTIER;
 		token_id_t m_tok_PARAM;
+		token_id_t m_tok_HINT;
 		token_id_t m_tok_NET_MODEL;
 		token_id_t m_tok_NETLIST_START;
 		token_id_t m_tok_NETLIST_END;
diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp
index 81e2514d90a..830d9305327 100644
--- a/src/lib/netlist/nl_setup.cpp
+++ b/src/lib/netlist/nl_setup.cpp
@@ -787,6 +787,7 @@ void setup_t::start_devices()
 	}
 
 	netlist().start();
+
 }
 
 plib::plog_base<NL_DEBUG> &setup_t::log()
diff --git a/src/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h
index bb0bbaf0c14..ed2e4f3bbe2 100644
--- a/src/lib/netlist/nl_setup.h
+++ b/src/lib/netlist/nl_setup.h
@@ -49,6 +49,9 @@
 #define PARAM(name, val)                                                        \
 		setup.register_param(# name, val);
 
+#define HINT(name, val)                                                        \
+		setup.register_param(# name ".HINT_" # val, 1);
+
 #define NETDEV_PARAMI(name, param, val)                                         \
 		setup.register_param(# name "." # param, val);
 
diff --git a/src/mame/machine/nl_breakout.cpp b/src/mame/machine/nl_breakout.cpp
index bdabf1df0f9..361cdcd940a 100644
--- a/src/mame/machine/nl_breakout.cpp
+++ b/src/mame/machine/nl_breakout.cpp
@@ -1701,35 +1701,35 @@ CIRCUIT_LAYOUT( breakout )
 
 	NET_C(GND, D9.1, D9.2, D9.13, D9.3, D9.4, D9.5)
 
-	PARAM(A3.1.sub.USE_DEACTIVATE, 0)
-	PARAM(B6.s3.USE_DEACTIVATE, 0)
-	PARAM(C4.s3.USE_DEACTIVATE, 0)
-	PARAM(C4.s4.USE_DEACTIVATE, 0)
-	PARAM(C5.s3.USE_DEACTIVATE, 0)
-	PARAM(C5.s4.USE_DEACTIVATE, 0)
-	PARAM(D3.2.sub.USE_DEACTIVATE, 0)
-	PARAM(E2.s2.USE_DEACTIVATE, 0)
-	PARAM(E3.s2.USE_DEACTIVATE, 0)
-	PARAM(E5.s4.USE_DEACTIVATE, 0)
-	PARAM(E8.2.sub.USE_DEACTIVATE, 0)
-	PARAM(E9.s6.USE_DEACTIVATE, 0)
-	PARAM(F5.2.sub.USE_DEACTIVATE, 0)
-	PARAM(H2.s1.USE_DEACTIVATE, 0)
-	PARAM(H3.s1.USE_DEACTIVATE, 0)
-	PARAM(H6.sub.USE_DEACTIVATE, 0)
-	PARAM(J3.s4.USE_DEACTIVATE, 0)
-	PARAM(J5.USE_DEACTIVATE, 0)
-	PARAM(J6.sub.USE_DEACTIVATE, 0)
-	PARAM(J8.1.USE_DEACTIVATE, 0)
-	PARAM(J8.3.USE_DEACTIVATE, 0)
-	PARAM(K4.s4.USE_DEACTIVATE, 0)
-	PARAM(M3.s2.USE_DEACTIVATE, 0)
-	PARAM(M3.s4.USE_DEACTIVATE, 0)
-	PARAM(M4.s2.USE_DEACTIVATE, 0)
-	PARAM(M6.sub.USE_DEACTIVATE, 0)
-	PARAM(M8.s1.USE_DEACTIVATE, 0)
-	PARAM(N6.sub.USE_DEACTIVATE, 0)
-	PARAM(N7.s3.USE_DEACTIVATE, 0)
+	HINT(A3.1.sub, NO_DEACTIVATE)
+	HINT(B6.s3, NO_DEACTIVATE)
+	HINT(C4.s3, NO_DEACTIVATE)
+	HINT(C4.s4, NO_DEACTIVATE)
+	HINT(C5.s3, NO_DEACTIVATE)
+	HINT(C5.s4, NO_DEACTIVATE)
+	HINT(D3.2.sub, NO_DEACTIVATE)
+	HINT(E2.s2, NO_DEACTIVATE)
+	HINT(E3.s2, NO_DEACTIVATE)
+	HINT(E5.s4, NO_DEACTIVATE)
+	HINT(E8.2.sub, NO_DEACTIVATE)
+	HINT(E9.s6, NO_DEACTIVATE)
+	HINT(F5.2.sub, NO_DEACTIVATE)
+	HINT(H2.s1, NO_DEACTIVATE)
+	HINT(H3.s1, NO_DEACTIVATE)
+	HINT(H6.sub, NO_DEACTIVATE)
+	HINT(J3.s4, NO_DEACTIVATE)
+	HINT(J5, NO_DEACTIVATE)
+	HINT(J6.sub, NO_DEACTIVATE)
+	HINT(J8.1, NO_DEACTIVATE)
+	HINT(J8.3, NO_DEACTIVATE)
+	HINT(K4.s4, NO_DEACTIVATE)
+	HINT(M3.s2, NO_DEACTIVATE)
+	HINT(M3.s4, NO_DEACTIVATE)
+	HINT(M4.s2, NO_DEACTIVATE)
+	HINT(M6.sub, NO_DEACTIVATE)
+	HINT(M8.s1, NO_DEACTIVATE)
+	HINT(N6.sub, NO_DEACTIVATE)
+	HINT(N7.s3, NO_DEACTIVATE)
 CIRCUIT_LAYOUT_END
 
 /*
diff --git a/src/mame/machine/nl_pong.cpp b/src/mame/machine/nl_pong.cpp
index db75baac851..d03ae825d78 100644
--- a/src/mame/machine/nl_pong.cpp
+++ b/src/mame/machine/nl_pong.cpp
@@ -27,7 +27,6 @@ NETLIST_START(pong_fast)
 	TTL_INPUT(high, 1)
 	TTL_INPUT(low, 0)
 
-#if 1
 #if (FAST_CLOCK)
 	/* abstracting this, performance increases by 60%
 	 * No surprise, the clock is extremely expensive */
@@ -38,12 +37,6 @@ NETLIST_START(pong_fast)
 	TTL_74107(ic_f6a, xclk, high, high, high)
 	ALIAS(clk, ic_f6a.Q)
 #endif
-#else
-	// benchmarking ...
-	NETDEV_TTL_CONST(clk, 0)
-	MAINCLOCK(xclk)
-	PARAM(xclk.FREQ, 7159000.0*2)
-#endif
 
 	/* 3V Logic - Just a resistor - the value is not given in schematics */
 
@@ -577,41 +570,41 @@ NETLIST_START(pong_fast)
 	NET_C(RV2.2, RV3.2)
 
 	ALIAS(videomix, RV3.2)
-
-	PARAM(clk.USE_DEACTIVATE, 0)
-	PARAM(ic_e1d.USE_DEACTIVATE, 0)
-	PARAM(ic_e1c.USE_DEACTIVATE, 0)
-	PARAM(ic_f1.A.USE_DEACTIVATE, 0)
-	PARAM(ic_f1.D.USE_DEACTIVATE, 0)
-	PARAM(ic_g1d.USE_DEACTIVATE, 0)
-	PARAM(ic_h1a.USE_DEACTIVATE, 0)
-	PARAM(ic_h1d.USE_DEACTIVATE, 0)
-	PARAM(ic_h3b.sub.USE_DEACTIVATE, 0)
-	PARAM(ic_g6b.sub.USE_DEACTIVATE, 0)
-	PARAM(ic_c2a.sub.USE_DEACTIVATE, 0)
-	PARAM(hit_sound.USE_DEACTIVATE, 0)
-	PARAM(topbothitsound.USE_DEACTIVATE, 0)
-	PARAM(ic_c9b.USE_DEACTIVATE, 0)
-	PARAM(ic_b8.D.USE_DEACTIVATE, 0)
-	PARAM(ic_b7a.USE_DEACTIVATE, 0)
-	PARAM(ic_a7b.USE_DEACTIVATE, 0)
-	PARAM(ic_c9a.USE_DEACTIVATE, 0)
-	PARAM(ic_a8.D.USE_DEACTIVATE, 0)
-	PARAM(ic_b7d.USE_DEACTIVATE, 0)
-	PARAM(ic_a7a.USE_DEACTIVATE, 0)
-	PARAM(ic_g1a.USE_DEACTIVATE, 0)
-	PARAM(ic_c8a.sub.USE_DEACTIVATE, 0)
-	PARAM(ic_c8b.sub.USE_DEACTIVATE, 0)
-	PARAM(ic_d8b.USE_DEACTIVATE, 0)
-	PARAM(ic_d6a.sub.USE_DEACTIVATE, 0)
-	PARAM(ic_d6b.sub.USE_DEACTIVATE, 0)
-	PARAM(ic_c6a.sub.USE_DEACTIVATE, 0)
-	PARAM(ic_c6b.sub.USE_DEACTIVATE, 0)
-	PARAM(ic_e5b.USE_DEACTIVATE, 0)
-	PARAM(ic_e4c.USE_DEACTIVATE, 0)
-	PARAM(ic_d4b.USE_DEACTIVATE, 0)
-	PARAM(ic_g1b.USE_DEACTIVATE, 0)
-
+#if 1
+	HINT(clk, NO_DEACTIVATE)
+	HINT(ic_e1d, NO_DEACTIVATE)
+	HINT(ic_e1c, NO_DEACTIVATE)
+	HINT(ic_f1.A, NO_DEACTIVATE)
+	HINT(ic_f1.D, NO_DEACTIVATE)
+	HINT(ic_g1d, NO_DEACTIVATE)
+	HINT(ic_h1a, NO_DEACTIVATE)
+	HINT(ic_h1d, NO_DEACTIVATE)
+	HINT(ic_h3b.sub, NO_DEACTIVATE)
+	HINT(ic_g6b.sub, NO_DEACTIVATE)
+	HINT(ic_c2a.sub, NO_DEACTIVATE)
+	HINT(hit_sound, NO_DEACTIVATE)
+	HINT(topbothitsound, NO_DEACTIVATE)
+	HINT(ic_c9b, NO_DEACTIVATE)
+	HINT(ic_b8.D, NO_DEACTIVATE)
+	HINT(ic_b7a, NO_DEACTIVATE)
+	HINT(ic_a7b, NO_DEACTIVATE)
+	HINT(ic_c9a, NO_DEACTIVATE)
+	HINT(ic_a8.D, NO_DEACTIVATE)
+	HINT(ic_b7d, NO_DEACTIVATE)
+	HINT(ic_a7a, NO_DEACTIVATE)
+	HINT(ic_g1a, NO_DEACTIVATE)
+	HINT(ic_c8a.sub, NO_DEACTIVATE)
+	HINT(ic_c8b.sub, NO_DEACTIVATE)
+	HINT(ic_d8b, NO_DEACTIVATE)
+	HINT(ic_d6a.sub, NO_DEACTIVATE)
+	HINT(ic_d6b.sub, NO_DEACTIVATE)
+	HINT(ic_c6a.sub, NO_DEACTIVATE)
+	HINT(ic_c6b.sub, NO_DEACTIVATE)
+	HINT(ic_e5b, NO_DEACTIVATE)
+	HINT(ic_e4c, NO_DEACTIVATE)
+	HINT(ic_d4b, NO_DEACTIVATE)
+	HINT(ic_g1b, NO_DEACTIVATE)
+#endif
 
 
 NETLIST_END()

From 789a41a03b9be4f21b4b3e9932d117b2083b1254 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Wed, 22 Jun 2016 00:59:55 +0200
Subject: [PATCH 36/39] Fixed bugs in rdtsc code. Refactored timer code. (nw)

---
 scripts/src/netlist.lua          |   2 +
 src/lib/netlist/build/makefile   |   1 +
 src/lib/netlist/nl_base.cpp      |  14 +-
 src/lib/netlist/nl_base.h        |   4 +-
 src/lib/netlist/nl_config.h      |  13 +-
 src/lib/netlist/nl_lists.h       |   5 +-
 src/lib/netlist/plib/pchrono.cpp |  55 ++++++++
 src/lib/netlist/plib/pchrono.h   | 213 +++++++++++++++++++++++++++++++
 src/lib/netlist/plib/pconfig.h   | 157 -----------------------
 src/lib/netlist/prg/nltool.cpp   |  16 ++-
 src/mame/machine/nl_breakout.cpp |   1 +
 11 files changed, 301 insertions(+), 180 deletions(-)
 create mode 100644 src/lib/netlist/plib/pchrono.cpp
 create mode 100644 src/lib/netlist/plib/pchrono.h

diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index d6a34753ccb..3d3558a2754 100644
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@@ -38,6 +38,8 @@ project "netlist"
 		MAME_DIR .. "src/lib/netlist/plib/pconfig.h",
 		MAME_DIR .. "src/lib/netlist/plib/palloc.cpp",
 		MAME_DIR .. "src/lib/netlist/plib/palloc.h",
+    MAME_DIR .. "src/lib/netlist/plib/pchrono.cpp",
+    MAME_DIR .. "src/lib/netlist/plib/pchrono.h",
 		MAME_DIR .. "src/lib/netlist/plib/pfmtlog.cpp",
 		MAME_DIR .. "src/lib/netlist/plib/pfmtlog.h",
 		MAME_DIR .. "src/lib/netlist/plib/plists.h",
diff --git a/src/lib/netlist/build/makefile b/src/lib/netlist/build/makefile
index 569a10d6f07..0a3efaa70f8 100644
--- a/src/lib/netlist/build/makefile
+++ b/src/lib/netlist/build/makefile
@@ -49,6 +49,7 @@ OBJS = $(POBJS) $(NLOBJS)
 POBJS := \
 	$(POBJ)/pstring.o \
 	$(POBJ)/palloc.o \
+	$(POBJ)/pchrono.o \
 	$(POBJ)/pdynlib.o \
 	$(POBJ)/pfmtlog.o \
 	$(POBJ)/poptions.o \
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index ab75172a57c..16f2edaf6e1 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -349,7 +349,7 @@ void netlist_t::process_queue(const netlist_time &delta)
 
 	m_queue.push(stop, nullptr);
 
-	m_stat_mainloop.begin();
+	m_stat_mainloop.start();
 
 	if (m_mainclock == nullptr)
 	{
@@ -388,7 +388,7 @@ void netlist_t::process_queue(const netlist_time &delta)
 		}
 		mc_net.set_time(mc_time);
 	}
-	m_stat_mainloop.end();
+	m_stat_mainloop.stop();
 }
 
 void netlist_t::print_stats() const
@@ -417,13 +417,13 @@ void netlist_t::print_stats() const
 
 		nperftime_t overhead;
 		nperftime_t test;
-		overhead.begin();
+		overhead.start();
 		for (int j=0; j<100000;j++)
 		{
-			test.begin();
-			test.end();
+			test.start();
+			test.stop();
 		}
-		overhead.end();
+		overhead.stop();
 
 		uint_least64_t total_overhead = (uint_least64_t) overhead()*(uint_least64_t)total_count/(uint_least64_t)200000;
 
@@ -442,7 +442,7 @@ void netlist_t::print_stats() const
 		for (auto &entry : m_devices)
 		{
 			if (entry->m_stat_inc_active() > 3 * entry->m_stat_total_time.count())
-				log().verbose("PARAM({}.USE_DEACTIVATE, 0)", entry->name());
+				log().verbose("HINT({}, NO_DEACTIVATE)", entry->name());
 		}
 	}
 }
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 2461ff46d2f..5cad1962da5 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -892,9 +892,9 @@ namespace netlist
 
 		void update_dev()
 		{
-			m_stat_total_time.begin();
+			m_stat_total_time.start();
 			do_update();
-			m_stat_total_time.end();
+			m_stat_total_time.stop();
 		}
 
 		void do_update() NOEXCEPT
diff --git a/src/lib/netlist/nl_config.h b/src/lib/netlist/nl_config.h
index 6a6dec27fdd..153057dbc22 100644
--- a/src/lib/netlist/nl_config.h
+++ b/src/lib/netlist/nl_config.h
@@ -11,6 +11,7 @@
 #include <cstdint>
 
 #include "plib/pconfig.h"
+#include "plib/pchrono.h"
 
 //============================================================
 //  SETUP
@@ -114,15 +115,11 @@
 namespace netlist
 {
 #if NL_KEEP_STATISTICS
-//#define add_to_stat(v,x)        do { v += (x); } while (0)
-//#define inc_stat(v)             add_to_stat(v, 1)
-//#define begin_timing(v)         do { v -= plib::profile_ticks(); } while (0)
-//#define end_timing(v)           do { v += plib::profile_ticks(); } while (0)
-using nperftime_t = plib::perftime_t<true>;
-using nperfcount_t = plib::perfcount_t<true>;
+using nperftime_t = plib::timer<plib::exact_ticks, true>;
+using nperfcount_t = plib::counter<true>;
 #else
-using nperftime_t = plib::perftime_t<false>;
-using nperfcount_t = plib::perfcount_t<false>;
+using nperftime_t = plib::chrono::timer<plib::chrono::exact_ticks, false>;
+using nperfcount_t = plib::chrono::counter<false>;
 #endif
 }
 //============================================================
diff --git a/src/lib/netlist/nl_lists.h b/src/lib/netlist/nl_lists.h
index dee4f416069..9e6cc335b5b 100644
--- a/src/lib/netlist/nl_lists.h
+++ b/src/lib/netlist/nl_lists.h
@@ -10,10 +10,11 @@
 #ifndef NLLISTS_H_
 #define NLLISTS_H_
 
+#include <atomic>
+
 #include "nl_config.h"
 #include "plib/plists.h"
-
-#include <atomic>
+#include "plib/pchrono.h"
 
 
 // ----------------------------------------------------------------------------------------
diff --git a/src/lib/netlist/plib/pchrono.cpp b/src/lib/netlist/plib/pchrono.cpp
new file mode 100644
index 00000000000..3beb3b2f161
--- /dev/null
+++ b/src/lib/netlist/plib/pchrono.cpp
@@ -0,0 +1,55 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+#include <chrono>
+
+#include "pchrono.h"
+
+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()
+{
+	static type persec = 0;
+	if (persec == 0)
+	{
+		type x = 0;
+		system_ticks::type t = system_ticks::start();
+		system_ticks::type e;
+		x = -start();
+		do {
+			e = system_ticks::stop();
+		} while (e - t < system_ticks::per_second() / 100 );
+		x += stop();
+		persec = (type)(double)((double) x * (double) system_ticks::per_second() / double (e - t));
+	}
+	return persec;
+}
+
+#if PUSE_ACCURATE_STATS && PHAS_RDTSCP
+exact_ticks::type exact_ticks::per_second()
+{
+	static type persec = 0;
+	if (persec == 0)
+	{
+		type x = 0;
+		system_ticks::type t = system_ticks::start();
+		system_ticks::type e;
+		x = -start();
+		do {
+			e = system_ticks::stop();
+		} while (e - t < system_ticks::per_second() / 100 );
+		x += stop();
+		persec = (type)(double)((double) x * (double) system_ticks::per_second() / double (e - t));
+	}
+	return persec;
+}
+#endif
+
+#endif
+
+}
+}
diff --git a/src/lib/netlist/plib/pchrono.h b/src/lib/netlist/plib/pchrono.h
new file mode 100644
index 00000000000..805842007f2
--- /dev/null
+++ b/src/lib/netlist/plib/pchrono.h
@@ -0,0 +1,213 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+/*
+ * pchrono.h
+ *
+ */
+
+#ifndef PCHRONO_H_
+#define PCHRONO_H_
+
+#include <cstdint>
+#include <thread>
+#include <chrono>
+
+#include "pconfig.h"
+
+namespace plib {
+namespace chrono {
+	template <typename T>
+	struct sys_ticks
+	{
+		typedef typename T::rep type;
+		static inline type start() { return T::now().time_since_epoch().count(); }
+		static inline type stop() { return T::now().time_since_epoch().count(); }
+		static inline constexpr type per_second() { return T::period::den / T::period::num; }
+	};
+
+	using hires_ticks = sys_ticks<std::chrono::high_resolution_clock>;
+	using steady_ticks = sys_ticks<std::chrono::steady_clock>;
+	using system_ticks = sys_ticks<std::chrono::system_clock>;
+
+	#if defined(__x86_64__) &&  !defined(_clang__) && !defined(_MSC_VER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6))
+
+	#if PHAS_RDTSCP
+	struct fast_ticks
+	{
+		typedef int64_t type;
+		static inline type start()
+		{
+			int64_t v;
+			__asm__ __volatile__ (
+					"rdtscp;"
+					"shl $32, %%rdx;"
+					"or %%rdx, %%rax;"
+					: "=a"(v) 			/* outputs  */
+					: 			        /* inputs   */
+					: "%rcx", "%rdx"    /* clobbers */
+			);
+			return v;
+		}
+		static inline type stop()
+		{
+			return start();
+		}
+		static type per_second();
+	};
+
+	#else
+	struct fast_ticks
+	{
+		typedef int64_t type;
+		static inline type start()
+		{
+			int64_t v;
+			__asm__ __volatile__ (
+					"rdtsc;"
+					"shl $32, %%rdx;"
+					"or %%rdx, %%rax;"
+					: "=a"(v) 	/* outputs  */
+					: 			/* inputs   */
+					: "%rdx"    /* clobbers */
+			);
+			return v;
+		}
+		static inline type stop()
+		{
+			return start();
+		}
+		static type per_second();
+	};
+
+	#endif
+
+
+	/* Based on "How to Benchmark Code Execution Times on Intel® IA-32 and IA-64
+	 * Instruction Set Architectures", Intel, 2010
+	 *
+	 */
+	#if PUSE_ACCURATE_STATS && PHAS_RDTSCP
+	/*
+	 * kills performance completely, but is accurate
+	 * cpuid serializes, but clobbers ebx and ecx
+	 *
+	 */
+
+	struct exact_ticks
+	{
+		typedef int64_t type;
+
+		static inline type start()
+		{
+			int64_t v;
+			__asm__ __volatile__ (
+					"cpuid;"
+					//"xor %%eax, %%eax\n\t"
+					"rdtsc;"
+					"shl $32, %%rdx;"
+					"or %%rdx, %%rax;"
+					: "=a"(v) /* outputs */
+					: "a"(0x0)                /* inputs */
+					: "%ebx", "%ecx", "%rdx"  /* clobbers*/
+			);
+			return v;
+		}
+		static inline type stop()
+		{
+			int64_t v;
+			__asm__ __volatile__ (
+					"rdtscp;"
+					"shl $32, %%rdx;"
+					"or %%rax, %%rdx;"
+					"mov %%rdx, %%r10;"
+					"xor %%eax, %%eax\n\t"
+					"cpuid;"
+					"mov %%r10, %%rax;"
+					: "=a" (v)
+					:
+					: "%ebx", "%ecx", "%rdx", "%r10"
+			);
+			return v;
+		}
+
+		static type per_second();
+	};
+	#else
+	using exact_ticks = fast_ticks;
+	#endif
+
+
+	#else
+	using fast_ticks = hires_ticks;
+	using exact_ticks = fast_ticks;
+	#endif
+
+	template<bool enabled_>
+	struct counter
+	{
+		counter() : m_count(0) { }
+		typedef uint_least64_t type;
+		type operator()() const { return m_count; }
+		void inc() { ++m_count; }
+		void reset() { m_count = 0; }
+		constexpr static bool enabled = enabled_;
+	private:
+		type m_count;
+	};
+
+	template<>
+	struct counter<false>
+	{
+		typedef uint_least64_t type;
+		constexpr type operator()() const { return 0; }
+		void inc() const { }
+		void reset() const { }
+		constexpr static bool enabled = false;
+	};
+
+
+	template< typename T, bool enabled_ = true>
+	struct timer
+	{
+		typedef typename T::type type;
+		typedef uint_least64_t   ctype;
+
+		timer() : m_time(0), m_count(0) { }
+
+		type operator()() const { return m_time; }
+
+		void start() { m_time -= T::start(); }
+		void stop() { m_time += T::stop(); ++m_count; }
+		void reset() { m_time = 0; m_count = 0; }
+		type average() const { return (m_count == 0) ? 0 : m_time / m_count; }
+		type total() const { return m_time; }
+		ctype count() const { return m_count; }
+
+		double as_seconds() const { return (double) total() / (double) T::per_second(); }
+
+		constexpr static bool enabled = enabled_;
+	private:
+		type m_time;
+		ctype m_count;
+	};
+
+	template<typename T>
+	struct timer<T, false>
+	{
+		typedef typename T::type type;
+		typedef uint_least64_t   ctype;
+		constexpr type operator()() const { return 0; }
+		void start()  const { }
+		void stop() const { }
+		void reset() const { }
+		constexpr type average() const { return 0; }
+		constexpr type total() const { return 0; }
+		constexpr ctype count() const { return 0; }
+		constexpr double as_seconds() const { return 0.0; }
+		constexpr static bool enabled = false;
+	};
+
+	} // namespace chrono
+} // namespace plib
+
+#endif /* PCHRONO_H_ */
diff --git a/src/lib/netlist/plib/pconfig.h b/src/lib/netlist/plib/pconfig.h
index 4538db13d2d..5c1582cdec8 100644
--- a/src/lib/netlist/plib/pconfig.h
+++ b/src/lib/netlist/plib/pconfig.h
@@ -88,163 +88,6 @@ typedef __int128_t INT128;
 
 namespace plib {
 
-using ticks_t = int64_t;
-
-static inline ticks_t ticks()
-{
-	return std::chrono::high_resolution_clock::now().time_since_epoch().count();
-}
-static inline ticks_t ticks_per_second()
-{
-	return std::chrono::high_resolution_clock::period::den / std::chrono::high_resolution_clock::period::num;
-}
-
-#if defined(__x86_64__) &&  !defined(_clang__) && !defined(_MSC_VER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6))
-
-
-/* Based on "How to Benchmark Code Execution Times on Intel® IA-32 and IA-64
- * Instruction Set Architectures", Intel, 2010
- *
- */
-#if PUSE_ACCURATE_STATS && PHAS_RDTSCP
-/*
- * kills performance completely, but is accurate
- * cpuid serializes, but clobbers ebx and ecx
- *
- */
-static inline ticks_t profile_ticks_begin()
-{
-    int64_t v;
-    __asm__ __volatile__ (
-    		"cpuid;"
-    		//"xor %%eax, %%eax\n\t"
-    		"rdtsc;"
-    		"shl $32, %%rdx;"
-    		"or %%edx, %%eax;"
-    		: "=a"(v) /* outputs */
-			: "a"(0x0)                /* inputs */
-			: "%ebx", "%ecx", "%rdx"  /* clobbers*/
-    );
-    return v;
-}
-static inline ticks_t profile_ticks_end()
-{
-	int64_t v;
-    __asm__ __volatile__ (
-    		"rdtscp;"
-    		"shl $32, %%rdx;"
-    		"or %%eax, %%edx;"
-    		"mov %%rdx, %%r10;"
-    		"xor %%eax, %%eax\n\t"
-    		"cpuid;"
-    		"mov %%r10, %0;"
-    		: "=r" (v)
-			:
-			:	"%rax", "%ebx", "%ecx", "%rdx", "%r10"
-    );
-    return v;
-}
-#elif PHAS_RDTSCP
-static inline ticks_t profile_ticks_begin()
-{
-    union {
-    	struct {
-    		unsigned lo, hi;
-    	} v32;
-    	int64_t v64;
-    } v;
-    __asm__ __volatile__ (
-    		"rdtscp" : "=a"(v.v32.lo), "=d"(v.v32.hi) /* outputs */
-			   : /*"a"(0)*/             /* inputs */
-			   : "%ecx"     /* clobbers*/
-    );
-    return v.v64;
-}
-static inline ticks_t profile_ticks_end()
-{
-	return profile_ticks_begin();
-}
-#else
-static inline ticks_t profile_ticks_begin()
-{
-    union {
-    	struct {
-    		unsigned lo, hi;
-    	} v32;
-    	int64_t v64;
-    } v;
-    __asm__ __volatile__ (
-    		"rdtsc" : "=a"(v.v32.lo), "=d"(v.v32.hi) /* outputs */
-    );
-    return v.v64;
-}
-static inline ticks_t profile_ticks_end()
-{
-	return profile_ticks_begin();
-}
-#endif
-
-#else
-static inline ticks_t profile_ticks_begin() { return ticks(); }
-static inline ticks_t profile_ticks_end() { return ticks(); }
-#endif
-
-template<bool enabled_>
-struct perfcount_t
-{
-	perfcount_t() : m_count(0) { }
-	typedef uint_least64_t type;
-	type operator()() const { return m_count; }
-	void inc() { ++m_count; }
-	void reset() { m_count = 0; }
-	constexpr static bool enabled = enabled_;
-private:
-	type m_count;
-};
-
-template<>
-struct perfcount_t<false>
-{
-	typedef uint_least64_t type;
-	constexpr type operator()() const { return 0; }
-	void inc() const { }
-	void reset() const { }
-	constexpr static bool enabled = false;
-};
-
-
-template<bool enabled_>
-struct perftime_t
-{
-	perftime_t() : m_time(0), m_count(0) { }
-	typedef ticks_t type;
-	type operator()() const { return m_time; }
-	void begin() { m_time -= profile_ticks_begin(); }
-	void end() { m_time += profile_ticks_end(); ++m_count; }
-	void reset() { m_time = 0; m_count = 0; }
-	type average() const { return (m_count == 0) ? 0 : m_time / m_count; }
-	type total() const { return m_time; }
-	type count() const { return m_count; }
-	constexpr static bool enabled = enabled_;
-private:
-	type m_time;
-	int_least64_t m_count;
-};
-
-template<>
-struct perftime_t<false>
-{
-	typedef ticks_t type;
-	constexpr type operator()() const { return 0; }
-	void begin()  const { }
-	void end() const { }
-	void reset() const { }
-	constexpr type average() const { return 0; }
-	constexpr type total() const { return 0; }
-	constexpr type count() const { return 0; }
-	constexpr static bool enabled = false;
-};
-
 /*
  * 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/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp
index ca87f9fb36d..1fffc921bb4 100644
--- a/src/lib/netlist/prg/nltool.cpp
+++ b/src/lib/netlist/prg/nltool.cpp
@@ -204,7 +204,10 @@ std::vector<input_t> *read_input(netlist::netlist_t *netlist, pstring fname)
 static void run(tool_options_t &opts)
 {
 	netlist_tool_t nt("netlist");
-	plib::ticks_t t = plib::ticks();
+	plib::chrono::timer<plib::chrono::system_ticks> t;
+	//plib::perftime_t<plib::exact_ticks> t;
+
+	t.start();
 
 	nt.m_opts = &opts;
 	nt.init();
@@ -219,10 +222,13 @@ static void run(tool_options_t &opts)
 	std::vector<input_t> *inps = read_input(&nt, opts.opt_inp());
 
 	double ttr = opts.opt_ttr();
+	t.stop();
 
-	pout("startup time ==> {1:5.3f}\n", (double) (plib::ticks() - t) / (double) plib::ticks_per_second() );
+	pout("startup time ==> {1:5.3f}\n", t.as_seconds() );
 	pout("runnning ...\n");
-	t = plib::ticks();
+
+	t.reset();
+	t.start();
 
 	unsigned pos = 0;
 	netlist::netlist_time nlt = netlist::netlist_time::zero();
@@ -238,7 +244,9 @@ static void run(tool_options_t &opts)
 	nt.stop();
 	plib::pfree(inps);
 
-	double emutime = (double) (plib::ticks() - t) / (double) plib::ticks_per_second();
+	t.stop();
+
+	double emutime = t.as_seconds();
 	pout("{1:f} seconds emulation took {2:f} real time ==> {3:5.2f}%\n", ttr, emutime, ttr/emutime*100.0);
 }
 
diff --git a/src/mame/machine/nl_breakout.cpp b/src/mame/machine/nl_breakout.cpp
index 361cdcd940a..5920e8cf1a2 100644
--- a/src/mame/machine/nl_breakout.cpp
+++ b/src/mame/machine/nl_breakout.cpp
@@ -1730,6 +1730,7 @@ CIRCUIT_LAYOUT( breakout )
 	HINT(M8.s1, NO_DEACTIVATE)
 	HINT(N6.sub, NO_DEACTIVATE)
 	HINT(N7.s3, NO_DEACTIVATE)
+
 CIRCUIT_LAYOUT_END
 
 /*

From 14a5f0143e267631d1bced5f35f0851748c2ca2c Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Wed, 22 Jun 2016 23:19:14 +0200
Subject: [PATCH 37/39] Better seperation of setup_t and netlist_t. (nw)

---
 src/devices/machine/netlist.cpp |  2 +-
 src/lib/netlist/nl_base.cpp     | 60 ++++------------------------
 src/lib/netlist/nl_base.h       |  6 ++-
 src/lib/netlist/nl_setup.cpp    | 70 +++++++++++++++++++++++++++------
 src/lib/netlist/nl_setup.h      |  1 -
 5 files changed, 71 insertions(+), 68 deletions(-)

diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp
index 7160b696b52..b924e052e50 100644
--- a/src/devices/machine/netlist.cpp
+++ b/src/devices/machine/netlist.cpp
@@ -103,7 +103,7 @@ void netlist_mame_analog_output_t::custom_netlist_additions(netlist::setup_t &se
 
 	plib::owned_ptr<netlist::device_t> dev = plib::owned_ptr<netlist::device_t>::Create<NETLIB_NAME(analog_callback)>(setup.netlist(), setup.build_fqn(dname));
 	static_cast<NETLIB_NAME(analog_callback) *>(dev.get())->register_callback(m_delegate);
-	setup.register_dev(std::move(dev));
+	setup.netlist().register_dev(std::move(dev));
 	setup.register_link(dname + ".IN", m_in);
 }
 
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index 16f2edaf6e1..e20c240a374 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -217,6 +217,14 @@ nl_double netlist_t::gmin() const
 	return solver()->gmin();
 }
 
+void netlist_t::register_dev(plib::owned_ptr<device_t> dev)
+{
+	for (auto & d : m_devices)
+		if (d->name() == dev->name())
+			log().fatal("Error adding {1} to device list. Duplicate name \n", d->name());
+	m_devices.push_back(std::move(dev));
+}
+
 void netlist_t::start()
 {
 	/* load the library ... */
@@ -225,59 +233,7 @@ void netlist_t::start()
 
 	m_lib = plib::palloc<plib::dynlib>(libpath);
 
-	/* make sure the solver and parameters are started first! */
 
-	for (auto & e : setup().m_device_factory)
-	{
-		if ( setup().factory().is_class<devices::NETLIB_NAME(mainclock)>(e.second)
-				|| setup().factory().is_class<devices::NETLIB_NAME(solver)>(e.second)
-				|| setup().factory().is_class<devices::NETLIB_NAME(gnd)>(e.second)
-				|| setup().factory().is_class<devices::NETLIB_NAME(netlistparams)>(e.second))
-		{
-			auto dev = plib::owned_ptr<device_t>(e.second->Create(*this, e.first));
-			setup().register_dev(std::move(dev));
-		}
-	}
-
-	log().debug("Searching for mainclock and solver ...\n");
-
-	m_mainclock = get_single_device<devices::NETLIB_NAME(mainclock)>("mainclock");
-	m_solver = get_single_device<devices::NETLIB_NAME(solver)>("solver");
-	m_gnd = get_single_device<devices::NETLIB_NAME(gnd)>("gnd");
-	m_params = get_single_device<devices::NETLIB_NAME(netlistparams)>("parameter");
-
-	/* create devices */
-
-	for (auto & e : setup().m_device_factory)
-	{
-		if ( !setup().factory().is_class<devices::NETLIB_NAME(mainclock)>(e.second)
-				&& !setup().factory().is_class<devices::NETLIB_NAME(solver)>(e.second)
-				&& !setup().factory().is_class<devices::NETLIB_NAME(gnd)>(e.second)
-				&& !setup().factory().is_class<devices::NETLIB_NAME(netlistparams)>(e.second))
-		{
-			auto dev = plib::owned_ptr<device_t>(e.second->Create(*this, e.first));
-			setup().register_dev(std::move(dev));
-		}
-	}
-
-	bool use_deactivate = (m_params->m_use_deactivate.Value() ? true : false);
-
-
-	for (auto &d : m_devices)
-	{
-		if (use_deactivate)
-		{
-			auto p = setup().m_param_values.find(d->name() + ".HINT_NO_DEACTIVATE");
-			if (p != setup().m_param_values.end())
-			{
-				//FIXME: Error checking
-				auto v = p->second.as_long();
-				d->set_hint_deactivate(!v);
-			}
-		}
-		else
-			d->set_hint_deactivate(false);
-	}
 }
 
 void netlist_t::stop()
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 5cad1962da5..1451e18038d 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -1066,6 +1066,7 @@ namespace netlist
 
 	class netlist_t : public plib::plog_dispatch_intf
 	{
+		friend class setup_t;
 		P_PREVENT_COPYING(netlist_t)
 	public:
 
@@ -1095,6 +1096,9 @@ namespace netlist
 		void set_setup(setup_t *asetup) { m_setup = asetup;  }
 		setup_t &setup() { return *m_setup; }
 
+
+		void register_dev(plib::owned_ptr<device_t> dev);
+
 		net_t *find_net(const pstring &name);
 
 		template<class device_class>
@@ -1156,7 +1160,7 @@ namespace netlist
 		/* sole use is to manage lifetime of family objects */
 		std::vector<std::pair<pstring, std::unique_ptr<logic_family_desc_t>>> m_family_cache;
 
-protected:
+	protected:
 
 		// performance
 		nperfcount_t m_perf_out_processed;
diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp
index 830d9305327..9de53e2a45f 100644
--- a/src/lib/netlist/nl_setup.cpp
+++ b/src/lib/netlist/nl_setup.cpp
@@ -100,15 +100,6 @@ void setup_t::namespace_pop()
 	m_namespace_stack.pop();
 }
 
-
-void setup_t::register_dev(plib::owned_ptr<device_t> dev)
-{
-	for (auto & d : netlist().m_devices)
-		if (d->name() == dev->name())
-			log().fatal("Error adding {1} to device list. Duplicate name \n", d->name());
-	netlist().m_devices.push_back(std::move(dev));
-}
-
 void setup_t::register_lib_entry(const pstring &name)
 {
 	if (plib::container::contains(m_lib, name))
@@ -454,7 +445,7 @@ devices::nld_base_proxy *setup_t::get_d_a_proxy(core_terminal_t &out)
 
 		proxy = new_proxy.get();
 
-		register_dev(std::move(new_proxy));
+		netlist().register_dev(std::move(new_proxy));
 	}
 	return proxy;
 }
@@ -472,7 +463,7 @@ void setup_t::connect_input_output(core_terminal_t &in, core_terminal_t &out)
 		proxy->m_Q.net().register_con(in);
 		out.net().register_con(proxy->m_I);
 
-		register_dev(std::move(proxy));
+		netlist().register_dev(std::move(proxy));
 
 	}
 	else if (out.is_logic() && in.is_analog())
@@ -515,7 +506,7 @@ void setup_t::connect_terminal_input(terminal_t &term, core_terminal_t &inp)
 		else
 			proxy->m_Q.net().register_con(inp);
 
-		register_dev(std::move(proxy));
+		netlist().register_dev(std::move(proxy));
 	}
 	else
 	{
@@ -782,10 +773,63 @@ void setup_t::start_devices()
 			auto nc = factory().factory_by_name("LOG")->Create(netlist(), name);
 			register_link(name + ".I", ll);
 			log().debug("    dynamic link {1}: <{2}>\n",ll, name);
-			register_dev(std::move(nc));
+			netlist().register_dev(std::move(nc));
 		}
 	}
 
+	/* make sure the solver and parameters are started first! */
+
+	for (auto & e : m_device_factory)
+	{
+		if ( factory().is_class<devices::NETLIB_NAME(mainclock)>(e.second)
+				|| factory().is_class<devices::NETLIB_NAME(solver)>(e.second)
+				|| factory().is_class<devices::NETLIB_NAME(gnd)>(e.second)
+				|| factory().is_class<devices::NETLIB_NAME(netlistparams)>(e.second))
+		{
+			auto dev = plib::owned_ptr<device_t>(e.second->Create(netlist(), e.first));
+			netlist().register_dev(std::move(dev));
+		}
+	}
+
+	log().debug("Searching for mainclock and solver ...\n");
+
+	netlist().m_mainclock = netlist().get_single_device<devices::NETLIB_NAME(mainclock)>("mainclock");
+	netlist().m_solver = netlist().get_single_device<devices::NETLIB_NAME(solver)>("solver");
+	netlist().m_gnd = netlist().get_single_device<devices::NETLIB_NAME(gnd)>("gnd");
+	netlist().m_params = netlist().get_single_device<devices::NETLIB_NAME(netlistparams)>("parameter");
+
+	/* create devices */
+
+	for (auto & e : m_device_factory)
+	{
+		if ( !factory().is_class<devices::NETLIB_NAME(mainclock)>(e.second)
+				&& !factory().is_class<devices::NETLIB_NAME(solver)>(e.second)
+				&& !factory().is_class<devices::NETLIB_NAME(gnd)>(e.second)
+				&& !factory().is_class<devices::NETLIB_NAME(netlistparams)>(e.second))
+		{
+			auto dev = plib::owned_ptr<device_t>(e.second->Create(netlist(), e.first));
+			netlist().register_dev(std::move(dev));
+		}
+	}
+
+	bool use_deactivate = (netlist().m_params->m_use_deactivate.Value() ? true : false);
+
+	for (auto &d : netlist().m_devices)
+	{
+		if (use_deactivate)
+		{
+			auto p = m_param_values.find(d->name() + ".HINT_NO_DEACTIVATE");
+			if (p != m_param_values.end())
+			{
+				//FIXME: Error checking
+				auto v = p->second.as_long();
+				d->set_hint_deactivate(!v);
+			}
+		}
+		else
+			d->set_hint_deactivate(false);
+	}
+
 	netlist().start();
 
 }
diff --git a/src/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h
index ed2e4f3bbe2..71311e20a24 100644
--- a/src/lib/netlist/nl_setup.h
+++ b/src/lib/netlist/nl_setup.h
@@ -185,7 +185,6 @@ namespace netlist
 
 		void register_term(core_terminal_t &obj);
 
-		void register_dev(plib::owned_ptr<device_t> dev);
 		void register_dev(const pstring &classname, const pstring &name);
 
 		void register_lib_entry(const pstring &name);

From badb2a903bcf7887151a3c2d8077799f43a239bd Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Wed, 22 Jun 2016 23:49:15 +0200
Subject: [PATCH 38/39] Shared_ptr ==> unique_ptr. (nw)

---
 src/lib/netlist/plib/putil.h         |  2 +-
 src/lib/netlist/tools/nl_convert.cpp | 23 ++++++++++++-----------
 src/lib/netlist/tools/nl_convert.h   |  8 ++++----
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/lib/netlist/plib/putil.h b/src/lib/netlist/plib/putil.h
index 5f9d1fa4047..e2a247d6cb5 100644
--- a/src/lib/netlist/plib/putil.h
+++ b/src/lib/netlist/plib/putil.h
@@ -51,7 +51,7 @@ namespace plib
 	{
 	    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;
 	};
diff --git a/src/lib/netlist/tools/nl_convert.cpp b/src/lib/netlist/tools/nl_convert.cpp
index 545377cc494..d8a7401018e 100644
--- a/src/lib/netlist/tools/nl_convert.cpp
+++ b/src/lib/netlist/tools/nl_convert.cpp
@@ -18,7 +18,7 @@
 void nl_convert_base_t::add_pin_alias(const pstring &devname, const pstring &name, const pstring &alias)
 {
 	pstring pname = devname + "." + name;
-	m_pins.insert({pname, plib::make_unique<pin_alias_t>(pname, devname + "." + alias)});
+	m_pins.emplace(pname, plib::make_unique<pin_alias_t>(pname, devname + "." + alias));
 }
 
 void nl_convert_base_t::add_ext_alias(const pstring &alias)
@@ -26,7 +26,7 @@ void nl_convert_base_t::add_ext_alias(const pstring &alias)
 	m_ext_alias.push_back(alias);
 }
 
-void nl_convert_base_t::add_device(std::shared_ptr<dev_t> dev)
+void nl_convert_base_t::add_device(std::unique_ptr<dev_t> dev)
 {
 	for (auto & d : m_devs)
 		if (d->name() == dev->name())
@@ -34,20 +34,20 @@ void nl_convert_base_t::add_device(std::shared_ptr<dev_t> dev)
 			out("ERROR: Duplicate device {1} ignored.", dev->name());
 			return;
 		}
-	m_devs.push_back(dev);
+	m_devs.push_back(std::move(dev));
 }
 
 void nl_convert_base_t::add_device(const pstring &atype, const pstring &aname, const pstring &amodel)
 {
-	add_device(std::make_shared<dev_t>(atype, aname, amodel));
+	add_device(plib::make_unique<dev_t>(atype, aname, amodel));
 }
 void nl_convert_base_t::add_device(const pstring &atype, const pstring &aname, double aval)
 {
-	add_device(std::make_shared<dev_t>(atype, aname, aval));
+	add_device(plib::make_unique<dev_t>(atype, aname, aval));
 }
 void nl_convert_base_t::add_device(const pstring &atype, const pstring &aname)
 {
-	add_device(std::make_shared<dev_t>(atype, aname));
+	add_device(plib::make_unique<dev_t>(atype, aname));
 }
 
 void nl_convert_base_t::add_term(pstring netname, pstring termname)
@@ -58,9 +58,9 @@ void nl_convert_base_t::add_term(pstring netname, pstring termname)
 		net = m_nets[netname].get();
 	else
 	{
-		auto nets = std::make_shared<net_t>(netname);
+		auto nets = plib::make_unique<net_t>(netname);
 		net = nets.get();
-		m_nets.insert({netname, nets});
+		m_nets.emplace(netname, std::move(nets));
 	}
 
 	/* if there is a pin alias, translate ... */
@@ -84,10 +84,11 @@ void nl_convert_base_t::dump_nl()
 			net->set_no_export();
 	}
 
-	std::vector<int> sorted;
-	for (unsigned i=0; i < m_devs.size(); i++)
+	std::vector<size_t> sorted;
+	for (size_t i=0; i < m_devs.size(); i++)
 		sorted.push_back(i);
-	std::sort(sorted.begin(), sorted.end(), plib::indexed_compare<std::vector<std::shared_ptr<dev_t>>>(m_devs));
+	std::sort(sorted.begin(), sorted.end(),
+			[&](size_t i1, size_t i2) { return m_devs[i1]->name() < m_devs[i2]->name(); });
 
 	for (std::size_t i=0; i<m_devs.size(); i++)
 	{
diff --git a/src/lib/netlist/tools/nl_convert.h b/src/lib/netlist/tools/nl_convert.h
index a2e0dc99ecb..90bae5533eb 100644
--- a/src/lib/netlist/tools/nl_convert.h
+++ b/src/lib/netlist/tools/nl_convert.h
@@ -126,14 +126,14 @@ private:
 
 private:
 
-	void add_device(std::shared_ptr<dev_t> dev);
+	void add_device(std::unique_ptr<dev_t> dev);
 
 	plib::postringstream m_buf;
 
-	std::vector<std::shared_ptr<dev_t>> m_devs;
-	std::unordered_map<pstring, std::shared_ptr<net_t> > m_nets;
+	std::vector<std::unique_ptr<dev_t>> m_devs;
+	std::unordered_map<pstring, std::unique_ptr<net_t> > m_nets;
 	std::vector<pstring> m_ext_alias;
-	std::unordered_map<pstring, std::shared_ptr<pin_alias_t>> m_pins;
+	std::unordered_map<pstring, std::unique_ptr<pin_alias_t>> m_pins;
 
 	static unit_t m_units[];
 

From 5cb5fe3125deeda066717c206bc7b6736201faff Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@arcor.de>
Date: Thu, 23 Jun 2016 00:53:21 +0200
Subject: [PATCH 39/39] Replaced more shared_ptr by unique_ptr. (nw)

---
 src/devices/machine/netlist.h  | 2 +-
 src/lib/netlist/nl_setup.cpp   | 2 +-
 src/lib/netlist/nl_setup.h     | 9 ++++-----
 src/lib/netlist/plib/putil.h   | 2 +-
 src/lib/netlist/prg/nltool.cpp | 6 ++++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/devices/machine/netlist.h b/src/devices/machine/netlist.h
index 1385267833a..ad2cfdd47d1 100644
--- a/src/devices/machine/netlist.h
+++ b/src/devices/machine/netlist.h
@@ -80,7 +80,7 @@ private:
 };
 
 #define MEMREGION_SOURCE(_name) \
-		setup.register_source(std::make_shared<netlist_source_memregion_t>(_name));
+		setup.register_source(plib::make_unique_base<netlist::source_t, netlist_source_memregion_t>(_name));
 
 #define NETDEV_ANALOG_CALLBACK_MEMBER(_name) \
 	void _name(const double data, const attotime &time)
diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp
index 9de53e2a45f..0582f8a9070 100644
--- a/src/lib/netlist/nl_setup.cpp
+++ b/src/lib/netlist/nl_setup.cpp
@@ -994,7 +994,7 @@ void setup_t::tt_factory_create(tt_desc &desc)
 
 void setup_t::include(const pstring &netlist_name)
 {
-	for (auto source : m_sources)
+	for (auto &source : m_sources)
 	{
 		if (source->parse(*this, netlist_name))
 			return;
diff --git a/src/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h
index 71311e20a24..2fee7210aa9 100644
--- a/src/lib/netlist/nl_setup.h
+++ b/src/lib/netlist/nl_setup.h
@@ -67,7 +67,7 @@ void NETLIST_NAME(name)(netlist::setup_t &setup)                               \
 #define NETLIST_END()  }
 
 #define LOCAL_SOURCE(name)                                                     \
-		setup.register_source(std::make_shared<netlist::source_proc_t>(# name, &NETLIST_NAME(name)));
+		setup.register_source(plib::make_unique_base<netlist::source_t, netlist::source_proc_t>(# name, &NETLIST_NAME(name)));
 
 #define LOCAL_LIB_ENTRY(name)                                                  \
 		LOCAL_SOURCE(name)                                                     \
@@ -150,7 +150,7 @@ namespace netlist
 	class source_t
 	{
 	public:
-		using list_t = std::vector<std::shared_ptr<source_t>>;
+		using list_t = std::vector<std::unique_ptr<source_t>>;
 
 		source_t()
 		{}
@@ -226,10 +226,9 @@ namespace netlist
 
 		/* register a source */
 
-		template <class C>
-		void register_source(std::shared_ptr<C> src)
+		void register_source(std::unique_ptr<source_t> &&src)
 		{
-			m_sources.push_back(std::static_pointer_cast<source_t>(src));
+			m_sources.push_back(std::move(src));
 		}
 
 		factory_list_t &factory() { return m_factory; }
diff --git a/src/lib/netlist/plib/putil.h b/src/lib/netlist/plib/putil.h
index e2a247d6cb5..5f9d1fa4047 100644
--- a/src/lib/netlist/plib/putil.h
+++ b/src/lib/netlist/plib/putil.h
@@ -51,7 +51,7 @@ namespace plib
 	{
 	    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;
 	};
diff --git a/src/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp
index 1fffc921bb4..8d753e212c6 100644
--- a/src/lib/netlist/prg/nltool.cpp
+++ b/src/lib/netlist/prg/nltool.cpp
@@ -94,7 +94,8 @@ public:
 	{
 		// read the netlist ...
 
-		m_setup->register_source(std::make_shared<netlist::source_file_t>(filename));
+		m_setup->register_source(plib::make_unique_base<netlist::source_t,
+				netlist::source_file_t>(filename));
 		m_setup->include(name);
 		log_setup();
 
@@ -278,7 +279,8 @@ static void listdevices()
 	nt.init();
 	netlist::factory_list_t &list = nt.setup().factory();
 
-	nt.setup().register_source(std::make_shared<netlist::source_proc_t>("dummy", &netlist_dummy));
+	nt.setup().register_source(plib::make_unique_base<netlist::source_t,
+			netlist::source_proc_t>("dummy", &netlist_dummy));
 	nt.setup().include("dummy");
 
 	nt.setup().start_devices();