From ac4690d74bf9ea9ca123984f351ac71c2c1a06d1 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Tue, 10 Oct 2017 22:22:17 -0400 Subject: [PATCH] Internals: Add const's. No functional change --- include/verilated_cov.cpp | 6 +++--- include/verilated_imp.h | 18 +++++++++--------- include/verilated_vcd_c.cpp | 8 ++++---- include/verilated_vpi.h | 6 +++--- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/verilated_cov.cpp b/include/verilated_cov.cpp index 48c2dbb7e..0761c4794 100644 --- a/include/verilated_cov.cpp +++ b/include/verilated_cov.cpp @@ -221,7 +221,7 @@ private: public: // PUBLIC METHODS void clear() { - for (ItemList::iterator it=m_items.begin(); it!=m_items.end(); ++it) { + for (ItemList::const_iterator it=m_items.begin(); it!=m_items.end(); ++it) { VerilatedCovImpItem* itemp = *(it); delete itemp; } @@ -244,7 +244,7 @@ public: } } void zero() { - for (ItemList::iterator it=m_items.begin(); it!=m_items.end(); ++it) { + for (ItemList::const_iterator it=m_items.begin(); it!=m_items.end(); ++it) { (*it)->zero(); } } @@ -372,7 +372,7 @@ public: } // Output body - for (EventMap::iterator it=eventCounts.begin(); it!=eventCounts.end(); ++it) { + for (EventMap::const_iterator it=eventCounts.begin(); it!=eventCounts.end(); ++it) { os<<"C '"<first; if (it->second.first != "") os<second.first); diff --git a/include/verilated_imp.h b/include/verilated_imp.h index be2b5f932..deae8685a 100644 --- a/include/verilated_imp.h +++ b/include/verilated_imp.h @@ -80,7 +80,7 @@ public: // But only for verilated*.cpp static void internalsDump() { VL_PRINTF("internalsDump:\n"); VL_PRINTF(" Argv:"); - for (ArgVec::iterator it=s_s.m_argVec.begin(); it!=s_s.m_argVec.end(); ++it) { + for (ArgVec::const_iterator it=s_s.m_argVec.begin(); it!=s_s.m_argVec.end(); ++it) { VL_PRINTF(" %s",it->c_str()); } VL_PRINTF("\n"); @@ -109,7 +109,7 @@ public: // But only for verilated*.cpp "%Error: Verilog called $test$plusargs or $value$plusargs without" " testbench C first calling Verilated::commandArgs(argc,argv)."); } - for (ArgVec::iterator it=s_s.m_argVec.begin(); it!=s_s.m_argVec.end(); ++it) { + for (ArgVec::const_iterator it=s_s.m_argVec.begin(); it!=s_s.m_argVec.end(); ++it) { if ((*it)[0]=='+') { if (0==strncmp(prefixp, it->c_str()+1, len)) return *it; } @@ -128,7 +128,7 @@ public: // But only for verilated*.cpp else s_s.m_userMap.insert(it, std::make_pair(std::make_pair(scopep,userKey),userData)); } static inline void* userFind(const void* scopep, void* userKey) { - UserMap::iterator it=s_s.m_userMap.find(std::make_pair(scopep,userKey)); + UserMap::const_iterator it=s_s.m_userMap.find(std::make_pair(scopep,userKey)); if (VL_LIKELY(it != s_s.m_userMap.end())) return it->second; else return NULL; } @@ -146,7 +146,7 @@ private: } static void userDump() { bool first = true; - for (UserMap::iterator it=s_s.m_userMap.begin(); it!=s_s.m_userMap.end(); ++it) { + for (UserMap::const_iterator it=s_s.m_userMap.begin(); it!=s_s.m_userMap.end(); ++it) { if (first) { VL_PRINTF(" userDump:\n"); first=false; } VL_PRINTF(" DPI_USER_DATA scope %p key %p: %p\n", it->first.first, it->first.second, it->second); @@ -163,7 +163,7 @@ public: // But only for verilated*.cpp } } static inline const VerilatedScope* scopeFind(const char* namep) { - VerilatedScopeNameMap::iterator it=s_s.m_nameMap.find(namep); + VerilatedScopeNameMap::const_iterator it=s_s.m_nameMap.find(namep); if (VL_LIKELY(it != s_s.m_nameMap.end())) return it->second; else return NULL; } @@ -175,7 +175,7 @@ public: // But only for verilated*.cpp } static void scopesDump() { VL_PRINTF(" scopesDump:\n"); - for (VerilatedScopeNameMap::iterator it=s_s.m_nameMap.begin(); it!=s_s.m_nameMap.end(); ++it) { + for (VerilatedScopeNameMap::const_iterator it=s_s.m_nameMap.begin(); it!=s_s.m_nameMap.end(); ++it) { const VerilatedScope* scopep = it->second; scopep->scopeDump(); } @@ -205,7 +205,7 @@ public: // But only for verilated*.cpp } } static int exportFind(const char* namep) { - ExportNameMap::iterator it=s_s.m_exportMap.find(namep); + ExportNameMap::const_iterator it=s_s.m_exportMap.find(namep); if (VL_LIKELY(it != s_s.m_exportMap.end())) return it->second; std::string msg = (std::string("%Error: Testbench C called ")+namep +" but no such DPI export function name exists in ANY model"); @@ -214,14 +214,14 @@ public: // But only for verilated*.cpp } static const char* exportName(int funcnum) { // Slowpath; find name for given export; errors only so no map to reverse-map it - for (ExportNameMap::iterator it=s_s.m_exportMap.begin(); it!=s_s.m_exportMap.end(); ++it) { + for (ExportNameMap::const_iterator it=s_s.m_exportMap.begin(); it!=s_s.m_exportMap.end(); ++it) { if (it->second == funcnum) return it->first; } return "*UNKNOWN*"; } static void exportsDump() { bool first = true; - for (ExportNameMap::iterator it=s_s.m_exportMap.begin(); it!=s_s.m_exportMap.end(); ++it) { + for (ExportNameMap::const_iterator it=s_s.m_exportMap.begin(); it!=s_s.m_exportMap.end(); ++it) { if (first) { VL_PRINTF(" exportDump:\n"); first=false; } VL_PRINTF(" DPI_EXPORT_NAME %05d: %s\n", it->second, it->first); } diff --git a/include/verilated_vcd_c.cpp b/include/verilated_vcd_c.cpp index d52c91b5b..e1b59b60b 100644 --- a/include/verilated_vcd_c.cpp +++ b/include/verilated_vcd_c.cpp @@ -200,13 +200,13 @@ void VerilatedVcd::makeNameMap() { // If no scope was specified, prefix everything with a "top" // This comes from user instantiations with no name - IE Vtop(""). bool nullScope = false; - for (NameMap::iterator it=m_namemapp->begin(); it!=m_namemapp->end(); ++it) { + for (NameMap::const_iterator it=m_namemapp->begin(); it!=m_namemapp->end(); ++it) { const std::string& hiername = it->first; if (hiername.size() >= 1 && hiername[0] == '\t') nullScope=true; } if (nullScope) { NameMap* newmapp = new NameMap; - for (NameMap::iterator it=m_namemapp->begin(); it!=m_namemapp->end(); ++it) { + for (NameMap::const_iterator it=m_namemapp->begin(); it!=m_namemapp->end(); ++it) { const std::string& hiername = it->first; const std::string& decl = it->second; std::string newname = std::string("top"); @@ -229,7 +229,7 @@ VerilatedVcd::~VerilatedVcd() { if (m_sigs_oldvalp) { delete[] m_sigs_oldvalp; m_sigs_oldvalp=NULL; } deleteNameMap(); if (m_filep && m_fileNewed) { delete m_filep; m_filep = NULL; } - for (CallbackVec::iterator it=m_callbacks.begin(); it!=m_callbacks.end(); ++it) { + for (CallbackVec::const_iterator it=m_callbacks.begin(); it!=m_callbacks.end(); ++it) { delete (*it); } m_callbacks.clear(); @@ -416,7 +416,7 @@ void VerilatedVcd::dumpHeader () { // Print the signal names const char* lastName = ""; - for (NameMap::iterator it=m_namemapp->begin(); it!=m_namemapp->end(); ++it) { + for (NameMap::const_iterator it=m_namemapp->begin(); it!=m_namemapp->end(); ++it) { const std::string& hiernamestr = it->first; const std::string& decl = it->second; diff --git a/include/verilated_vpi.h b/include/verilated_vpi.h index d22446abb..3647e4b9d 100644 --- a/include/verilated_vpi.h +++ b/include/verilated_vpi.h @@ -252,7 +252,7 @@ public: class VerilatedVpioVarIter : public VerilatedVpio { const VerilatedScope* m_scopep; - VerilatedVarNameMap::iterator m_it; + VerilatedVarNameMap::const_iterator m_it; bool m_started; public: explicit VerilatedVpioVarIter(const VerilatedScope* scopep) @@ -368,7 +368,7 @@ public: } } static QData cbNextDeadline() { - VpioTimedCbs::iterator it=s_s.m_timedCbs.begin(); + VpioTimedCbs::const_iterator it=s_s.m_timedCbs.begin(); if (VL_LIKELY(it!=s_s.m_timedCbs.end())) { return it->first; } else { @@ -412,7 +412,7 @@ public: } } } - for (VpioVarSet::iterator it=update.begin(); it!=update.end(); ++it) { + for (VpioVarSet::const_iterator it=update.begin(); it!=update.end(); ++it) { memcpy((*it)->prevDatap(), (*it)->varDatap(), (*it)->entSize()); } }