Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-08 09:30:17 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

netlist: fix pedantic clang warnings. (nw)

Browse Source
This commit is contained in:
couriersud 2019-05-01 23:29:43 +02:00
parent c14db5e7ab
commit 20f355bfe1
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/netlist/devices/nld_9316.cpp
View File

@ -68,7 +68,7 @@ namespace netlist
NETLIB_HANDLERI(clk) NETLIB_HANDLERI(clk)
{ {
auto cnt = (m_loadq ? m_cnt + 1 : m_abcd) & MAXCNT; auto cnt = (m_loadq ? (m_cnt + 1) & MAXCNT: m_abcd);
m_RC.push(m_ent && (cnt == MAXCNT), NLTIME_FROM_NS(27)); m_RC.push(m_ent && (cnt == MAXCNT), NLTIME_FROM_NS(27));
update_outputs_all(cnt, NLTIME_FROM_NS(20)); update_outputs_all(cnt, NLTIME_FROM_NS(20));
m_cnt = cnt; m_cnt = cnt;
@ -76,7 +76,7 @@ namespace netlist
NETLIB_HANDLERI(abcd) NETLIB_HANDLERI(abcd)
{ {
m_abcd = static_cast<uint8_t>((m_ABCD[0]() << 0) | (m_ABCD[1]() << 1) | (m_ABCD[2]() << 2) | (m_ABCD[3]() << 3)); m_abcd = static_cast<unsigned>((m_ABCD[0]() << 0) | (m_ABCD[1]() << 1) | (m_ABCD[2]() << 2) | (m_ABCD[3]() << 3));
} }
logic_input_t m_CLK; logic_input_t m_CLK;
@ -93,14 +93,14 @@ namespace netlist
object_array_t<logic_output_t, 4> m_Q; object_array_t<logic_output_t, 4> m_Q;
/* counter state */ /* counter state */
state_var<uint8_t> m_cnt; state_var<unsigned> m_cnt;
/* cached pins */ /* cached pins */
state_var_u8 m_abcd; state_var<unsigned> m_abcd;
state_var_sig m_loadq; state_var_sig m_loadq;
state_var_sig m_ent; state_var_sig m_ent;
nld_power_pins m_power_pins; nld_power_pins m_power_pins;
void update_outputs_all(uint8_t cnt, netlist_time out_delay) noexcept void update_outputs_all(unsigned cnt, netlist_time out_delay) noexcept
{ {
m_Q[0].push((cnt >> 0) & 1, out_delay); m_Q[0].push((cnt >> 0) & 1, out_delay);
m_Q[1].push((cnt >> 1) & 1, out_delay); m_Q[1].push((cnt >> 1) & 1, out_delay);

3
src/lib/netlist/nl_base.cpp
View File

@ -477,7 +477,8 @@ void netlist_t::print_stats() const
log().verbose("Total time {1:15}", total_time); log().verbose("Total time {1:15}", total_time);
// FIXME: clang complains about unreachable code without // FIXME: clang complains about unreachable code without
if (USE_QUEUE_STATS || (USE_QUEUE_STATS && m_stats)) const auto dummy = USE_QUEUE_STATS;
if (dummy)
{ {
/* Only one serialization should be counted in total time */ /* Only one serialization should be counted in total time */
/* But two are contained in m_stat_mainloop */ /* But two are contained in m_stat_mainloop */