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

Internals: Remove one of many ERROR define conflicts

This commit is contained in:
Wilson Snyder 2010-02-01 06:40:30 -05:00
parent fc2834cf04
commit 59261113d8
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
readme.pod
View File

@ -41,13 +41,14 @@ The resulting executable will perform the actual simulation.
=head1 SUPPORTED SYSTEMS =head1 SUPPORTED SYSTEMS
This version of verilator has been built and tested on: Verilator is developed and has primary testing on:
SuSE 11.1 AMD64 i686-linux-2.6.27, GCC 4.3.2 SuSE 11.1 AMD64 i686-linux-2.6.27, GCC 4.3.2
Other users report success with Redhat Linux, Windows under Cygwin, Windows Versions have also built on Redhat Linux, Windows under Cygwin, Macs, HPUX
under MinGW, Macs, HPUX and Solaris. It should run with minor porting on and Solaris. It should run with minor porting on any Linix-ish platform.
any Linix-ish platform. Verilator also works on Windows under MinGW (gcc -mno-cygwin). Verilated
output (not Verilator itself) compiles under MSVC++ 2008.
=head1 INSTALLATION =head1 INSTALLATION

4
src/V3Options.cpp
View File

@ -144,13 +144,13 @@ string V3Options::allArgsString() {
V3LangCode::V3LangCode (const char* textp) { V3LangCode::V3LangCode (const char* textp) {
// Return code for given string, or ERROR, which is a bad code // Return code for given string, or ERROR, which is a bad code
for (int codei=V3LangCode::ERROR; codei<V3LangCode::MAX; ++codei) { for (int codei=V3LangCode::L_ERROR; codei<V3LangCode::MAX; ++codei) {
V3LangCode code = (V3LangCode)codei; V3LangCode code = (V3LangCode)codei;
if (0==strcasecmp(textp,code.ascii())) { if (0==strcasecmp(textp,code.ascii())) {
m_e = code; return; m_e = code; return;
} }
} }
m_e = V3LangCode::ERROR; m_e = V3LangCode::L_ERROR;
} }
//###################################################################### //######################################################################

6
src/V3Options.h
View File

@ -37,7 +37,7 @@
class V3LangCode { class V3LangCode {
public: public:
enum en { enum en {
ERROR, // Must be first. L_ERROR, // Must be first.
L1364_1995, L1364_1995,
L1364_2001, L1364_2001,
L1364_2005, L1364_2005,
@ -59,10 +59,10 @@ public:
return names[m_e]; return names[m_e];
}; };
static V3LangCode mostRecent() { return V3LangCode(L1800_2009); } static V3LangCode mostRecent() { return V3LangCode(L1800_2009); }
bool legal() const { return m_e != ERROR; } bool legal() const { return m_e != L_ERROR; }
// //
enum en m_e; enum en m_e;
inline V3LangCode () : m_e(ERROR) {} inline V3LangCode () : m_e(L_ERROR) {}
inline V3LangCode (en _e) : m_e(_e) {} inline V3LangCode (en _e) : m_e(_e) {}
V3LangCode (const char* textp); // Return matching code or ERROR V3LangCode (const char* textp); // Return matching code or ERROR
explicit inline V3LangCode (int _e) : m_e(static_cast<en>(_e)) {} explicit inline V3LangCode (int _e) : m_e(static_cast<en>(_e)) {}