diff --git a/src/Makefile_obj.in b/src/Makefile_obj.in index 57685d90e..96e8638ff 100644 --- a/src/Makefile_obj.in +++ b/src/Makefile_obj.in @@ -186,6 +186,7 @@ RAW_OBJS = \ V3Error.o \ V3Expand.o \ V3File.o \ + V3FileLine.o \ V3Gate.o \ V3GenClk.o \ V3Graph.o \ diff --git a/src/V3Ast.h b/src/V3Ast.h index f14284ab8..4eecd7d2a 100644 --- a/src/V3Ast.h +++ b/src/V3Ast.h @@ -23,6 +23,7 @@ #include "config_build.h" #include "verilatedos.h" #include "V3Error.h" +#include "V3FileLine.h" #include "V3Number.h" #include "V3Global.h" #include diff --git a/src/V3Config.h b/src/V3Config.h index d9098fc7b..c129277be 100644 --- a/src/V3Config.h +++ b/src/V3Config.h @@ -24,6 +24,7 @@ #include "verilatedos.h" #include #include "V3Error.h" +#include "V3FileLine.h" //###################################################################### diff --git a/src/V3Error.cpp b/src/V3Error.cpp index 745e3ba7d..514a40f2a 100644 --- a/src/V3Error.cpp +++ b/src/V3Error.cpp @@ -27,7 +27,6 @@ # include "V3Ast.h" # include "V3Global.h" # include "V3Stats.h" -# include "V3Config.h" #endif //====================================================================== @@ -36,6 +35,8 @@ int V3Error::s_errCount = 0; int V3Error::s_warnCount = 0; int V3Error::s_debugDefault = 0; +int V3Error::s_errorLimit = V3Error::MAX_ERRORS; +bool V3Error::s_warnFatal = true; int V3Error::s_tellManual = 0; ostringstream V3Error::s_errorStr; // Error string being formed V3ErrorCode V3Error::s_errorCode = V3ErrorCode::EC_FATAL; @@ -65,270 +66,6 @@ V3ErrorCode::V3ErrorCode(const char* msgp) { m_e = V3ErrorCode::EC_ERROR; } -//###################################################################### -// FileLineSingleton class functions - -const string FileLineSingleton::filenameLetters(int no) { - const int size = 1 + (64 / 4); // Each letter retires more than 4 bits of a > 64 bit number - char out[size]; - char* op = out+size-1; - *--op = '\0'; // We build backwards - int num = no; - do { - *--op = 'a'+num%26; - num /= 26; - } while (num); - return op; -} - -//! Convert filenames to a filenameno - -//! This lets us assign a nice small identifier for debug messages, but more -//! importantly lets us use a 4 byte int instead of 8 byte pointer in every -//! FileLine. - -//! We associate a language with each source file, so we also set the default -//! for this. -int FileLineSingleton::nameToNumber(const string& filename) { - FileNameNumMap::const_iterator it = m_namemap.find(filename); - if (VL_LIKELY(it != m_namemap.end())) return it->second; - int num = m_names.size(); - m_names.push_back(filename); - m_languages.push_back(V3LangCode::mostRecent()); - m_namemap.insert(make_pair(filename,num)); - return num; -} - -//! Support XML output - -//! Experimental. Updated to also put out the language. -void FileLineSingleton::fileNameNumMapDumpXml(ostream& os) { - os<<"\n"; - for (FileNameNumMap::const_iterator it = m_namemap.begin(); it != m_namemap.end(); ++it) { - os<<"second) - <<"\" filename=\""<first - <<"\" language=\""<second).ascii()<<"\"/>\n"; - } - os<<"\n"; -} - -//###################################################################### -// FileLine class functions - -FileLine::FileLine(FileLine::EmptySecret) { - // Sort of a singleton - m_lineno=0; - m_filenameno=singleton().nameToNumber("AstRoot"); - - m_warnOn=0; - for (int codei=V3ErrorCode::EC_MIN; codeilineno(atoi(ln)); - } - while (*textp && (isspace(*textp) || *textp=='"')) textp++; - - // Grab filename - const char *fn = textp; - while (*textp && !(isspace(*textp) || *textp=='"')) textp++; - if (textp != fn) { - string strfn = fn; - strfn = strfn.substr(0, textp-fn); - this->filename(strfn); - } - - // Grab level - while (*textp && (isspace(*textp) || *textp=='"')) textp++; - if (isdigit(*textp)) enterExitRef = atoi(textp); - else enterExitRef = 0; - - //printf ("PPLINE %d '%s'\n", s_lineno, s_filename.c_str()); -} - -FileLine* FileLine::copyOrSameFileLine() { - // When a fileline is "used" to produce a node, calls this function. - // Return this, or a copy of this - // There are often more than one token per line, thus we use the - // same pointer as long as we're on the same line, file & warn state. -#ifndef _V3ERROR_NO_GLOBAL_ - V3Config::applyIgnores(this); // Toggle warnings based on global config file -#endif - static FileLine* lastNewp = NULL; - if (lastNewp && *lastNewp == *this) { // Compares lineno, filename, etc - return lastNewp; - } - FileLine* newp = new FileLine(this); - lastNewp = newp; - return newp; -} - -void FileLine::updateLanguage () { - language(v3Global.opt.fileLanguage(filename())); -} - -const string FileLine::filebasename() const { - string name = filename(); - string::size_type pos; - if ((pos = name.rfind("/")) != string::npos) { - name.erase(0,pos+1); - } - return name; -} - -const string FileLine::filebasenameNoExt() const { - string name = filebasename(); - string::size_type pos; - if ((pos = name.find(".")) != string::npos) { - name = name.substr(0,pos); - } - return name; -} - -const string FileLine::profileFuncname() const { - // Return string that is OK as a function name - for profiling - string name = filebasenameNoExt(); - string::size_type pos; - while ((pos = name.find_first_not_of("abcdefghijlkmnopqrstuvwxyzABCDEFGHIJLKMNOPQRSTUVWXYZ0123456789_")) - != string::npos) { - name.replace(pos, 1, "_"); - } - name += "__l"+cvtToStr(lineno()); - return name; -} - -string FileLine::ascii() const { - return filename()+":"+cvtToStr(lineno()); -} -ostream& operator<<(ostream& os, FileLine* fileline) { - os <ascii()<<": "<warnIsOff(code)) { - this->warnOff(code, true); - } - } -} - -void FileLine::v3errorEnd(ostringstream& str) { - if (this && m_lineno) { - ostringstream nsstr; - nsstr< FileLineCheckSet; -FileLineCheckSet fileLineLeakChecks; - -void* FileLine::operator new(size_t size) { - FileLine* objp = static_cast(::operator new(size)); - fileLineLeakChecks.insert(objp); - return objp; -} - -void FileLine::operator delete(void* objp, size_t size) { - if (!objp) return; - FileLine* flp = static_cast(objp); - FileLineCheckSet::iterator it = fileLineLeakChecks.find(flp); - if (it != fileLineLeakChecks.end()) { - fileLineLeakChecks.erase(it); - } else { - flp->v3fatalSrc("Deleting FileLine object that was never tracked\n"); - } - ::operator delete(objp); -} -#endif - -void FileLine::deleteAllRemaining() { -#ifdef VL_LEAK_CHECKS - // FileLines are allocated, but never nicely freed, as it's much faster - // that way. Unfortunately this makes our leak checking a big mess, so - // only when leak checking we'll track them all and cleanup. - while (1) { - FileLineCheckSet::iterator it=fileLineLeakChecks.begin(); - if (it==fileLineLeakChecks.end()) break; - delete *it; - // Operator delete will remove the iterated object from the list. - // Eventually the list will be empty and terminate the loop. - } - fileLineLeakChecks.clear(); - singleton().clear(); -#endif -} - //###################################################################### // V3Error class functions @@ -356,13 +93,13 @@ string V3Error::lineStr (const char* filename, int lineno) { void V3Error::incErrors() { s_errCount++; - if (errorCount() == v3Global.opt.errorLimit()) { // Not >= as would otherwise recurse + if (errorCount() == errorLimit()) { // Not >= as would otherwise recurse v3fatal ("Exiting due to too many errors encountered; --error-limit="<=V3ErrorCode::EC_MIN) { +#ifndef _V3ERROR_NO_GLOBAL_ V3Stats::addStatSum(string("Warnings, Suppressed ")+s_errorCode.ascii(), 1); +#endif s_errorSuppressed = true; } } diff --git a/src/V3Error.h b/src/V3Error.h index 7789ca278..2e810ec54 100644 --- a/src/V3Error.h +++ b/src/V3Error.h @@ -30,8 +30,6 @@ #include #include -#include "V3LangCode.h" - //###################################################################### class V3ErrorCode { @@ -191,9 +189,11 @@ class V3Error { static bool s_describedWarnings; // Told user how to disable warns static bool s_describedEachWarn[V3ErrorCode::_ENUM_MAX]; // Told user specifics about this warning static bool s_pretendError[V3ErrorCode::_ENUM_MAX]; // Pretend this warning is an error - static int s_debugDefault; // Default debugging level + static int s_debugDefault; // Option: --debugi Default debugging level + static int s_errorLimit; // Option: --error-limit Number of errors before exit + static bool s_warnFatal; // Option: --warnFatal Warnings are fatal static int s_errCount; // Error count - static int s_warnCount; // Error count + static int s_warnCount; // Warning count static int s_tellManual; // Tell user to see manual, 0=not yet, 1=doit, 2=disable static ostringstream s_errorStr; // Error string being formed static V3ErrorCode s_errorCode; // Error string being formed will abort @@ -210,6 +210,10 @@ class V3Error { // ACCESSORS static void debugDefault(int level) { s_debugDefault = level; } static int debugDefault() { return s_debugDefault; } + static void errorLimit(int level) { s_errorLimit = level; } + static int errorLimit() { return s_errorLimit; } + static void warnFatal(bool flag) { s_warnFatal = flag; } + static bool warnFatal() { return s_warnFatal; } static string msgPrefix(); // returns %Error/%Warn static int errorCount() { return s_errCount; } static int warnCount() { return s_warnCount; } @@ -243,7 +247,7 @@ class V3Error { inline int debug() { return V3Error::debugDefault(); } inline void v3errorEnd(ostringstream& sstr) { V3Error::v3errorEnd(sstr); } -// These allow errors using << operators: v3error("foo"<<"bar"); +// Theses allow errors using << operators: v3error("foo"<<"bar"); // Careful, you can't put () around msg, as you would in most macro definitions // Note the commas are the comma operator, not separating arguments. These are needed to insure // evaluation order as otherwise we couldn't insure v3errorPrep is called first. @@ -285,140 +289,4 @@ inline string ucfirst(const string& text) { return out; } -//###################################################################### - -class FileLine; - -//! Singleton class with tables of per-file data. - -//! This singleton class contains tables of data that are unchanging in each -//! source file (each with its own unique filename number). -class FileLineSingleton { - // TYPES - typedef map FileNameNumMap; - typedef map FileLangNumMap; - // MEMBERS - FileNameNumMap m_namemap; // filenameno for each filename - deque m_names; // filename text for each filenameno - deque m_languages; // language for each filenameno - // COSNTRUCTORS - FileLineSingleton() { } - ~FileLineSingleton() { } -protected: - friend class FileLine; - // METHODS - int nameToNumber(const string& filename); - const string numberToName(int filenameno) const { return m_names[filenameno]; } - const V3LangCode numberToLang(int filenameno) const { return m_languages[filenameno]; } - void numberToLang(int filenameno, const V3LangCode& l) { m_languages[filenameno] = l; } - void clear() { m_namemap.clear(); m_names.clear(); m_languages.clear(); } - void fileNameNumMapDumpXml(ostream& os); - static const string filenameLetters(int fileno); -}; - -//! File and line number of an object, mostly for error reporting - -//! This class is instantiated for every source code line (potentially -//! millions). To save space, per-file information (e.g. filename, source -//! language is held in tables in the FileLineSingleton class. -class FileLine { - int m_lineno; - int m_filenameno; - bitset m_warnOn; - -private: - struct EmptySecret {}; - inline static FileLineSingleton& singleton() { - static FileLineSingleton s; - return s; - } - inline static FileLine& defaultFileLine() { - static FileLine* defFilelinep = new FileLine(FileLine::EmptySecret()); - return *defFilelinep; - } -protected: - // User routines should never need to change line numbers - // We are storing pointers, so we CAN'T change them after initial reading. - friend class FileLineSingleton; - friend class V3ParseImp; - friend class V3PreLex; - friend class V3PreProcImp; - void lineno(int num) { m_lineno = num; } - void language (V3LangCode lang) { singleton().numberToLang(m_filenameno, lang); } - void filename(const string& name) { m_filenameno = singleton().nameToNumber(name); } - void lineDirective(const char* textp, int& enterExitRef); - void linenoInc() { m_lineno++; } - void linenoIncInPlace() { m_lineno++; } - FileLine* copyOrSameFileLine(); -public: - FileLine (const string& filename, int lineno) { - m_lineno=lineno; m_filenameno = singleton().nameToNumber(filename); - m_warnOn=defaultFileLine().m_warnOn; } - FileLine (FileLine* fromp) { - m_lineno=fromp->m_lineno; m_filenameno = fromp->m_filenameno; m_warnOn=fromp->m_warnOn; } - FileLine (EmptySecret); - ~FileLine() { } - FileLine* create(const string& filename, int lineno) { return new FileLine(filename,lineno); } - FileLine* create(int lineno) { return create(filename(), lineno); } - static void deleteAllRemaining(); -#ifdef VL_LEAK_CHECKS - static void* operator new(size_t size); - static void operator delete(void* obj, size_t size); -#endif - - int lineno () const { return m_lineno; } - V3LangCode language () const { return singleton().numberToLang(m_filenameno); } - void updateLanguage (); - string ascii() const; - const string filename () const { return singleton().numberToName(m_filenameno); } - const string filenameLetters() const { return singleton().filenameLetters(m_filenameno); } - const string filebasename () const; - const string filebasenameNoExt () const; - const string profileFuncname() const; - const string xml() const { return "fl=\""+filenameLetters()+cvtToStr(lineno())+"\""; } - string lineDirectiveStrg(int enter_exit_level) const; - void warnOn(V3ErrorCode code, bool flag) { m_warnOn.set(code,flag); } // Turn on/off warning messages on this line. - void warnOff(V3ErrorCode code, bool flag) { warnOn(code,!flag); } - bool warnOff(const string& code, bool flag); // Returns 1 if ok - bool warnIsOff(V3ErrorCode code) const; - void warnLintOff(bool flag); - void warnStyleOff(bool flag); - void warnStateFrom(const FileLine& from) { m_warnOn=from.m_warnOn; } - void warnResetDefault() { warnStateFrom(defaultFileLine()); } - - // Specific flag ACCESSORS/METHODS - bool coverageOn() const { return m_warnOn.test(V3ErrorCode::I_COVERAGE); } - void coverageOn(bool flag) { warnOn(V3ErrorCode::I_COVERAGE,flag); } - bool tracingOn() const { return m_warnOn.test(V3ErrorCode::I_TRACING); } - void tracingOn(bool flag) { warnOn(V3ErrorCode::I_TRACING,flag); } - - // METHODS - Global - static void globalWarnLintOff(bool flag) { - defaultFileLine().warnLintOff(flag); } - static void globalWarnStyleOff(bool flag) { - defaultFileLine().warnStyleOff(flag); } - static void globalWarnOff(V3ErrorCode code, bool flag) { - defaultFileLine().warnOff(code, flag); } - static bool globalWarnOff(const string& code, bool flag) { - return defaultFileLine().warnOff(code, flag); } - static void fileNameNumMapDumpXml(ostream& os) { - singleton().fileNameNumMapDumpXml(os); } - - // METHODS - Called from netlist - // Merge warning disables from another fileline - void modifyStateInherit(const FileLine* fromp); - // Change the current fileline due to actions discovered after parsing - // and may have side effects on other nodes sharing this FileLine. - // Use only when this is intended - void modifyWarnOff(V3ErrorCode code, bool flag) { warnOff(code,flag); } - - // OPERATORS - void v3errorEnd(ostringstream& str); - string warnMore() const; - inline bool operator==(FileLine rhs) const { - return (m_lineno==rhs.m_lineno && m_filenameno==rhs.m_filenameno && m_warnOn==rhs.m_warnOn); - } -}; -ostream& operator<<(ostream& os, FileLine* fileline); - #endif // Guard diff --git a/src/V3File.h b/src/V3File.h index c64db803d..e95f82245 100644 --- a/src/V3File.h +++ b/src/V3File.h @@ -23,6 +23,7 @@ #include "config_build.h" #include "verilatedos.h" #include "V3Error.h" +#include "V3FileLine.h" #include #include #include diff --git a/src/V3FileLine.cpp b/src/V3FileLine.cpp new file mode 100644 index 000000000..7286a59e6 --- /dev/null +++ b/src/V3FileLine.cpp @@ -0,0 +1,294 @@ +// -*- mode: C++; c-file-style: "cc-mode" -*- +//************************************************************************* +// DESCRIPTION: Verilator: Error handling +// +// Code available from: http://www.veripool.org/verilator +// +//************************************************************************* +// +// Copyright 2003-2014 by Wilson Snyder. This program is free software; you can +// redistribute it and/or modify it under the terms of either the GNU +// Lesser General Public License Version 3 or the Perl Artistic License +// Version 2.0. +// +// Verilator is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +//************************************************************************* + +#include +#include +#include +#include +#include "V3Error.h" +#include "V3FileLine.h" +#ifndef _V3ERROR_NO_GLOBAL_ +# include "V3Ast.h" +# include "V3Global.h" +# include "V3Stats.h" +# include "V3Config.h" +#endif + +//###################################################################### +// FileLineSingleton class functions + +const string FileLineSingleton::filenameLetters(int no) { + const int size = 1 + (64 / 4); // Each letter retires more than 4 bits of a > 64 bit number + char out[size]; + char* op = out+size-1; + *--op = '\0'; // We build backwards + int num = no; + do { + *--op = 'a'+num%26; + num /= 26; + } while (num); + return op; +} + +//! Convert filenames to a filenameno + +//! This lets us assign a nice small identifier for debug messages, but more +//! importantly lets us use a 4 byte int instead of 8 byte pointer in every +//! FileLine. + +//! We associate a language with each source file, so we also set the default +//! for this. +int FileLineSingleton::nameToNumber(const string& filename) { + FileNameNumMap::const_iterator it = m_namemap.find(filename); + if (VL_LIKELY(it != m_namemap.end())) return it->second; + int num = m_names.size(); + m_names.push_back(filename); + m_languages.push_back(V3LangCode::mostRecent()); + m_namemap.insert(make_pair(filename,num)); + return num; +} + +//! Support XML output + +//! Experimental. Updated to also put out the language. +void FileLineSingleton::fileNameNumMapDumpXml(ostream& os) { + os<<"\n"; + for (FileNameNumMap::const_iterator it = m_namemap.begin(); it != m_namemap.end(); ++it) { + os<<"second) + <<"\" filename=\""<first + <<"\" language=\""<second).ascii()<<"\"/>\n"; + } + os<<"\n"; +} + +//###################################################################### +// FileLine class functions + +FileLine::FileLine(FileLine::EmptySecret) { + // Sort of a singleton + m_lineno=0; + m_filenameno=singleton().nameToNumber("AstRoot"); + + m_warnOn=0; + for (int codei=V3ErrorCode::EC_MIN; codeilineno(atoi(ln)); + } + while (*textp && (isspace(*textp) || *textp=='"')) textp++; + + // Grab filename + const char *fn = textp; + while (*textp && !(isspace(*textp) || *textp=='"')) textp++; + if (textp != fn) { + string strfn = fn; + strfn = strfn.substr(0, textp-fn); + this->filename(strfn); + } + + // Grab level + while (*textp && (isspace(*textp) || *textp=='"')) textp++; + if (isdigit(*textp)) enterExitRef = atoi(textp); + else enterExitRef = 0; + + //printf ("PPLINE %d '%s'\n", s_lineno, s_filename.c_str()); +} + +FileLine* FileLine::copyOrSameFileLine() { + // When a fileline is "used" to produce a node, calls this function. + // Return this, or a copy of this + // There are often more than one token per line, thus we use the + // same pointer as long as we're on the same line, file & warn state. +#ifndef _V3ERROR_NO_GLOBAL_ + V3Config::applyIgnores(this); // Toggle warnings based on global config file +#endif + static FileLine* lastNewp = NULL; + if (lastNewp && *lastNewp == *this) { // Compares lineno, filename, etc + return lastNewp; + } + FileLine* newp = new FileLine(this); + lastNewp = newp; + return newp; +} + +const string FileLine::filebasename() const { + string name = filename(); + string::size_type pos; + if ((pos = name.rfind("/")) != string::npos) { + name.erase(0,pos+1); + } + return name; +} + +const string FileLine::filebasenameNoExt() const { + string name = filebasename(); + string::size_type pos; + if ((pos = name.find(".")) != string::npos) { + name = name.substr(0,pos); + } + return name; +} + +const string FileLine::profileFuncname() const { + // Return string that is OK as a function name - for profiling + string name = filebasenameNoExt(); + string::size_type pos; + while ((pos = name.find_first_not_of("abcdefghijlkmnopqrstuvwxyzABCDEFGHIJLKMNOPQRSTUVWXYZ0123456789_")) + != string::npos) { + name.replace(pos, 1, "_"); + } + name += "__l"+cvtToStr(lineno()); + return name; +} + +string FileLine::ascii() const { + return filename()+":"+cvtToStr(lineno()); +} +ostream& operator<<(ostream& os, FileLine* fileline) { + os <ascii()<<": "<warnIsOff(code)) { + this->warnOff(code, true); + } + } +} + +void FileLine::v3errorEnd(ostringstream& str) { + if (this && m_lineno) { + ostringstream nsstr; + nsstr< FileLineCheckSet; +FileLineCheckSet fileLineLeakChecks; + +void* FileLine::operator new(size_t size) { + FileLine* objp = static_cast(::operator new(size)); + fileLineLeakChecks.insert(objp); + return objp; +} + +void FileLine::operator delete(void* objp, size_t size) { + if (!objp) return; + FileLine* flp = static_cast(objp); + FileLineCheckSet::iterator it = fileLineLeakChecks.find(flp); + if (it != fileLineLeakChecks.end()) { + fileLineLeakChecks.erase(it); + } else { + flp->v3fatalSrc("Deleting FileLine object that was never tracked\n"); + } + ::operator delete(objp); +} +#endif + +void FileLine::deleteAllRemaining() { +#ifdef VL_LEAK_CHECKS + // FileLines are allocated, but never nicely freed, as it's much faster + // that way. Unfortunately this makes our leak checking a big mess, so + // only when leak checking we'll track them all and cleanup. + while (1) { + FileLineCheckSet::iterator it=fileLineLeakChecks.begin(); + if (it==fileLineLeakChecks.end()) break; + delete *it; + // Operator delete will remove the iterated object from the list. + // Eventually the list will be empty and terminate the loop. + } + fileLineLeakChecks.clear(); + singleton().clear(); +#endif +} diff --git a/src/V3FileLine.h b/src/V3FileLine.h new file mode 100644 index 000000000..93d114474 --- /dev/null +++ b/src/V3FileLine.h @@ -0,0 +1,171 @@ +// -*- mode: C++; c-file-style: "cc-mode" -*- +//************************************************************************* +// DESCRIPTION: Verilator: Error handling +// +// Code available from: http://www.veripool.org/verilator +// +//************************************************************************* +// +// Copyright 2003-2014 by Wilson Snyder. This program is free software; you can +// redistribute it and/or modify it under the terms of either the GNU +// Lesser General Public License Version 3 or the Perl Artistic License +// Version 2.0. +// +// Verilator is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +//************************************************************************* + +#ifndef _V3FileLine_H_ +#define _V3FileLine_H_ 1 +#include "config_build.h" +#include "verilatedos.h" +#include +#include +#include +#include +#include +#include +#include + +#include "V3Error.h" +#include "V3LangCode.h" + +//###################################################################### + +class FileLine; + +//! Singleton class with tables of per-file data. + +//! This singleton class contains tables of data that are unchanging in each +//! source file (each with its own unique filename number). +class FileLineSingleton { + // TYPES + typedef map FileNameNumMap; + typedef map FileLangNumMap; + // MEMBERS + FileNameNumMap m_namemap; // filenameno for each filename + deque m_names; // filename text for each filenameno + deque m_languages; // language for each filenameno + // COSNTRUCTORS + FileLineSingleton() { } + ~FileLineSingleton() { } +protected: + friend class FileLine; + // METHODS + int nameToNumber(const string& filename); + const string numberToName(int filenameno) const { return m_names[filenameno]; } + const V3LangCode numberToLang(int filenameno) const { return m_languages[filenameno]; } + void numberToLang(int filenameno, const V3LangCode& l) { m_languages[filenameno] = l; } + void clear() { m_namemap.clear(); m_names.clear(); m_languages.clear(); } + void fileNameNumMapDumpXml(ostream& os); + static const string filenameLetters(int fileno); +}; + +//! File and line number of an object, mostly for error reporting + +//! This class is instantiated for every source code line (potentially +//! millions). To save space, per-file information (e.g. filename, source +//! language is held in tables in the FileLineSingleton class. +class FileLine { + int m_lineno; + int m_filenameno; + bitset m_warnOn; + +private: + struct EmptySecret {}; + inline static FileLineSingleton& singleton() { + static FileLineSingleton s; + return s; + } + inline static FileLine& defaultFileLine() { + static FileLine* defFilelinep = new FileLine(FileLine::EmptySecret()); + return *defFilelinep; + } +protected: + // User routines should never need to change line numbers + // We are storing pointers, so we CAN'T change them after initial reading. + friend class FileLineSingleton; + friend class V3ParseImp; + friend class V3PreLex; + friend class V3PreProcImp; + void lineno(int num) { m_lineno = num; } + void language (V3LangCode lang) { singleton().numberToLang(m_filenameno, lang); } + void filename(const string& name) { m_filenameno = singleton().nameToNumber(name); } + void lineDirective(const char* textp, int& enterExitRef); + void linenoInc() { m_lineno++; } + void linenoIncInPlace() { m_lineno++; } + FileLine* copyOrSameFileLine(); +public: + FileLine (const string& filename, int lineno) { + m_lineno=lineno; m_filenameno = singleton().nameToNumber(filename); + m_warnOn=defaultFileLine().m_warnOn; } + FileLine (FileLine* fromp) { + m_lineno=fromp->m_lineno; m_filenameno = fromp->m_filenameno; m_warnOn=fromp->m_warnOn; } + FileLine (EmptySecret); + ~FileLine() { } + FileLine* create(const string& filename, int lineno) { return new FileLine(filename,lineno); } + FileLine* create(int lineno) { return create(filename(), lineno); } + static void deleteAllRemaining(); +#ifdef VL_LEAK_CHECKS + static void* operator new(size_t size); + static void operator delete(void* obj, size_t size); +#endif + + int lineno () const { return m_lineno; } + V3LangCode language () const { return singleton().numberToLang(m_filenameno); } + string ascii() const; + const string filename () const { return singleton().numberToName(m_filenameno); } + const string filenameLetters() const { return singleton().filenameLetters(m_filenameno); } + const string filebasename () const; + const string filebasenameNoExt () const; + const string profileFuncname() const; + const string xml() const { return "fl=\""+filenameLetters()+cvtToStr(lineno())+"\""; } + string lineDirectiveStrg(int enter_exit_level) const; + void warnOn(V3ErrorCode code, bool flag) { m_warnOn.set(code,flag); } // Turn on/off warning messages on this line. + void warnOff(V3ErrorCode code, bool flag) { warnOn(code,!flag); } + bool warnOff(const string& code, bool flag); // Returns 1 if ok + bool warnIsOff(V3ErrorCode code) const; + void warnLintOff(bool flag); + void warnStyleOff(bool flag); + void warnStateFrom(const FileLine& from) { m_warnOn=from.m_warnOn; } + void warnResetDefault() { warnStateFrom(defaultFileLine()); } + + // Specific flag ACCESSORS/METHODS + bool coverageOn() const { return m_warnOn.test(V3ErrorCode::I_COVERAGE); } + void coverageOn(bool flag) { warnOn(V3ErrorCode::I_COVERAGE,flag); } + bool tracingOn() const { return m_warnOn.test(V3ErrorCode::I_TRACING); } + void tracingOn(bool flag) { warnOn(V3ErrorCode::I_TRACING,flag); } + + // METHODS - Global + static void globalWarnLintOff(bool flag) { + defaultFileLine().warnLintOff(flag); } + static void globalWarnStyleOff(bool flag) { + defaultFileLine().warnStyleOff(flag); } + static void globalWarnOff(V3ErrorCode code, bool flag) { + defaultFileLine().warnOff(code, flag); } + static bool globalWarnOff(const string& code, bool flag) { + return defaultFileLine().warnOff(code, flag); } + static void fileNameNumMapDumpXml(ostream& os) { + singleton().fileNameNumMapDumpXml(os); } + + // METHODS - Called from netlist + // Merge warning disables from another fileline + void modifyStateInherit(const FileLine* fromp); + // Change the current fileline due to actions discovered after parsing + // and may have side effects on other nodes sharing this FileLine. + // Use only when this is intended + void modifyWarnOff(V3ErrorCode code, bool flag) { warnOff(code,flag); } + + // OPERATORS + void v3errorEnd(ostringstream& str); + string warnMore() const; + inline bool operator==(FileLine rhs) const { + return (m_lineno==rhs.m_lineno && m_filenameno==rhs.m_filenameno && m_warnOn==rhs.m_warnOn); + } +}; +ostream& operator<<(ostream& os, FileLine* fileline); + +#endif // Guard diff --git a/src/V3Global.h b/src/V3Global.h index af9832773..a4b4fac8e 100644 --- a/src/V3Global.h +++ b/src/V3Global.h @@ -26,6 +26,7 @@ #include #include "V3Error.h" +#include "V3FileLine.h" #include "V3Options.h" class AstNetlist; diff --git a/src/V3Number.h b/src/V3Number.h index c6bfd53bd..32232d3c1 100644 --- a/src/V3Number.h +++ b/src/V3Number.h @@ -25,6 +25,7 @@ #include #include "V3Error.h" +#include "V3FileLine.h" //============================================================================ diff --git a/src/V3Number_test.cpp b/src/V3Number_test.cpp index fe3321d0a..868ba324f 100644 --- a/src/V3Number_test.cpp +++ b/src/V3Number_test.cpp @@ -22,6 +22,7 @@ #define V3NUMBER_ASCII_BINARY #define _V3ERROR_NO_GLOBAL_ 1 #include "V3Error.cpp" +#include "V3FileLine.cpp" #include "V3Number.cpp" #include diff --git a/src/V3Options.cpp b/src/V3Options.cpp index cec269671..8a33690d4 100644 --- a/src/V3Options.cpp +++ b/src/V3Options.cpp @@ -832,7 +832,7 @@ void V3Options::parseOptsList(FileLine* fl, const string& optdir, int argc, char } else if ( !strcmp (sw, "-error-limit") && (i+1)ext+ options since it was first ecountered. FileLine *modfileline = new FileLine (modfilename, 0); - modfileline->updateLanguage(); + modfileline->language(v3Global.opt.fileLanguage(modfilename)); ppPushText((string)"`begin_keywords \""+modfileline->language().ascii()+"\"\n"); } diff --git a/src/V3ParseImp.h b/src/V3ParseImp.h index 00b4e65a9..b439ca61a 100644 --- a/src/V3ParseImp.h +++ b/src/V3ParseImp.h @@ -23,6 +23,7 @@ #include "config_build.h" #include "verilatedos.h" #include "V3Error.h" +#include "V3FileLine.h" #include "V3Global.h" #include "V3Parse.h" #include "V3ParseSym.h" diff --git a/src/V3ParseSym.h b/src/V3ParseSym.h index cb7d50788..da68ddd77 100644 --- a/src/V3ParseSym.h +++ b/src/V3ParseSym.h @@ -23,6 +23,7 @@ #include "config_build.h" #include "verilatedos.h" #include "V3Error.h" +#include "V3FileLine.h" #include "V3Global.h" #include "V3SymTable.h" #include diff --git a/src/V3PreLex.h b/src/V3PreLex.h index f725f9b32..589d8d261 100644 --- a/src/V3PreLex.h +++ b/src/V3PreLex.h @@ -31,6 +31,7 @@ #include #include "V3Error.h" +#include "V3FileLine.h" //====================================================================== diff --git a/src/V3PreProc.h b/src/V3PreProc.h index 976de3e82..ff2feed10 100644 --- a/src/V3PreProc.h +++ b/src/V3PreProc.h @@ -26,6 +26,7 @@ #include "config_build.h" #include "verilatedos.h" #include "V3Error.h" +#include "V3FileLine.h" #include #include diff --git a/src/V3PreShell.h b/src/V3PreShell.h index 42cbfd997..b59e2a575 100644 --- a/src/V3PreShell.h +++ b/src/V3PreShell.h @@ -24,6 +24,7 @@ #include "config_build.h" #include "verilatedos.h" #include "V3Error.h" +#include "V3FileLine.h" class V3ParseImp; class V3InFilter; diff --git a/src/V3Stats.h b/src/V3Stats.h index 59fe5a80e..df49adf2d 100644 --- a/src/V3Stats.h +++ b/src/V3Stats.h @@ -23,7 +23,8 @@ #include "config_build.h" #include "verilatedos.h" #include "V3Error.h" -#include "V3Ast.h" + +class AstNetlist; //============================================================================