summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author couriersud <couriersud@gmx.org>2019-09-28 12:51:42 +0200
committer couriersud <couriersud@gmx.org>2019-09-28 12:51:42 +0200
commit1077396473a9b401c0dd8ea1407535b3717099db (patch)
tree15e740076017ed943f4bde063e66bbd35d8e2d72
parent29eac3a3156514ad25414e7d9725323a23cbb27b (diff)
netlist: Fix more lint warnings/hints (nw)
-rw-r--r--src/lib/netlist/devices/net_lib.cpp1
-rw-r--r--src/lib/netlist/devices/nld_74107.cpp6
-rw-r--r--src/lib/netlist/devices/nld_74153.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74175.cpp4
-rw-r--r--src/lib/netlist/devices/nld_74192.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74193.cpp2
-rw-r--r--src/lib/netlist/devices/nld_7450.cpp5
-rw-r--r--src/lib/netlist/devices/nld_7490.cpp2
-rw-r--r--src/lib/netlist/devices/nld_7497.cpp4
-rw-r--r--src/lib/netlist/plib/pparser.cpp2
-rw-r--r--src/lib/netlist/plib/pparser.h12
-rw-r--r--src/lib/netlist/plib/ppmf.h5
-rw-r--r--src/lib/netlist/plib/pstream.h6
-rw-r--r--src/lib/netlist/plib/putil.h2
-rw-r--r--src/lib/netlist/prg/nltool.cpp4
-rw-r--r--src/lib/netlist/prg/nlwav.cpp10
16 files changed, 35 insertions, 34 deletions
diff --git a/src/lib/netlist/devices/net_lib.cpp b/src/lib/netlist/devices/net_lib.cpp
index 4fe03f81534..1e2ff8aae09 100644
--- a/src/lib/netlist/devices/net_lib.cpp
+++ b/src/lib/netlist/devices/net_lib.cpp
@@ -16,7 +16,6 @@
#define xstr(s) # s
#define NETLIB_DEVICE_DECL(chip) extern factory::constructor_ptr_t decl_ ## chip
-
#define LIB_DECL(nic, decl) factory.register_device( decl ( pstring(xstr(nic))) );
#define LIB_ENTRY(nic) { NETLIB_DEVICE_DECL(nic); LIB_DECL(NETLIB_NAME(nic), decl_ ## nic) }
diff --git a/src/lib/netlist/devices/nld_74107.cpp b/src/lib/netlist/devices/nld_74107.cpp
index 8bc6ca4bc7a..c0978cb0128 100644
--- a/src/lib/netlist/devices/nld_74107.cpp
+++ b/src/lib/netlist/devices/nld_74107.cpp
@@ -14,8 +14,8 @@ namespace netlist
namespace devices
{
- static constexpr const netlist_time delay_107[2] = { NLTIME_FROM_NS(16), NLTIME_FROM_NS(25) };
- static constexpr const netlist_time delay_107A[2] = { NLTIME_FROM_NS(15), NLTIME_FROM_NS(15) };
+ static constexpr const std::array<netlist_time, 2> delay_107 = { NLTIME_FROM_NS(16), NLTIME_FROM_NS(25) };
+ static constexpr const std::array<netlist_time, 2> delay_107A = { NLTIME_FROM_NS(15), NLTIME_FROM_NS(15) };
NETLIB_OBJECT(74107A)
{
@@ -46,7 +46,7 @@ namespace netlist
logic_output_t m_Q;
logic_output_t m_QQ;
- netlist_time m_delay[2];
+ std::array<netlist_time, 2> m_delay;
logic_input_t m_J;
logic_input_t m_K;
diff --git a/src/lib/netlist/devices/nld_74153.cpp b/src/lib/netlist/devices/nld_74153.cpp
index ce2e25cb3f3..3944116bde9 100644
--- a/src/lib/netlist/devices/nld_74153.cpp
+++ b/src/lib/netlist/devices/nld_74153.cpp
@@ -45,7 +45,7 @@ namespace devices
NETLIB_HANDLERI(sub)
{
- constexpr const netlist_time delay[2] = { NLTIME_FROM_NS(23), NLTIME_FROM_NS(18) };
+ constexpr const std::array<netlist_time, 2> delay = { NLTIME_FROM_NS(23), NLTIME_FROM_NS(18) };
if (!m_G())
{
auto t = m_C[m_chan]();
diff --git a/src/lib/netlist/devices/nld_74175.cpp b/src/lib/netlist/devices/nld_74175.cpp
index 145c5887476..a6236d3f1aa 100644
--- a/src/lib/netlist/devices/nld_74175.cpp
+++ b/src/lib/netlist/devices/nld_74175.cpp
@@ -71,8 +71,8 @@ namespace netlist
}
};
- constexpr const netlist_time delay[2] = { NLTIME_FROM_NS(25), NLTIME_FROM_NS(25) };
- constexpr const netlist_time delay_clear[2] = { NLTIME_FROM_NS(40), NLTIME_FROM_NS(25) };
+ constexpr const std::array<netlist_time, 2> delay = { NLTIME_FROM_NS(25), NLTIME_FROM_NS(25) };
+ constexpr const std::array<netlist_time, 2> delay_clear = { NLTIME_FROM_NS(40), NLTIME_FROM_NS(25) };
NETLIB_HANDLER(74175, clk)
{
diff --git a/src/lib/netlist/devices/nld_74192.cpp b/src/lib/netlist/devices/nld_74192.cpp
index bedc045164d..1c87dc50810 100644
--- a/src/lib/netlist/devices/nld_74192.cpp
+++ b/src/lib/netlist/devices/nld_74192.cpp
@@ -104,7 +104,7 @@ namespace netlist
}
// FIXME: Timing
- static constexpr const netlist_time delay[4] =
+ static constexpr const std::array<netlist_time, 4> delay =
{
NLTIME_FROM_NS(40),
NLTIME_FROM_NS(40),
diff --git a/src/lib/netlist/devices/nld_74193.cpp b/src/lib/netlist/devices/nld_74193.cpp
index 5e919a78a9a..01d6f11108c 100644
--- a/src/lib/netlist/devices/nld_74193.cpp
+++ b/src/lib/netlist/devices/nld_74193.cpp
@@ -91,7 +91,7 @@ namespace netlist
}
// FIXME: Timing
- static constexpr const netlist_time delay[4] =
+ static constexpr const std::array<netlist_time, 4> delay =
{
NLTIME_FROM_NS(40),
NLTIME_FROM_NS(40),
diff --git a/src/lib/netlist/devices/nld_7450.cpp b/src/lib/netlist/devices/nld_7450.cpp
index 818dad40853..8187af87122 100644
--- a/src/lib/netlist/devices/nld_7450.cpp
+++ b/src/lib/netlist/devices/nld_7450.cpp
@@ -13,6 +13,9 @@ namespace netlist
{
namespace devices
{
+
+ static constexpr const std::array<netlist_time, 2> times = { NLTIME_FROM_NS(15), NLTIME_FROM_NS(22) };
+
NETLIB_OBJECT(7450)
{
NETLIB_CONSTRUCTOR(7450)
@@ -78,8 +81,6 @@ namespace netlist
auto t1 = m_A() & m_B();
auto t2 = m_C() & m_D();
- const netlist_time times[2] = { NLTIME_FROM_NS(15), NLTIME_FROM_NS(22) };
-
uint_fast8_t res = 0;
if (t1 ^ 1)
{
diff --git a/src/lib/netlist/devices/nld_7490.cpp b/src/lib/netlist/devices/nld_7490.cpp
index 3bd06a58a3a..157563f5f0c 100644
--- a/src/lib/netlist/devices/nld_7490.cpp
+++ b/src/lib/netlist/devices/nld_7490.cpp
@@ -81,7 +81,7 @@ namespace netlist
m_last_B = 0;
}
- static constexpr const netlist_time delay[4] =
+ static constexpr const std::array<netlist_time, 4> delay =
{
NLTIME_FROM_NS(18),
NLTIME_FROM_NS(36) - NLTIME_FROM_NS(18),
diff --git a/src/lib/netlist/devices/nld_7497.cpp b/src/lib/netlist/devices/nld_7497.cpp
index e9ac7833191..2c54d63bf09 100644
--- a/src/lib/netlist/devices/nld_7497.cpp
+++ b/src/lib/netlist/devices/nld_7497.cpp
@@ -18,8 +18,8 @@ namespace netlist
namespace devices
{
- static constexpr const netlist_time out_delay_CLK_Y[2] = { NLTIME_FROM_NS(20), NLTIME_FROM_NS(26) }; // tPHL, tPLH
- static constexpr const netlist_time out_delay_CLK_Z[2] = { NLTIME_FROM_NS(17), NLTIME_FROM_NS(12) };
+ static constexpr const std::array<netlist_time, 2> out_delay_CLK_Y = { NLTIME_FROM_NS(20), NLTIME_FROM_NS(26) }; // tPHL, tPLH
+ static constexpr const std::array<netlist_time, 2> out_delay_CLK_Z = { NLTIME_FROM_NS(17), NLTIME_FROM_NS(12) };
NETLIB_OBJECT(7497)
{
diff --git a/src/lib/netlist/plib/pparser.cpp b/src/lib/netlist/plib/pparser.cpp
index e567fc6e5be..2ab2925b57f 100644
--- a/src/lib/netlist/plib/pparser.cpp
+++ b/src/lib/netlist/plib/pparser.cpp
@@ -258,7 +258,7 @@ ptokenizer::token_t ptokenizer::get_token_internal()
// ----------------------------------------------------------------------------------------
ppreprocessor::ppreprocessor(defines_map_type *defines)
-: std::istream(new st(this))
+: std::istream(new readbuffer(this))
, m_ifflag(0)
, m_level(0)
, m_lineno(0)
diff --git a/src/lib/netlist/plib/pparser.h b/src/lib/netlist/plib/pparser.h
index 8949cf875d6..8a9c12d69df 100644
--- a/src/lib/netlist/plib/pparser.h
+++ b/src/lib/netlist/plib/pparser.h
@@ -197,9 +197,8 @@ public:
COPYASSIGN(ppreprocessor, delete)
ppreprocessor &operator=(ppreprocessor &&src) = delete;
-
ppreprocessor(ppreprocessor &&s) noexcept
- : std::istream(new st(this))
+ : std::istream(new readbuffer(this))
, m_defines(std::move(s.m_defines))
, m_expr_sep(std::move(s.m_expr_sep))
, m_ifflag(s.m_ifflag)
@@ -214,11 +213,14 @@ public:
protected:
- class st : public std::streambuf
+ class readbuffer : public std::streambuf
{
public:
- st(ppreprocessor *strm) : m_strm(strm), m_buf() { setg(nullptr, nullptr, nullptr); }
- st(st &&rhs) noexcept : m_strm(rhs.m_strm), m_buf() {}
+ readbuffer(ppreprocessor *strm) : m_strm(strm), m_buf() { setg(nullptr, nullptr, nullptr); }
+ readbuffer(readbuffer &&rhs) noexcept : m_strm(rhs.m_strm), m_buf() {}
+ COPYASSIGN(readbuffer, delete)
+ readbuffer &operator=(readbuffer &&src) = delete;
+
int_type underflow() override
{
//printf("here\n");
diff --git a/src/lib/netlist/plib/ppmf.h b/src/lib/netlist/plib/ppmf.h
index 9ee759befa4..4cc301f6d7f 100644
--- a/src/lib/netlist/plib/ppmf.h
+++ b/src/lib/netlist/plib/ppmf.h
@@ -69,9 +69,8 @@ namespace plib {
using generic_function = void (*)();
template<typename MemberFunctionType>
- mfp(MemberFunctionType mftp) // NOLINT(cppcoreguidelines-pro-type-member-init)
-
- : m_function(0), m_this_delta(0), m_size(sizeof(mfp))
+ mfp(MemberFunctionType mftp) // XXNOLINT(cppcoreguidelines-pro-type-member-init)
+ : m_function(0), m_this_delta(0), m_dummy1(0), m_dummy2(0), m_size(sizeof(mfp))
{
*reinterpret_cast<MemberFunctionType *>(this) = mftp;
}
diff --git a/src/lib/netlist/plib/pstream.h b/src/lib/netlist/plib/pstream.h
index 27d157fbb1e..b403f441045 100644
--- a/src/lib/netlist/plib/pstream.h
+++ b/src/lib/netlist/plib/pstream.h
@@ -15,12 +15,12 @@
#include "pstring.h"
#include <array>
-#include <type_traits>
-#include <vector>
-#include <ios>
#include <fstream>
+#include <ios>
#include <iostream>
#include <sstream>
+#include <type_traits>
+#include <vector>
namespace plib {
diff --git a/src/lib/netlist/plib/putil.h b/src/lib/netlist/plib/putil.h
index e3dce29cdd8..f8cc634df66 100644
--- a/src/lib/netlist/plib/putil.h
+++ b/src/lib/netlist/plib/putil.h
@@ -12,10 +12,10 @@
#include "pstring.h"
#include <algorithm>
#include <initializer_list>
+#include <iostream>
#include <locale>
#include <sstream>
#include <vector>
-#include <iostream>
#define PSTRINGIFY_HELP(y) # y
#define PSTRINGIFY(x) PSTRINGIFY_HELP(x)
diff --git a/src/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp
index 1c5256654b1..f0d819888a2 100644
--- a/src/lib/netlist/prg/nltool.cpp
+++ b/src/lib/netlist/prg/nltool.cpp
@@ -10,16 +10,16 @@
#include "netlist/plib/pmain.h"
#include "netlist/devices/net_lib.h"
-#include "netlist/nl_parser.h"
#include "netlist/nl_errstr.h"
+#include "netlist/nl_parser.h"
#include "netlist/nl_setup.h"
#include "netlist/solver/nld_solver.h"
#include "netlist/tools/nl_convert.h"
#include <cstdio> // scanf
#include <iomanip> // scanf
-#include <iostream> // scanf
#include <ios>
+#include <iostream> // scanf
#define NLTOOL_VERSION 20190420
diff --git a/src/lib/netlist/prg/nlwav.cpp b/src/lib/netlist/prg/nlwav.cpp
index a2f16adc922..db55290d618 100644
--- a/src/lib/netlist/prg/nlwav.cpp
+++ b/src/lib/netlist/prg/nlwav.cpp
@@ -75,9 +75,9 @@ public:
private:
struct riff_chunk_t
{
- uint8_t group_id[4] = {'R','I','F','F'};
- uint32_t filelen = 0;
- uint8_t rifftype[4] = {'W','A','V','E'};
+ std::array<uint8_t, 4> group_id = {'R','I','F','F'};
+ uint32_t filelen = 0;
+ std::array<uint8_t, 4> rifftype = {'W','A','V','E'};
};
struct riff_format_t
@@ -89,7 +89,7 @@ private:
block_align = channels * ((bits_sample + 7) / 8);
bytes_per_second = sample_rate * block_align;
}
- uint8_t signature[4] = {'f','m','t',' '};
+ std::array<uint8_t, 4> signature = {'f','m','t',' '};
uint32_t fmt_length = 16;
uint16_t format_tag = 0x0001; // PCM
uint16_t channels;
@@ -102,7 +102,7 @@ private:
struct riff_data_t
{
riff_data_t(uint32_t alen) : len(alen) {}
- uint8_t signature[4] = {'d','a','t','a'};
+ std::array<uint8_t, 4> signature = {'d','a','t','a'};
uint32_t len;
// data follows
};