luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some minor cleanup found with the latest cppcheck 

Remove an unused variable (desired_vector_width) in elaborate.cc.
Reduce the scope of spin to make it obvious it is only used locally
in elaborate.cc. Initialize sel_type_ in the NetAssign_ constructor
(net_assign.cc). The code doesn't currently require this since
sel_type_ is only used when the base is not zero and it is always
defined when base is not zero, but giving this a default value in
the constructor hedges against accidentally using an undefined
value if someone checks the select type when the base is zero.
This commit is contained in:
Cary R 2011-06-23 10:36:26 -07:00 committed by Stephen Williams
parent bc8704e47d
commit 019df7c7bf
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
elaborate.cc
View File

@ -1366,10 +1366,6 @@ void PGModule::elaborate_mod_(Design*des, Module*rmod, NetScope*scope) const
// even multiple of the instance count. // even multiple of the instance count.
assert(prts_vector_width % instance.size() == 0); assert(prts_vector_width % instance.size() == 0);
unsigned desired_vector_width = prts_vector_width;
if (instance.size() != 1)
desired_vector_width = 0;
if (!prts.empty() && (prts[0]->port_type() == NetNet::PINPUT) if (!prts.empty() && (prts[0]->port_type() == NetNet::PINPUT)
&& prts[0]->pin(0).nexus()->drivers_present() && prts[0]->pin(0).nexus()->drivers_present()
&& pins[idx]->is_collapsible_net(des, scope)) { && pins[idx]->is_collapsible_net(des, scope)) {
@ -1705,7 +1701,6 @@ void PGModule::elaborate_mod_(Design*des, Module*rmod, NetScope*scope) const
// an array of signals to be connected to the sig. // an array of signals to be connected to the sig.
NetConcat*ctmp; NetConcat*ctmp;
unsigned spin = 0;
if (prts.size() == 1) { if (prts.size() == 1) {
@ -1755,7 +1750,8 @@ void PGModule::elaborate_mod_(Design*des, Module*rmod, NetScope*scope) const
<< (idx+1) << "." << endl; << (idx+1) << "." << endl;
} }
for (unsigned ldx = 0 ; ldx < prts.size() ; ldx += 1) { for (unsigned ldx = 0, spin = 0 ;
ldx < prts.size() ; ldx += 1) {
NetNet*sp = prts[prts.size()-ldx-1]; NetNet*sp = prts[prts.size()-ldx-1];
NetPartSelect*ptmp = new NetPartSelect(sig, spin, NetPartSelect*ptmp = new NetPartSelect(sig, spin,
sp->vector_width(), sp->vector_width(),
@ -1768,7 +1764,8 @@ void PGModule::elaborate_mod_(Design*des, Module*rmod, NetScope*scope) const
break; break;
case NetNet::PINOUT: case NetNet::PINOUT:
for (unsigned ldx = 0 ; ldx < prts.size() ; ldx += 1) { for (unsigned ldx = 0, spin = 0 ;
ldx < prts.size() ; ldx += 1) {
NetNet*sp = prts[prts.size()-ldx-1]; NetNet*sp = prts[prts.size()-ldx-1];
NetTran*ttmp = new NetTran(scope, NetTran*ttmp = new NetTran(scope,
scope->local_symbol(), scope->local_symbol(),

4
net_assign.cc
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2000-2010 Stephen Williams (steve@icarus.com) * Copyright (c) 2000-2011 Stephen Williams (steve@icarus.com)
* *
* This source code is free software; you can redistribute it * This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU * and/or modify it in source code form under the terms of the GNU
@ -36,7 +36,7 @@ unsigned count_lval_width(const NetAssign_*idx)
} }
NetAssign_::NetAssign_(NetNet*s) NetAssign_::NetAssign_(NetNet*s)
: sig_(s), word_(0), base_(0) : sig_(s), word_(0), base_(0), sel_type_(IVL_SEL_OTHER)
{ {
lwid_ = sig_->vector_width(); lwid_ = sig_->vector_width();
sig_->incr_lref(); sig_->incr_lref();