cppcheck updates

Author: caryr

PExpr.cc

@@ -382,13 +382,11 @@ PEIdent::~PEIdent()
 
 static bool find_enum_constant(LexicalScope*scope, perm_string name)
 {
-      for (vector<enum_type_t*>::const_iterator cur = scope->enum_sets.begin() ;
-           cur != scope->enum_sets.end() ; ++ cur) {
-	    for (list<named_pexpr_t>::const_iterator idx = (*cur)->names->begin() ;
-                 idx != (*cur)->names->end() ; ++ idx) {
-                  if (idx->name == name) return true;
-            }
-      }
+      std::any_of(scope->enum_sets.cbegin(), scope->enum_sets.cend(),
+                  [name](const enum_type_t *cur) {
+	    return std::any_of(cur->names->cbegin(), cur->names->cend(),
+	                       [name](const named_pexpr_t idx){return idx.name == name;});
+      });
       return false;
 }
 

PGate.h

@@ -131,7 +131,6 @@ class PGAssign  : public PGate {
 
       void dump(std::ostream&out, unsigned ind =4) const override;
       virtual void elaborate(Design*des, NetScope*scope) const override;
-      virtual bool elaborate_sig(Design*des, NetScope*scope) const override;
 
     private:
       void elaborate_unpacked_array_(Design*des, NetScope*scope, NetNet*lval) const;
@@ -170,7 +169,6 @@ class PGBuiltin  : public PGate {
 
       virtual void dump(std::ostream&out, unsigned ind =4) const override;
       virtual void elaborate(Design*, NetScope*scope) const override;
-      virtual bool elaborate_sig(Design*des, NetScope*scope) const override;
 
     private:
       void calculate_gate_and_lval_count_(unsigned&gate_count,

async.cc

@@ -28,11 +28,6 @@ bool NetAssign::is_asynchronous()
       return true;
 }
 
-bool NetCondit::is_asynchronous()
-{
-      return false;
-}
-
 /*
  * NetEvWait statements come from statements of the form @(...) in the
  * Verilog source. These event waits are considered asynchronous if

cppcheck.sup

@@ -1,11 +1,17 @@
 // These are correct and are used to find the base (zero) pin.
-thisSubtraction:netlist.h:5311
-thisSubtraction:netlist.h:5320
+thisSubtraction:netlist.h:5310
+thisSubtraction:netlist.h:5319
 
 // This is used when running a debugger
 // debugger_release
 knownConditionTrueFalse:main.cc:931
 
+// Yes, it's a duplicate
+duplicateCondition:elaborate.cc:7672
+
+// To complicated to use std::find_if()
+useStlAlgorithm:map_named_args.cc:38
+
 // This are just stubs
 // vpi_control()
 unusedFunction:vpi_modules.cc:109
@@ -685,9 +691,15 @@ unusedFunction:t-dll.cc:2368
 // is_before()
 unusedFunction:verinum.cc:592
 
-// Errors in the generated yacc and lex files
+// Errors/limitations in the generated yacc and lex files
+constVariablePointer:<stdout>
 cstyleCast:<stdout>
+nullPointer:<stdout>
+redundantInitialization:<stdout>
 syntaxError:<stdout>
 unusedFunction:<stdout>
 duplicateBreak:lexor.lex
+allocaCalled:parse.cc
 syntaxError:parse.cc
+allocaCalled:syn-rules.cc
+constVariablePointer:syn-rules.cc

elab_expr.cc

@@ -403,7 +403,7 @@ NetExpr* PEAssignPattern::elaborate_expr_packed_(Design *des, NetScope *scope,
       width /= dims[cur_dim].width();
       cur_dim++;
 
-      NetEConcat *concat = new NetEConcat(parms_.size(), 1, base_type);
+      NetEConcat *neconcat = new NetEConcat(parms_.size(), 1, base_type);
       for (size_t idx = 0; idx < parms_.size(); idx++) {
 	    NetExpr *expr;
 	    // Handle nested assignment patterns as a special case. We do not
@@ -419,10 +419,10 @@ NetExpr* PEAssignPattern::elaborate_expr_packed_(Design *des, NetScope *scope,
 					     base_type, width,
 					     parms_[idx], need_const);
 	    if (expr)
-		  concat->set(idx, expr);
+		  neconcat->set(idx, expr);
       }
 
-      return concat;
+      return neconcat;
 }
 
 NetExpr* PEAssignPattern::elaborate_expr_struct_(Design *des, NetScope *scope,
@@ -439,17 +439,16 @@ NetExpr* PEAssignPattern::elaborate_expr_struct_(Design *des, NetScope *scope,
 	    des->errors++;
       }
 
-      NetEConcat *concat = new NetEConcat(parms_.size(), 1,
-					  struct_type->base_type());
+      NetEConcat *neconcat = new NetEConcat(parms_.size(), 1, struct_type->base_type());
       for (size_t idx = 0; idx < std::min(parms_.size(), members.size()); idx++) {
 	    auto expr = elaborate_rval_expr(des, scope,
 					    members[idx].net_type,
 					    parms_[idx], need_const);
 	    if (expr)
-		  concat->set(idx, expr);
+		  neconcat->set(idx, expr);
       }
 
-      return concat;
+      return neconcat;
 }
 
 NetExpr* PEAssignPattern::elaborate_expr(Design*des, NetScope*, unsigned, unsigned) const
@@ -4263,7 +4262,7 @@ ivl_type_t PEIdent::resolve_type_(Design *des, const symbol_search_results &sr,
       else
 	    type = sr.type;
 
-      auto path = sr.path_tail.cbegin();
+      auto cpath = sr.path_tail.cbegin();
 
       ivl_assert(*this, !sr.path_head.empty());
 
@@ -4301,12 +4300,12 @@ ivl_type_t PEIdent::resolve_type_(Design *des, const symbol_search_results &sr,
 		  }
 	    }
 
-	    if (path == sr.path_tail.cend())
+	    if (cpath == sr.path_tail.cend())
 		  return type;
 
 	    // Next look up the next path element based on name
 
-	    const auto &name = path->name;
+	    const auto &name = cpath->name;
 
 	    if (auto class_type = dynamic_cast<const netclass_t*>(type)) {
 		  // If the type is an object, the next path member may be a
@@ -4363,8 +4362,8 @@ ivl_type_t PEIdent::resolve_type_(Design *des, const symbol_search_results &sr,
 		  return nullptr;
 	    }
 
-	    indices = &path->index;
-	    path++;
+	    indices = &cpath->index;
+	    cpath++;
       }
 
       return type;

elab_net.cc

@@ -616,8 +616,6 @@ NetNet* PEIdent::elaborate_lnet_common_(Design*des, NetScope*scope,
       // array word assignment.
       bool widx_flag = false;
 
-      list<long> unpacked_indices_const;
-
       // Detect the net is a structure and there was a method path
       // detected. We have already broken the path_ into the path to
       // the net, and the path of member names. For example, if the
@@ -685,16 +683,17 @@ NetNet* PEIdent::elaborate_lnet_common_(Design*des, NetScope*scope,
 		    return 0;
                   }
 
+		  use_path.pop_front();
+
 		  member_off += tmp_off;
 		  member_width = member->net_type->packed_width();
 
 		  if (const netstruct_t*tmp_struct = dynamic_cast<const netstruct_t*> (member->net_type)) {
 		        struct_type = tmp_struct;
 		  } else {
 		        struct_type = 0;
+			assert (use_path.empty());
 		  }
-
-		  use_path.pop_front();
 	    }
 
 	    // Look for part selects on the final member. For example if
@@ -772,6 +771,8 @@ NetNet* PEIdent::elaborate_lnet_common_(Design*des, NetScope*scope,
 
       } else if (sig->unpacked_dimensions() > 0) {
 
+	    list<long> unpacked_indices_const;
+
 	      // Make sure there are enough indices to address an array element.
 	    if (path_tail.index.size() < sig->unpacked_dimensions()) {
 		  cerr << get_fileline() << ": error: Array " << path()

elab_sig.cc

@@ -449,16 +449,6 @@ bool PGate::elaborate_sig(Design*, NetScope*) const
       return true;
 }
 
-bool PGBuiltin::elaborate_sig(Design*, NetScope*) const
-{
-      return true;
-}
-
-bool PGAssign::elaborate_sig(Design*, NetScope*) const
-{
-      return true;
-}
-
 bool PGModule::elaborate_sig_mod_(Design*des, NetScope*scope,
 				  const Module*rmod) const
 {

elaborate.cc

@@ -1139,12 +1139,9 @@ NetNet*PGModule::resize_net_to_port_(Design*des, NetScope*scope,
 
 static bool need_bufz_for_input_port(const vector<NetNet*>&prts)
 {
-      if (prts[0]->port_type() != NetNet::PINPUT)
-	    return false;
-
-      if (prts[0]->pin(0).nexus()->drivers_present())
-	    return true;
-
+      if (prts.empty()) return false;
+      if (prts[0]->port_type() != NetNet::PINPUT) return false;
+      if (prts[0]->pin(0).nexus()->drivers_present()) return true;
       return false;
 }
 
@@ -1573,7 +1570,7 @@ void PGModule::elaborate_mod_(Design*des, Module*rmod, NetScope*scope) const
 		    // array, then there should be no sub-ports and
 		    // the r-value expression is processed
 		    // differently.
-		  if (prts.size() >= 1 && prts[0]->unpacked_dimensions() > 0) {
+		  if (!prts.empty() && prts[0]->unpacked_dimensions() > 0) {
 			ivl_assert(*this, prts.size()==1);
 			elaborate_unpacked_port(des, scope, prts[0], pins[idx],
 						ptype, rmod, idx);
@@ -1681,7 +1678,7 @@ void PGModule::elaborate_mod_(Design*des, Module*rmod, NetScope*scope) const
 		  if ((sig->data_type() == IVL_VT_REAL ) &&
 		      !prts.empty() && (prts[0]->data_type() != IVL_VT_REAL )) {
 			sig = cast_to_int4(des, scope, sig,
-			                  prts_vector_width/instance.size());
+			                   prts_vector_width/instance.size());
 		  }
 		    // If we have a bit/vector signal driving a real port
 		    // then we convert the value to a real.
@@ -1983,7 +1980,6 @@ void PGModule::elaborate_mod_(Design*des, Module*rmod, NetScope*scope) const
 	      // to the port from the outside, and the prts object is
 	      // an array of signals to be connected to the sig.
 
-	    NetConcat*ctmp;
 
 	    if (prts.size() == 1) {
 
@@ -2027,6 +2023,7 @@ void PGModule::elaborate_mod_(Design*des, Module*rmod, NetScope*scope) const
 
 	    } else switch (ptype) {
 		case NetNet::POUTPUT:
+		  NetConcat*ctmp;
 		  ctmp = new NetConcat(scope, scope->local_symbol(),
 				       prts_vector_width, prts.size());
 		  ctmp->set_line(*this);

libmisc/StringHeap.cc

@@ -23,8 +23,9 @@
 # include  <cstring>
 # include  <cassert>
 
-#ifdef CHECK_WITH_VALGRIND
 # include  "ivl_alloc.h"
+
+#ifdef CHECK_WITH_VALGRIND
 static char **string_pool = NULL;
 static unsigned string_pool_count = 0;
 #endif
@@ -71,7 +72,7 @@ const char* StringHeap::add(const char*text)
 	      // realloc shrink of the memory region will return the
 	      // same pointer.
 	    if (rem > 0) {
-		  char*old = cell_base_;
+		  const char*old = cell_base_;
 		  cell_base_ = static_cast<char*>(realloc(cell_base_, cell_ptr_));
 		  assert(cell_base_ != 0);
 		  assert(cell_base_ == old);

netlist.h

@@ -3238,7 +3238,6 @@ class NetCondit  : public NetProc {
                                   bool nested_func = false) const override;
       virtual void nex_output(NexusSet&o) override;
 
-      bool is_asynchronous() override;
       bool synth_async(Design*des, NetScope*scope,
                        NexusSet&nex_map, NetBus&nex_out,
                        NetBus&enables, std::vector<mask_t>&bitmasks) override;