diff options
| author | 2015-08-26 08:10:34 +0200 | |
|---|---|---|
| committer | 2015-08-26 08:10:34 +0200 | |
| commit | efa3a679a331ea91002a0bc72e49a230ff2a2f67 (patch) | |
| tree | 9de472bbb6862733d1982607326783d65be9c414 /src/emu/netlist | |
| parent | bc5ffe493777e55f081d3ba29b8b298da90ae776 (diff) | |
Cleanups and version bumpmame0165
Diffstat (limited to 'src/emu/netlist')
| -rw-r--r-- | src/emu/netlist/nl_base.c | 1 | ||||
| -rw-r--r-- | src/emu/netlist/nl_base.h | 4 | ||||
| -rw-r--r-- | src/emu/netlist/plib/pconfig.h | 2 | ||||
| -rw-r--r-- | src/emu/netlist/plib/pstream.c | 1 | ||||
| -rw-r--r-- | src/emu/netlist/plib/pstring.c | 1 | ||||
| -rw-r--r-- | src/emu/netlist/plib/pstring.h | 14 | ||||
| -rw-r--r-- | src/emu/netlist/prg/nltool.c | 8 | ||||
| -rw-r--r-- | src/emu/netlist/prg/nlwav.c | 2 | ||||
| -rw-r--r-- | src/emu/netlist/solver/nld_ms_direct.h | 2 | ||||
| -rw-r--r-- | src/emu/netlist/solver/nld_ms_direct_lu.h | 5 |
10 files changed, 18 insertions, 22 deletions
diff --git a/src/emu/netlist/nl_base.c b/src/emu/netlist/nl_base.c index 31fc8983d6c..6c1dab54289 100644 --- a/src/emu/netlist/nl_base.c +++ b/src/emu/netlist/nl_base.c @@ -19,7 +19,6 @@ const netlist::netlist_time netlist::netlist_time::zero = netlist::netlist_time: namespace netlist { - // ---------------------------------------------------------------------------------------- // logic_family_ttl_t // ---------------------------------------------------------------------------------------- diff --git a/src/emu/netlist/nl_base.h b/src/emu/netlist/nl_base.h index 9e4b90df9ba..fff31602e6a 100644 --- a/src/emu/netlist/nl_base.h +++ b/src/emu/netlist/nl_base.h @@ -1238,7 +1238,7 @@ namespace netlist protected: // any derived netlist must override vlog inherited from plog_base - // virtual void vlog(const plog_level &l, const pstring &ls) = 0; + // virtual void vlog(const plog_level &l, const pstring &ls) = 0; /* from netlist_object */ virtual void reset(); @@ -1256,7 +1256,7 @@ namespace netlist netlist_time m_time; bool m_use_deactivate; - queue_t m_queue; + queue_t m_queue; devices::NETLIB_NAME(mainclock) * m_mainclock; diff --git a/src/emu/netlist/plib/pconfig.h b/src/emu/netlist/plib/pconfig.h index cb7c7111cd2..cfa622c9118 100644 --- a/src/emu/netlist/plib/pconfig.h +++ b/src/emu/netlist/plib/pconfig.h @@ -101,7 +101,7 @@ typedef __int128_t INT128; #define ATTR_HOT __attribute__((hot)) #define ATTR_COLD __attribute__((cold)) -#define RESTRICT __restrict__ +#define RESTRICT __restrict__ #define EXPECTED(x) (x) #define UNEXPECTED(x) (x) #define ATTR_PRINTF(x,y) __attribute__((format(printf, x, y))) diff --git a/src/emu/netlist/plib/pstream.c b/src/emu/netlist/plib/pstream.c index 07ef55730da..ae2f5b580a1 100644 --- a/src/emu/netlist/plib/pstream.c +++ b/src/emu/netlist/plib/pstream.c @@ -264,4 +264,3 @@ pstream::pos_type pomemstream::vtell() { return m_pos; } - diff --git a/src/emu/netlist/plib/pstring.c b/src/emu/netlist/plib/pstring.c index 00f075d299d..46346f637db 100644 --- a/src/emu/netlist/plib/pstring.c +++ b/src/emu/netlist/plib/pstring.c @@ -600,4 +600,3 @@ void pfmt::format_element(const char *f, const char *l, const char *fmt_spec, . template struct pstring_t<pu8_traits>; template struct pstring_t<putf8_traits>; - diff --git a/src/emu/netlist/plib/pstring.h b/src/emu/netlist/plib/pstring.h index ecd4dd4907e..9cc67327838 100644 --- a/src/emu/netlist/plib/pstring.h +++ b/src/emu/netlist/plib/pstring.h @@ -241,7 +241,7 @@ struct putf8_traits return 2; else if (c < 0x10000) return 3; - else /* U+10000 U+1FFFFF */ + else /* U+10000 U+1FFFFF */ return 4; /* no checks */ } static code_t code(const mem_t *p) @@ -276,7 +276,7 @@ struct putf8_traits m[1] = 0x80 | ((c>>6) & 0x3f); m[2] = 0x80 | (c & 0x3f); } - else /* U+10000 U+1FFFFF */ + else /* U+10000 U+1FFFFF */ { m[0] = 0xF0 | (c >> 18); m[1] = 0x80 | ((c>>12) & 0x3f); @@ -622,11 +622,11 @@ public: plog_base(plog_dispatch_intf *proxy) : debug(proxy), - info(proxy), - verbose(proxy), - warning(proxy), - error(proxy), - fatal(proxy) + info(proxy), + verbose(proxy), + warning(proxy), + error(proxy), + fatal(proxy) {} virtual ~plog_base() {}; diff --git a/src/emu/netlist/prg/nltool.c b/src/emu/netlist/prg/nltool.c index 9568ff0bfc0..1951ec7468f 100644 --- a/src/emu/netlist/prg/nltool.c +++ b/src/emu/netlist/prg/nltool.c @@ -30,7 +30,7 @@ #include <ctime> -#define osd_ticks_t clock_t +#define osd_ticks_t clock_t inline osd_ticks_t osd_ticks_per_second() { return CLOCKS_PER_SEC; } @@ -98,12 +98,12 @@ class tool_options_t : public poptions public: tool_options_t() : poptions(), - opt_ttr ("t", "time_to_run", 1.0, "time to run the emulation (seconds)", this), + 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", this), + opt_cmd ("c", "cmd", "run", "run|convert|listdevices", 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), @@ -113,7 +113,7 @@ public: poption_double opt_ttr; poption_str opt_name; poption_str opt_logs; - poption_str opt_file; + poption_str opt_file; poption_str_limit opt_type; poption_str opt_cmd; poption_str opt_inp; diff --git a/src/emu/netlist/prg/nlwav.c b/src/emu/netlist/prg/nlwav.c index 8f9c57c7ac5..681b0e6d79e 100644 --- a/src/emu/netlist/prg/nlwav.c +++ b/src/emu/netlist/prg/nlwav.c @@ -49,7 +49,7 @@ class wav_t public: wav_t(postream &strm, unsigned sr) : m_f(strm) { -// m_f = strm; +// m_f = strm; initialize(sr); m_f.write(&m_fh, sizeof(m_fh)); m_f.write(&m_fmt, sizeof(m_fmt)); diff --git a/src/emu/netlist/solver/nld_ms_direct.h b/src/emu/netlist/solver/nld_ms_direct.h index d05480b2715..9116f92d53f 100644 --- a/src/emu/netlist/solver/nld_ms_direct.h +++ b/src/emu/netlist/solver/nld_ms_direct.h @@ -488,7 +488,7 @@ ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::LE_back_subst_full( // ii=-1 //for (int i=0; i < kN; i++) - // x[i] = m_RHS[i]; + // x[i] = m_RHS[i]; for (int i=0; i < kN; i++) { diff --git a/src/emu/netlist/solver/nld_ms_direct_lu.h b/src/emu/netlist/solver/nld_ms_direct_lu.h index 633e135cbe4..5d7587c0ef1 100644 --- a/src/emu/netlist/solver/nld_ms_direct_lu.h +++ b/src/emu/netlist/solver/nld_ms_direct_lu.h @@ -429,7 +429,6 @@ ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::build_LE_RHS(nl_double * template <unsigned m_N, unsigned _storage_N> ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::LE_solve() { - const unsigned kN = N(); ATTR_UNUSED int imax; @@ -501,7 +500,7 @@ ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::LE_solve() indx[j]=imax; #endif //if (m_A[j][j] == 0.0) - // m_A[j][j] = 1e-20; + // m_A[j][j] = 1e-20; double dum = 1.0 / A(j,j); for (int i = j+1; i < kN; i++) A(i,j) *= dum; @@ -521,7 +520,7 @@ ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::LE_back_subst( // ii=-1 //for (int i=0; i < kN; i++) - // x[i] = m_RHS[i]; + // x[i] = m_RHS[i]; for (int i=0; i < kN; i++) { |
