Version bump

git-svn-id: file://localhost/svn/verilator/trunk/verilator@1006 77ca24e4-aefa-0310-84f0-b9a241c72d87

Changes

@@ -3,6 +3,31 @@ Revision history for Verilator
 The contributors that suggested a given feature are shown in [].  [by ...]
 indicates the contributor was also the author of the fix; Thanks!
 
+* Verilator 3.660 2008/03/23
+
+***  Add support for hard-coding VERILATOR_ROOT etc in the executables,
+     to enable easier use of Verilator RPMs.  [Gunter Dannoritzer]
+
+***  Allow multiple .v files on command line.  [Stefan Thiede]
+
+***  Convert re-defining macro error to warning.  [Stefan Thiede]
+
+***  Add --error-limit option.  [Stefan Thiede]
+
+***  Allow __ in cell names by quoting them in C.  [Stefan Thiede]
+
+**** Fix genvar to be signed, so "< 0" works properly.  [Niranjan Prabhu]
+
+**** Fix assignments to inputs inside functions/tasks.  [Patricio Kaplan]
+
+**** Fix definitions in main file.v, referenced in library.  [Stefan Thiede]
+
+**** Fix undefined assigns to be implicit warnings. [Stefan Thiede]
+
+* Verilator 3.658 2008/02/25
+
+**** Fix unistd compile error in 3.657.  [Patricio Kaplan, Jonathan Kimmitt]
+
 * Verilator 3.657 2008/02/20
 
 **** Fix assignments of {a,b,c} = {c,b,a}.  [Jonathan Kimmitt]

Makefile.in

@@ -78,6 +78,7 @@ datadir = @datadir@
 infodir = @infodir@
 
 # Directory in which to install package specific files
+# Generally ${prefix}/share/verilator
 pkgdatadir = @pkgdatadir@
 
 #### End of system configuration section. ####
@@ -140,6 +141,7 @@ msg_test:
 	@echo "Type 'make test' to test."
 	@echo
 
+.PHONY:test
 ifeq ($(VERILATOR_AUTHOR_SITE),1)	# Local... Else don't burden users
 test: test_vcs test_c test_sc test_sp test_verilated test_regress
 else
@@ -203,21 +205,31 @@ README: readme.texi
 	$(MAKEINFO) -I$(srcdir) $(srcdir)/readme.texi --output=$@ \
 	--no-headers --no-validate
 
-installdirs:
-	$(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir)
-
 # See uninstall also
-VL_INST_BIN_FILES = verilator
+VL_INST_BIN_FILES = verilator verilator_bin verilator_bin_dbg
 installbin:
+	$(SHELL) ${srcdir}/mkinstalldirs $(bindir)
 	( cd bin ; $(INSTALL_PROGRAM) verilator $(bindir)/verilator )
+	( $(INSTALL_PROGRAM) verilator_bin $(bindir)/verilator_bin )
+	( $(INSTALL_PROGRAM) verilator_bin_dbg $(bindir)/verilator_bin_dbg )
 
 VL_INST_MAN_FILES = verilator.1
 installman:
+	$(SHELL) ${srcdir}/mkinstalldirs $(mandir)
 	for p in $(VL_INST_MAN_FILES) ; do \
 	  $(INSTALL_PROGRAM) $$p $(mandir)/man1/$$p; \
 	done
 
-install: all_nomsg installdirs installbin installman install-msg
+installdata:
+	$(SHELL) ${srcdir}/mkinstalldirs $(pkgdatadir)/examples
+	cp -r include $(pkgdatadir)
+	cp -r src     $(pkgdatadir)
+	cp -r test_c  $(pkgdatadir)/examples
+	cp -r test_sc $(pkgdatadir)/examples
+	cp -r test_sp $(pkgdatadir)/examples
+
+VL_INST_DATA_FILES = verilator.1
+install: all_nomsg installbin installman installdata install-msg
 
 install-here: installman ftp
 
@@ -263,6 +275,7 @@ install-msg:
 uninstall:
 	-cd $(mandir)/man1 && rm -f $(VL_INST_MAN_FILES)
 	-cd $(bindir) && rm -f $(VL_INST_BIN_FILES)
+	-rm -f $(pkgdatadir)
 
 # autoheader might not change config_build.h.in, so touch a stamp file.
 IN_WILD := ${srcdir}/*.in ${srcdir}/*/*.in ${srcdir}/*/*/*.in \

bin/verilator

@@ -34,27 +34,7 @@ use Config;
 use Cwd qw(abs_path getcwd);
 
 use strict;
-use vars qw ($Debug %Vars $Opt $Opt_Make_Dir $Opt_Sp @Opt_Verilator_Sw
+use vars qw ($Debug @Opt_Verilator_Sw);
-	     $Opt_Trace
-	     %Modules
-	     );
-
-#######################################################################
-# Global constants -- Configuration info
-
-# Where to find real executables
-# We could find it by using $RealBin, but we require this path
-# so that when the user runs make, they will have it and not get strange error.
-$ENV{VERILATOR_ROOT} or die "%Error: verilator: VERILATOR_ROOT needs to be in environment\n";
-print "export VERILATOR_ROOT=$ENV{VERILATOR_ROOT}\n" if $Debug;
-
-# Read by verilator for populating makefile
-if (!defined $ENV{SYSTEMC_ARCH}) {
-    $ENV{SYSTEMC_ARCH} ||= (($Config{osname} =~ /solaris/i && "gccsparcOS5")
-			    || ($Config{osname} =~ /cygwin/i && "cygwin")
-			    || "linux");
-    print "export SYSTEMC_ARCH=$ENV{SYSTEMC_ARCH}\n" if $Debug;
-}
 
 #######################################################################
 #######################################################################
@@ -65,7 +45,6 @@ autoflush STDERR 1;
 
 $Debug = 0;
 my $opt_gdb;
-$Opt_Sp = undef;
 
 # No arguments can't do anything useful.  Give help
 if ($#ARGV < 0) {
@@ -84,34 +63,15 @@ if (! GetOptions (
 		  # Major operating modes
 		  "help"	=> \&usage,
 		  "debug:s"	=> \&debug,
-		  "version!"	=> \&version,
+		  # "version!"	=> \&version,	# Also passthru'ed
 		  # Switches
 		  "gdb=s"	=> \$opt_gdb,	# Undocumented debugging
-		  "trace!"	=> \$Opt_Trace,
-		  "sp!"		=> sub {$Opt_Sp = 'sp';},
-		  "sc!"		=> sub {$Opt_Sp = 'sc';},
-		  "cc!"		=> sub {$Opt_Sp = 0;},
-		  "lint-only!"	=> sub {$Opt_Sp = 0;},
-		  #"ignc!"	=> ...,		# Undocumented debugging, disable $c but don't complain
 		  # Additional parameters
 		  "<>"		=> sub {},	# Ignored
 		  )) {
     pod2usage(-exitstatus=>2, -verbose=>0);
 }
 
-# Check configuration
-if ($Opt_Sp) {
-    (defined $ENV{SYSTEMC}) or die "%Error: verilator: Need \$SYSTEMC in environment\nProbably System-C isn't installed, see http://www.systemc.org\n";
-}
-if ($Opt_Sp eq 'sp' || $Opt_Trace) {
-    if (!defined $ENV{SYSTEMPERL}) {
-	my $try = "$ENV{W}/hw/utils/perltools/SystemC";
-	$ENV{SYSTEMPERL} = $try if -d $try;
-    }
-    (defined $ENV{SYSTEMPERL}) or die "%Error: verilator: Need \$SYSTEMPERL in environment for --sp or --trace\nProbably System-Perl isn't installed, see http://www.veripool.com/systemperl.html\n";
-    (-d "$ENV{SYSTEMPERL}/src") or die "%Error: verilator: \$SYSTEMPERL environment var doesn't seem to point to System-Perl kit\n";
-}
-
 # Determine runtime flags
 my $vcmd =(($opt_gdb?"$opt_gdb ":"")
 	   .verilator_bin()
@@ -124,7 +84,6 @@ run ($vcmd);
 #----------------------------------------------------------------------
 
 sub usage {
-    bin_version();
     print '$Revision$$Date$ ', "\n";
     pod2usage(-exitstatus=>2, -verbose=>2);
 }
@@ -135,23 +94,16 @@ sub debug {
     $Debug = $level||3;
 }
 
-sub version {
-    bin_version();
-    exit (0);
-}
-
-sub bin_version {
-    ($ENV{VERILATOR_ROOT}) or print "%Warning: Unknown rev: VERILATOR_ROOT undefined\n";
-    run (verilator_bin()." --version");
-}
-
 #######################################################################
 #######################################################################
 # Builds
 
 sub verilator_bin {
-    my $bin = "$ENV{VERILATOR_ROOT}/".($ENV{VERILATOR_BIN}||"verilator_bin");
+    my $bin = "";
-    if ($Debug && -x "${bin}_dbg") { $bin = "${bin}_dbg"; }
+    # Use VERILATOR_ROOT if defined, else assume verilator_bin is in the search path
+    $bin .= $ENV{VERILATOR_ROOT}."/" if defined($ENV{VERILATOR_ROOT});
+    $bin .= ($ENV{VERILATOR_BIN}||"verilator_bin");
+    if ($Debug) { $bin = "${bin}_dbg"; }
     return $bin;
 }
 
@@ -166,8 +118,11 @@ sub run {
     system($command);
     my $status = $?;
     if ($status) {
+	if ($! =~ /no such file or directory/i) {
+	    warn "%Error: verilator: Misinstalled, or VERILATOR_ROOT might need to be in environment\n";
+	}
 	if ($Debug) {  # For easy rerunning
-	    warn "%Error: export VERILATOR_ROOT=$ENV{VERILATOR_ROOT}\n";
+	    warn "%Error: export VERILATOR_ROOT=".($ENV{VERILATOR_ROOT}||"")."\n";
 	    warn "%Error: $command\n";
 	}
 	die "%Error: Command Failed $command\n";
@@ -235,6 +190,7 @@ descriptions in the next sections for more information.
     --debug-check               Enable debugging assertions
     --dump-tree                 Enable dumping .tree files
     -E                          Preprocess, but do not compile
+    --error-limit <value>	Abort after this number of errors
     --exe                       Link to create executable
     -f <file>                   Parse options from a file
     --help                      Display this help.
@@ -393,6 +349,11 @@ Preprocess the source code, but do not compile, as with 'gcc -E'.  Output
 is written to standard out.  Beware of enabling debugging messages, as they
 will also go to standard out.
 
+=item --error-limit <value>
+
+After this number of errors or warnings are encountered, exit.  Defaults to
+50.
+
 =item --exe
 
 Generate a executable.  You will also need to pass additional .cpp files on
@@ -490,8 +451,8 @@ the backward-compatible default of sc_bv's.
 
 =item --prefix I<topname>
 
-Specifies the name of the top level class.  Defaults to the name of the top
+Specifies the name of the top level class.  Defaults to the name of the first
-level Verilog module.
+Verilog file passed on the command line.
 
 =item --profile-cfuncs
 
@@ -872,14 +833,16 @@ After running Make, the C++ compiler should produce the following:
 
 Required for SystemC output mode.  If set, specifies the directory
 containing the SystemC distribution.  This is used to find the SystemC
-include files.
+include files.  If not specified, it will come from a default optionally
+specified at configure time (before Verilator was compiled).
 
 =item SYSTEMC_ARCH
 
 Specifies the architecture name used by the SystemC kit.  This is the part
 after the dash in the lib-{...} directory name created by a 'make' in the
 SystemC distribution.  If not set, Verilator will try to intuit the proper
-setting.
+setting, or use the default optionally specified at configure time (before
+Verilator was compiled).  .
 
 =item SYSTEMC_CXX_FLAGS
 
@@ -889,7 +852,9 @@ building the SystemC model.
 =item SYSTEMPERL
 
 Specifies the directory containing the Verilog-Perl distribution kit.  This
-is used to find the Verilog-Perl library and include files.
+is used to find the Verilog-Perl library and include files.  If not
+specified, it will come from a default optionally specified at configure
+time (before Verilator was compiled).
 
 =item VCS_HOME
 
@@ -905,7 +870,9 @@ for debugging and selecting between multiple operating system builds.
 =item VERILATOR_ROOT
 
 Specifies the directory containing the distribution kit.  This is used to
-find the executable, Perl library, and include files.
+find the executable, Perl library, and include files.  If not specified, it
+will come from a default optionally specified at configure time (before
+Verilator was compiled).
 
 =back
 
@@ -1734,6 +1701,23 @@ not really needed.  The best solution is to insure that each module is in a
 unique file by the same name.  Otherwise, make sure all library files are
 read in as libraries with -v, instead of automatically with -y.
 
+=item REDEFMACRO
+
+Warns that you have redefined the same macro with a different value, for
+example:
+
+    `define MACRO def1
+    //...
+    `define MACRO otherdef
+
+The best solution is to use a different name for the second macro.  If this
+is not possible, add a undef to indicate the code is overriding the value:
+
+    `define MACRO def1
+    //...
+    `undef MACRO
+    `define MACRO otherdef
+
 =item STMTDLY
 
 Warns that you have a statement with a delayed time in front of it, for
@@ -1944,11 +1928,14 @@ Visual C++ Version 7 or newer, but this is not tested by the author.
 
 =item Can you provide binaries?
 
-At this time I'd prefer to get patches out quickly than have to generate
+Verilator is available as a RPM for SuSE and perhaps other systems; this is
-myriad binaries for many different OS flavors.  People have generally
+done by porters and may slightly lag the primary distribution.  If there
-requested binaries when they are having problems with their C++
+isn't a binary build for your distribution, how about you set one up?
-compiler. Alas, binaries won't help this, as in the end a fully working C++
+Please contact the authors for assistance.
-compiler is required to compile the output of Verilator.
+
+Note people sometimes request binaries when they are having problems with
+their C++ compiler. Alas, binaries won't help this, as in the end a fully
+working C++ compiler is required to compile the output of Verilator.
 
 =item How can it be faster than (name-the-simulator)?
 
@@ -2031,15 +2018,24 @@ the "verilator" define for you, so just wrap the code in a ifndef region:
 
 =item Why do I get "unexpected `do'" or "unexpected `bit'" errors?
 
-Do, bit, ref, and other words are now SystemVerilog keywords.  You should
+Do, bit, ref, return, and other words are now SystemVerilog keywords.  You
-change your code to not use them to insure it works with newer tools.
+should change your code to not use them to insure it works with newer
-Alternatively, surround them by the Verilog 2005/SystemVerilog
+tools.  Alternatively, surround them by the Verilog 2005/SystemVerilog
 begin_keywords pragma to indicate Verilog 2001 code.
 
    `begin_keywords "1364-2001"
       integer bit; initial bit = 1;
    `end_keywords
 
+If you want the whole file to be parsed as Verilog 2001, just create a
+file with
+
+   `begin_keywords "1364-2001"
+
+and add it before other Verilog files on the command line.  (Note this will
+also change the default for --prefix, so if you're not using --prefix, you
+will now need to.)
+
 =item How do I prevent my assertions from firing during reset?
 
 Call Verilated::assertOn(false) before you first call the model, then turn

configure.ac

@@ -9,6 +9,10 @@ AC_INIT(src/Verilator.cpp)
 AC_CONFIG_HEADER(src/config_build.h)
 
 dnl Special Substitutions
+AC_ARG_ENABLE(defenv,
+   [AS_HELP_STRING([--enable-defenv], [hardcode default environment variables])],
+   CFG_WITH_DEFENV=1,)
+AC_SUBST(CFG_WITH_DEFENV)
 
 dnl Checks for programs.
 CXX=g++

readme.texi

@@ -126,6 +126,12 @@ do a @code{make sc_patch}.
 @item
 Type @samp{./configure} to configure Verilator for your system.
 
+If you are configuring Verilator to be part of a RPM or other
+distribution package system, you may want to use the --enable-defenv
+configure flag.  This will take the current value of VERILATOR_ROOT,
+SYSTEMC, SYSTEMC_ARCH, and SYSTEMPERL and build them as defaults into
+the executable.
+
 @item
 Type @samp{make} to compile Verilator.
 

src/Makefile_obj.in

@@ -30,6 +30,14 @@ LINK = @CXX@
 
 LDFLAGS += @LDFLAGS@
 
+CFG_WITH_DEFENV = @CFG_WITH_DEFENV@
+
+prefix = @prefix@
+
+# Directory in which to install package specific files
+# Generally ${prefix}/share/verilator
+pkgdatadir = @pkgdatadir@
+
 #### End of system configuration section. ####
 
 VPATH += . $(srcdir)
@@ -70,6 +78,19 @@ CPPFLAGS += -W -Wall -Wno-unused-parameter -Wno-char-subscripts -Werror
 #CPPFLAGS += -pedantic-errors
 endif
 
+# Allow RPM builds to specify hardcoded data directories
+# To do this:
+ifneq ($(CFG_WITH_DEFENV),)
+ CPPFLAGS += -DDEFENV_SYSTEMC=\"$(SYSTEMC)\"
+ CPPFLAGS += -DDEFENV_SYSTEMC_ARCH=\"$(SYSTEMC_ARCH)\"
+ CPPFLAGS += -DDEFENV_SYSTEMPERL=\"$(SYSTEMPERL)\"
+ ifeq ($(VERILATOR_ROOT),)	# Use what we're given, or intuit
+  CPPFLAGS += -DDEFENV_VERILATOR_ROOT=\"$(pkgdatadir)\"
+ else
+  CPPFLAGS += -DDEFENV_VERILATOR_ROOT=\"$(VERILATOR_ROOT)\"
+ endif
+endif
+
 HEADERS = $(wildcard V*.h v*.h)
 
 ASTGEN = $(srcdir)/astgen

src/V3Ast.cpp

@@ -83,6 +83,20 @@ void AstNode::init() {
     m_user5Cnt = 0;
 }
 
+string AstNode::encodeName(const string& namein) {
+    string name2 = namein;
+    string out;
+    for (string::iterator pos = name2.begin(); pos != name2.end(); pos++) {
+	if (pos[0]=='_' && pos[1]=='_') {
+	    out += "__ULUL_";
+	    pos++;
+	} else {
+	    out += pos[0];
+	}
+    }
+    return out;
+}
+
 string AstNode::shortName() const {
     string pretty = name();
     string::size_type pos;
@@ -114,6 +128,9 @@ string AstNode::prettyName(const string& namein) {
     while ((pos=pretty.find("__PVT__")) != string::npos) {
 	pretty.replace(pos, 7, "");
     }
+    while ((pos=pretty.find("__ULUL_")) != string::npos) {
+	pretty.replace(pos, 7, "");
+    }
     return AstNode::dedotName(pretty);
 }
 

src/V3Ast.h

@@ -558,6 +558,7 @@ public:
     string 	shortName() const;	// Name with __PVT__ removed for concatenating scopes
     static string dedotName(const string& namein);	// Name with dots removed
     static string prettyName(const string& namein);	// Name for printing out to the user
+    static string encodeName(const string& namein);	// Encode user name into internal C representation
     string	prettyName() const { return prettyName(name()); }
     FileLine*	fileline() const { return m_fileline; }
     int		width() const { return m_width; }

src/V3EmitMk.cpp

@@ -79,16 +79,16 @@ public:
 	    of.puts("default: "+v3Global.opt.prefix()+"__ALL.a\n");
 	}
 	of.puts("\n# Constants...\n");
-	of.puts("PERL = "+V3Options::getenvStr("PERL","perl")+"\n");
+	of.puts("PERL = "+V3Options::getenvPERL()+"\n");
-	of.puts("VERILATOR_ROOT = "+V3Options::getenvStr("VERILATOR_ROOT","")+"\n");
+	of.puts("VERILATOR_ROOT = "+V3Options::getenvVERILATOR_ROOT()+"\n");
-	of.puts("SYSTEMPERL = "+V3Options::getenvStr("SYSTEMPERL","")+"\n");
+	of.puts("SYSTEMPERL = "+V3Options::getenvSYSTEMPERL()+"\n");
 
 	of.puts("\n# Switches...\n");
 	of.puts(string("VM_SP = ")+(v3Global.opt.systemPerl()?"1":"0")+"\n");
 	of.puts(string("VM_SC = ")+((v3Global.opt.systemC()&&!v3Global.opt.systemPerl())?"1":"0")+"\n");
 	of.puts(string("VM_SP_OR_SC = ")+(v3Global.opt.systemC()?"1":"0")+"\n");
 	of.puts(string("VM_PCLI = ")+(v3Global.opt.systemC()?"0":"1")+"\n");
-	of.puts(string("VM_SC_TARGET_ARCH = ")+V3Options::getenvStr("SYSTEMC_ARCH","")+"\n");
+	of.puts(string("VM_SC_TARGET_ARCH = ")+V3Options::getenvSYSTEMC_ARCH()+"\n");
 
 	of.puts("\n# Vars...\n");
 	of.puts(string("VM_PREFIX = ")+v3Global.opt.prefix()+"\n");

src/V3Error.cpp

@@ -243,8 +243,8 @@ void V3Error::incWarnings() {
 
 void V3Error::incErrors() {
     s_errCount++;
-    if (errorCount() == MAX_ERRORS) {  // Not >= as would otherwise recurse
+    if (errorCount() == v3Global.opt.errorLimit()) {  // Not >= as would otherwise recurse
-	v3fatal ("Exiting due to too many errors encountered\n");
+	v3fatal ("Exiting due to too many errors encountered; --error-limit="<<errorCount()<<endl);
     }
 }
 

src/V3Error.h

@@ -53,6 +53,7 @@ public:
 	IMPLICIT,	// Implicit wire
 	IMPURE,		// Impure function not being inlined
 	MULTIDRIVEN,	// Driven from multiple blocks
+	REDEFMACRO,	// Redefining existing define macro
 	UNDRIVEN,	// No drivers
 	UNOPT,		// Unoptimizable block
 	UNOPTFLAT,	// Unoptimizable block after flattening
@@ -78,7 +79,7 @@ public:
 	    "BLKANDNBLK",
 	    "CASEINCOMPLETE", "CASEOVERLAP", "CASEX", "CMPCONST",
 	    "COMBDLY", "STMTDLY", "GENCLK", "IMPLICIT", "IMPURE",
-	    "MULTIDRIVEN",
+	    "MULTIDRIVEN", "REDEFMACRO",
 	    "UNDRIVEN", "UNOPT", "UNOPTFLAT", "UNSIGNED", "UNUSED",
 	    "VARHIDDEN", "WIDTH",
 	    " MAX"

src/V3GraphDfa.cpp

@@ -480,3 +480,97 @@ public:
 void DfaGraph::dfaReduce() {
     DfaGraphReduce (this, &V3GraphEdge::followAlwaysTrue);
 }
+
+//######################################################################
+//######################################################################
+// Algorithms - complement a DFA
+//
+// The traditional algorithm is to make a rejecting state, add edges to
+// reject from all missing values, then swap accept and reject.  Rather
+// than swap at the end, it's faster if we swap up front, then do the edge
+// changes.
+//
+// 1. Since we didn't log rejecting states, make a temp state (this will be
+// the old accept, and new reject).
+//
+// 2. All vertexes except start/accept get edges to NEW accept for any
+// non-existing case.  Weedely we don't have a nice way of representing
+// this so we just create a edge for each case and mark it "complemented."
+// 
+// 3. Delete temp vertex (old accept/new reject) and related edges.
+// The user's old accept is now the new accept.  This is imporant as
+// we want the virtual type of it to be intact.
+
+class DfaGraphComplement : GraphAlg {
+private:
+    // MEMBERS
+    DfaVertex* m_tempNewerReject;
+
+    // METHODS
+    int debug() { return 9; }
+    DfaGraph* graphp() { return static_cast<DfaGraph*>(m_graphp); }
+
+    void add_complement_edges() {
+	// Find accepting vertex
+	DfaVertex* acceptp = NULL;
+ 	for (V3GraphVertex* vertexp = m_graphp->verticesBeginp(); vertexp; vertexp=vertexp->verticesNextp()) {
+	    if (DfaVertex* vvertexp = dynamic_cast<DfaVertex*>(vertexp)) {
+		if (vvertexp->accepting()) {
+		    acceptp = vvertexp;
+		    break;
+		}
+	    }
+	}
+ 	if (!acceptp) v3fatalSrc("No accepting vertex in DFA\n");
+
+	// Remap edges
+	for (V3GraphVertex* vertexp = m_graphp->verticesBeginp(); vertexp; vertexp=vertexp->verticesNextp()) {
+	    if (DfaVertex* vvertexp = dynamic_cast<DfaVertex*>(vertexp)) {
+		//UINFO(9, "   on vertex "<<vvertexp->name()<<endl);
+		if (!vvertexp->accepting() && vvertexp != m_tempNewerReject) {
+		    for (V3GraphEdge* nextp, *edgep = vertexp->outBeginp(); edgep; edgep=nextp) {
+			nextp = edgep->outNextp();
+			if (!edgep->user()) { // Not processed
+			    // Old edges to accept now go to new reject
+			    DfaEdge* vedgep = static_cast<DfaEdge*>(edgep);
+			    DfaVertex* tovertexp = static_cast<DfaVertex*>(edgep->top());
+			    if (tovertexp->accepting()) {
+				new DfaEdge(graphp(), vvertexp, m_tempNewerReject, vedgep);
+				edgep->unlinkDelete(); edgep=NULL;
+			    }
+
+			    // NOT of all values goes to accept
+			    // We make a edge for each value to OR, IE
+			    // edge(complemented,a) edge(complemented,b) means !(a | b)
+			    if (!tovertexp->accepting()) {  // Note we must include edges moved above to reject
+				DfaEdge* newp = new DfaEdge (graphp(), vvertexp, acceptp, vedgep);
+				newp->complement(!newp->complement());
+				newp->user(1);
+			    }
+			}
+		    }
+		}
+	    }
+	}
+    }
+public:
+    DfaGraphComplement(V3Graph* dfagraphp, V3EdgeFuncP edgeFuncp)
+	: GraphAlg(dfagraphp, edgeFuncp) {
+	if (debug()>=6) m_graphp->dumpDotFilePrefixed("comp_in");
+
+	// Vertex::m_user begin: 1 indicates new edge, no more processing
+	m_graphp->userClearEdges();
+
+	m_tempNewerReject = new DfaVertex(graphp());
+	add_complement_edges();
+	if (debug()>=6) m_graphp->dumpDotFilePrefixed("comp_preswap");
+
+	m_tempNewerReject->unlinkDelete(graphp()); m_tempNewerReject=NULL;
+	if (debug()>=6) m_graphp->dumpDotFilePrefixed("comp_out");
+    }
+    ~DfaGraphComplement() {}
+};
+
+void DfaGraph::dfaComplement() {
+    DfaGraphComplement (this, &V3GraphEdge::followAlwaysTrue);
+}

src/V3GraphDfa.h

@@ -43,7 +43,9 @@ class DfaEdge;
 /// or epsilon, represented as a empty list of inputs.
 ///
 /// We're only looking for matches, so the only accepting states are
-/// at the end of the transformations.
+/// at the end of the transformations.  (If we want the complement, we
+/// call complement and the algorithm makes a REJECT state, then flips
+/// accept and reject for you.)
 ///	
 /// Common transforms:
 ///
@@ -51,8 +53,8 @@ class DfaEdge;
 ///
 ///	"L":	...->[ON_L]-->DfaVtx-->[epsilon]-->DfaVtx(ACCEPT)
 ///
-///	"LR":	...->[ON_L]-->DfaVtx-->[epsilon]-->DfaVtx()
+///	"LR":	...->[ON_L]-->DfaVtx-->[epsilon]-->DfaVtx(ACCEPT)
-///		   ->[ON_R]-->DfaVtx-->[epsilon]-->DfaVtx(ACCEPT)
+///		   ->[ON_R]-->DfaVtx-->[epsilon]-/
 ///
 ///	"L|R":	...->DfaVtx-->[epsilon]-->DfaVtx-->[ON_L]-->DfaVtx()->[epsilon]-->DfaVtx(ACCEPT)
 ///			   \->[epsilon]-->DfaVtx-->[ON_R]-->DfaVtx()->[epsilon]-/
@@ -76,6 +78,9 @@ public:
 
     /// Simplify a DFA automata
     void dfaReduce();
+
+    /// Complement result (must already be dfa)
+    void dfaComplement();
 };
 
 //=============================================================================
@@ -113,20 +118,33 @@ typedef AstNUser* DfaInput;
 
 class DfaEdge : public V3GraphEdge {
     DfaInput	m_input;
+    bool	m_complement;	// Invert value when doing compare
 public:
     static DfaInput EPSILON() { return NULL; }
     static DfaInput NA() { return AstNUser::fromInt(1); }	// as in not-applicable
     // CONSTRUCTORS
     DfaEdge(DfaGraph* graphp, DfaVertex* fromp, DfaVertex* top, DfaInput input)
 	: V3GraphEdge(graphp, fromp, top, 1)
-	, m_input(input) {}
+	, m_input(input), m_complement(false) {}
+    DfaEdge(DfaGraph* graphp, DfaVertex* fromp, DfaVertex* top, const DfaEdge* copyfrom)
+	: V3GraphEdge(graphp, fromp, top, copyfrom->weight())
+	, m_input(copyfrom->input()), m_complement(copyfrom->complement()) {}
     virtual ~DfaEdge() {}
     // METHODS
-    virtual string dotColor() const { return na()?"yellow":epsilon()?"green":"black"; }
+    virtual string dotColor() const {
-    virtual string dotLabel() const { return na()?"":epsilon()?"e":cvtToStr((void*)(input())); }
+	return (na() ? "yellow"
+		: epsilon() ? "green"
+		: "black"); }
+    virtual string dotLabel() const {
+	return (na() ? ""
+		: epsilon() ? "e"
+		: complement() ? ("not "+cvtToStr((void*)(input())))
+		: cvtToStr((void*)(input()))); }
     virtual string dotStyle() const { return (na()||cutable())?"dashed":""; }
     bool epsilon() const { return input()==EPSILON(); }
     bool na() const { return input()==NA(); }
+    bool complement() const { return m_complement; }
+    void complement(bool value) { m_complement=value; }
     DfaInput	input() const { return m_input; }
 };
 

src/V3GraphTest.cpp

@@ -309,6 +309,12 @@ public:
 	gp->nfaToDfa();
 	dump();
 	gp->dfaReduce();
+	dump();
+
+	gp->dfaComplement();
+	dump();
+	gp->dfaReduce();
+	dump();
     }
 };
 

src/V3Link.cpp

@@ -381,10 +381,10 @@ private:
 
     virtual void visit(AstAssignW* nodep, AstNUser*) {
 	// Deal with implicit definitions
-	if (nodep->allowImplicit()) {
+	// We used to nodep->allowImplicit() here, but it turns out
-	    if (AstVarRef* forrefp = nodep->lhsp()->castVarRef()) {
+	// normal "assigns" can also make implicit wires.  Yuk.
-		createImplicitVar(forrefp, false);
+	if (AstVarRef* forrefp = nodep->lhsp()->castVarRef()) {
-	    }
+	    createImplicitVar(forrefp, false);
 	}
 	nodep->iterateChildren(*this);
     }

src/V3LinkCells.cpp

@@ -127,9 +127,6 @@ private:
 	// Module: Pick up modnames, so we can resolve cells later
 	m_modp = nodep;
 	UINFO(2,"Link Module: "<<nodep<<endl);
-	if (nodep->name().find("__") != string::npos) {
-	    nodep->v3error("Unsupported: Double underscores (__) in module names reserved for internal use: "<<nodep->prettyName());
-	}
 	if (nodep->inLibrary()) {
 	    if (!m_libVertexp) m_libVertexp = new LibraryVertex(&m_graph);
 	    new V3GraphEdge(&m_graph, m_libVertexp, vertex(nodep), 1, false);

src/V3LinkLValue.cpp

@@ -45,6 +45,7 @@ private:
 
     // STATE
     bool	m_setRefLvalue;	// Set VarRefs to lvalues for pin assignments
+    AstNodeFTask* m_ftaskp;	// Function or task we're inside
 
     //int debug() { return 9; }
 
@@ -59,7 +60,9 @@ private:
 	}
 	if (nodep->varp()) {
 	    if (nodep->lvalue() && nodep->varp()->isInOnly()) {
-		nodep->v3error("Assigning to input variable: "<<nodep->prettyName());
+		if (!m_ftaskp) {
+		    nodep->v3error("Assigning to input variable: "<<nodep->prettyName());
+		}
 	    }
 	}
 	nodep->iterateChildren(*this);
@@ -150,6 +153,11 @@ private:
 	}
 	m_setRefLvalue = last_setRefLvalue;
     }
+    virtual void visit(AstNodeFTask* nodep, AstNUser*) {
+	m_ftaskp = nodep;
+	nodep->iterateChildren(*this);
+	m_ftaskp = NULL;
+    }
 
     virtual void visit(AstNode* nodep, AstNUser*) {
 	// Default: Just iterate
@@ -160,6 +168,7 @@ public:
     // CONSTUCTORS
     LinkLValueVisitor(AstNetlist* rootp) {
 	m_setRefLvalue = false;
+	m_ftaskp = NULL;
 	rootp->accept(*this);
     }
     virtual ~LinkLValueVisitor() {}

src/V3Options.cpp

@@ -23,7 +23,10 @@
 #include "verilatedos.h"
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/utsname.h>
+#include <ctype.h>
 #include <dirent.h>
+#include <unistd.h>
 #include <set>
 #include <list>
 #include <map>
@@ -97,6 +100,11 @@ void V3Options::addLibraryFile(const string& filename) {
 	m_libraryFiles.insert(filename);
     }
 }
+void V3Options::addVFile(const string& filename) {
+    if (m_vFiles.find(filename) == m_vFiles.end()) {
+	m_vFiles.insert(filename);
+    }
+}
 void V3Options::addArg(const string& arg) {
     m_impp->m_allArgs.push_back(arg);
 }
@@ -146,6 +154,14 @@ string V3Options::filenameNonExt (const string& filename) {
     return base;
 }
 
+bool V3Options::fileStatDir(const string& filename) {
+    struct stat	m_stat;		// Stat information
+    int err = stat(filename.c_str(), &m_stat);
+    if (err!=0) return false;
+    if (!S_ISDIR(m_stat.st_mode)) return false;
+    return true;
+}
+
 bool V3Options::fileStatNormal(const string& filename) {
     struct stat	m_stat;		// Stat information
     int err = stat(filename.c_str(), &m_stat);
@@ -238,6 +254,96 @@ void V3Options::unlinkRegexp(const string& dir, const string& regexp) {
     }
 }
  
+//######################################################################
+// Environment
+
+string V3Options::getenvStr(const char* envvar, const char* defaultValue) {
+	if (const char* envvalue = getenv(envvar)) {
+	    return envvalue;
+	} else {
+	    return defaultValue;
+	}
+    }
+string V3Options::getenvSYSTEMC() {
+    string var = getenvStr("SYSTEMC","");
+    if (var == "" && string(DEFENV_SYSTEMC) != "") {
+	var = DEFENV_SYSTEMC;
+	UINFO(1,"export SYSTEMC="<<var<<" # Hardcoded at build time"<<endl);
+	setenv("SYSTEMC", var.c_str(), false);
+    }
+    // Only correct or check it if we really need the value
+    if ((v3Global.opt.systemPerl() || v3Global.opt.systemC())
+	&& !v3Global.opt.lintOnly()) {
+	if (var == "") {
+	    v3fatal("Need $SYSTEMC in environment\n"
+		    "Probably System-C isn't installed, see http://www.systemc.org\n");
+	}
+    }
+    return var;
+}
+string V3Options::getenvSYSTEMC_ARCH() {
+    string var = getenvStr("SYSTEMC_ARCH","");
+    if (var == "" && string(DEFENV_SYSTEMC_ARCH) != "") {
+	var = DEFENV_SYSTEMC_ARCH;
+	UINFO(1,"export SYSTEMC_ARCH="<<var<<" # Hardcoded at build time"<<endl);
+	setenv("SYSTEMC_ARCH", var.c_str(), false);
+    }
+    if (var == "") {
+	struct utsname uts;
+	uname(&uts);
+	string sysname = downcase(uts.sysname);  // aka  'uname -s'
+	if (wildmatch(sysname.c_str(), "*solaris*")) { var = "gccsparcOS5"; }
+	else if (wildmatch(sysname.c_str(), "*cygwin*")) { var ="cygwin"; }
+	else { var = "linux"; }
+	UINFO(1,"export SYSTEMC_ARCH="<<var<<" # From sysname '"<<sysname<<"'"<<endl);
+	setenv("SYSTEMC_ARCH", var.c_str(), false);
+    }
+    return var;
+}
+string V3Options::getenvSYSTEMPERL() {
+    string var = getenvStr("SYSTEMPERL","");
+    if (var == "" && string(DEFENV_SYSTEMPERL) != "") {
+	var = DEFENV_SYSTEMPERL;
+	UINFO(1,"export SYSTEMPERL="<<var<<" # Hardcoded at build time"<<endl);
+	setenv("SYSTEMC_PERL", var.c_str(), false);
+    }
+    // Only correct or check it if we really need the value
+    if ((v3Global.opt.systemPerl() || v3Global.opt.trace()) && !v3Global.opt.lintOnly()) {
+	if (var == "") {
+	    string testdir = V3Options::getenvW() + "/hw/utils/perltools/SystemC"; // Hack for internal testing
+	    if (V3Options::fileStatDir(testdir)) {
+		var = testdir;
+		UINFO(1,"export SYSTEMPERL="<<var<<endl);
+		setenv ("SYSTEMPERL", var.c_str(), false);
+	    }
+	}
+	if (var == "") {
+	    v3fatal("Need $SYSTEMPERL in environment for --sp or --trace\n"
+		    "Probably System-Perl isn't installed, see http://www.veripool.com/systemperl.html\n");
+	}
+	if (var != ""
+	    && !V3Options::fileStatNormal(var+"/src/systemperl.h")) {
+	    v3fatal("$SYSTEMPERL environment var doesn't seem to point to System-Perl kit\n");
+	}
+    }
+    return var;
+}
+string V3Options::getenvVERILATOR_ROOT() {
+    string var = getenvStr("VERILATOR_ROOT","");
+    if (var == "" && string(DEFENV_VERILATOR_ROOT) != "") {
+	var = DEFENV_VERILATOR_ROOT;
+	UINFO(1,"export VERILATOR_ROOT="<<var<<" # Hardcoded at build time"<<endl);
+	setenv("VERILATOR_ROOT", var.c_str(), false);
+    }
+    if (var == "") {
+	v3fatal("$VERILATOR_ROOT needs to be in environment\n");
+    }
+    return var;
+}
+
+//######################################################################
+// Wildcard
+
 // Double procedures, inlined, unrolls loop much better
 inline bool V3Options::wildmatchi(const char* s, const char* p) {
     for ( ; *p; s++, p++) {
@@ -275,6 +381,14 @@ bool V3Options::wildmatch(const char* s, const char* p) {
     return(*s == '\0' || *s == '[');
 }
 
+string V3Options::downcase(const string& str) {
+    string out = str;
+    for (string::iterator pos = out.begin(); pos != out.end(); pos++) {
+	*pos = tolower(*pos);
+    }
+    return out;
+}
+
 //######################################################################
 // V3 Options accessors
 
@@ -310,12 +424,12 @@ void V3Options::parseOpts (FileLine* fl, int argc, char** argv) {
 
     // Default certain options and error check
     // Detailed error, since this is what we often get when run with minimal arguments
-    if (top()=="") {
+    if (vFiles().empty()) {
 	v3fatal("verilator: No Input Verilog file specified on command line, see verilator --help for more information\n");
     }
 
     // Default prefix to the filename
-    if (prefix()=="") m_prefix = string("V")+filenameNonExt(top());
+    if (prefix()=="") m_prefix = string("V")+filenameNonExt(*(vFiles().begin()));
     if (modPrefix()=="") m_modPrefix = prefix();
 
     // Find files in makedir
@@ -392,6 +506,10 @@ void V3Options::parseOptsList(FileLine* fl, int argc, char** argv) {
 		cout <<endl;
 		exit(0);
 	    }
+	    else if ( !strcmp (sw, "-error-limit") ) {
+		shift;
+		m_inlineMult = atoi(argv[i]);
+	    }
 	    else if ( !strcmp (sw, "-inline-mult") ) {
 		shift;
 		m_inlineMult = atoi(argv[i]);
@@ -562,8 +680,7 @@ void V3Options::parseOptsList(FileLine* fl, int argc, char** argv) {
 		|| filename.find(".sp") != string::npos) {
 		V3Options::addCppFile(argv[i]);
 	    } else {
-		if (m_top!="") fl->v3fatal ("Top filename specified twice: "<<m_top<<" and "<<filename);
+		V3Options::addVFile(argv[i]);
-		m_top = filename;
 	    }
 	    shift;
 	}
@@ -657,6 +774,7 @@ V3Options::V3Options() {
     m_traceDups = false;
     m_underlineZero = false;
 
+    m_errorLimit = 50;
     m_inlineMult = 2000;
     m_outputSplit = 0;
     m_outputSplitCFuncs = 0;

src/V3Options.h

@@ -41,8 +41,9 @@ class V3Options {
     // MEMBERS (general options)
     V3OptionsImp*	m_impp;		// Slow hidden options
 
-    V3StringSet	m_cppFiles;	// C++ files to link against
+    V3StringSet	m_cppFiles;	// argument: C++ files to link against
-    V3StringSet	m_libraryFiles;	// Verilog -v files
+    V3StringSet	m_libraryFiles;	// argument: Verilog -v files
+    V3StringSet	m_vFiles;	// argument: Verilog files to read
 
     bool	m_preprocOnly;	// main switch: -E
     bool	m_makeDepend;	// main switch: -MMD
@@ -70,6 +71,7 @@ class V3Options {
     bool	m_traceDups;	// main switch: --trace-dups
     bool	m_underlineZero;// main switch: --underline-zero
 
+    int		m_errorLimit;	// main switch: --error-limit
     int		m_inlineMult;	// main switch: --inline-mult
     int		m_outputSplit;	// main switch: --output-split
     int		m_outputSplitCFuncs;// main switch: --output-split-cfuncs
@@ -82,7 +84,6 @@ class V3Options {
 
     string	m_bin;		// main switch: --bin {binary}
     string	m_flags;	// main switch: -f {name}
-    string	m_top;		// main switch: Top .v file name
     string	m_makeDir;	// main switch: -Mdir
     string	m_prefix;	// main switch: --prefix
     string	m_modPrefix;	// main switch: --mod-prefix
@@ -116,6 +117,7 @@ class V3Options {
     void coverage(bool flag) { m_coverageLine = m_coverageUser = flag; }
     bool onoff(const char* sw, const char* arg, bool& flag);
     static bool wildmatchi(const char* s, const char* p);
+    static string getenvStr(const char* envvar, const char* defaultValue);
 
   public:
     // CREATORS
@@ -126,9 +128,9 @@ class V3Options {
     // METHODS
     void addCppFile(const string& filename);
     void addLibraryFile(const string& filename);
+    void addVFile(const string& filename);
 
     // ACCESSORS (options)
-    const string& top() const { return m_top; }
     bool preprocOnly() const { return m_preprocOnly; }
     bool makeDepend() const { return m_makeDepend; }
     bool makePhony() const { return m_makePhony; }
@@ -159,6 +161,7 @@ class V3Options {
     bool ignc() const { return m_ignc; }
     bool inhibitSim() const { return m_inhibitSim; }
 
+    int	   errorLimit() const { return m_errorLimit; }
     int	   inlineMult() const { return m_inlineMult; }
     int	   outputSplit() const { return m_outputSplit; }
     int	   outputSplitCFuncs() const { return m_outputSplitCFuncs; }
@@ -175,6 +178,7 @@ class V3Options {
     string xAssign() const { return m_xAssign; }
     const V3StringSet& cppFiles() const { return m_cppFiles; }
     const V3StringSet& libraryFiles() const { return m_libraryFiles; }
+    const V3StringSet& vFiles() const { return m_vFiles; }
 
 
     // ACCESSORS (optimization options)
@@ -206,6 +210,7 @@ class V3Options {
 
     // METHODS (generic string utilities)
     static bool wildmatch(const char* s, const char* p);
+    static string downcase(const string& str);
 
     // METHODS (generic file utilities)
     static string filenameFromDirBase (const string& dir, const string& basename);
@@ -214,17 +219,21 @@ class V3Options {
     static string filenameNonDirExt (const string& filename) { return filenameNonExt(filenameNonDir(filename)); }	///< Return basename of filename
     static string filenameDir (const string& filename);	///< Return directory part of filename
     static void   unlinkRegexp(const string& dir, const string& regexp);
-    static string getenvStr(const char* envvar, const char* defaultValue) {
+
-	if (const char* envvalue = getenv(envvar)) {
+    // METHODS (environment)
-	    return envvalue;
+    // Most of these may be built into the executable with --enable-defenv,
-	} else {
+    // see the README.  If adding new variables, also see src/Makefile_obj.in
-	    return defaultValue;
+    static string getenvPERL() { return getenvStr("PERL","perl"); }
-	}
+    static string getenvSYSTEMC();
-    }
+    static string getenvSYSTEMC_ARCH();
+    static string getenvSYSTEMPERL();
+    static string getenvVERILATOR_ROOT();
+    static string getenvW() { return getenvStr("W",""); }
 
     // METHODS (file utilities using these options)
     string fileExists (const string& filename);
     string filePath (FileLine* fl, const string& modname, const string& errmsg);
+    static bool fileStatDir (const string& filename);
     static bool fileStatNormal (const string& filename);
 };
 

src/V3PreProc.cpp

@@ -207,8 +207,8 @@ void V3PreProcImp::define(FileLine* fl, const string& name, const string& value,
     UINFO(4,"DEFINE '"<<name<<"' as '"<<value<<"' params '"<<params<<"'"<<endl);
     if (defExists(name)) {
 	if (!(defValue(name)==value && defParams(name)==params)) {  // Duplicate defs are OK
-	    fl->v3error("Define already exists: "<<name);
+	    fl->v3warn(REDEFMACRO,"Redefining existing define: "<<name<<", with different value: "<<value<<" "<<params);
-	    defFileline(name)->v3error("Previous definition is here.");
+	    defFileline(name)->v3warn(REDEFMACRO,"Previous definition is here, with value: "<<defValue(name)<<" "<<defParams(name));
 	}
 	undef(name);
     }

src/Verilator.cpp

@@ -90,14 +90,21 @@ V3Global v3Global;
 
 void V3Global::readFiles() {
     V3Read reader (m_rootp);
+    // Read top module
+    for (V3StringSet::iterator it = v3Global.opt.vFiles().begin();
+	 it != v3Global.opt.vFiles().end(); ++it) {
+	string filename = *it;
+	reader.readFile(new FileLine("CommandLine",0), filename, false);
+    }
+
     // Read libraries
+    // To be compatible with other simulators,
+    // this needs to be done after the top file is read
     for (V3StringSet::iterator it = v3Global.opt.libraryFiles().begin();
 	 it != v3Global.opt.libraryFiles().end(); ++it) {
 	string filename = *it;
 	reader.readFile(new FileLine("CommandLine",0), filename, true);
     }
-    // Read top module
-    reader.readFile(new FileLine("CommandLine",0), opt.top(), false);
     V3Error::abortIfErrors();
 }
 
@@ -503,6 +510,10 @@ int main(int argc, char** argv, char** env) {
     if (!v3Global.opt.outFormatOk() && !v3Global.opt.preprocOnly() && !v3Global.opt.lintOnly()) {
 	v3fatal("verilator: Need --cc, --sc, --sp, --lint-only or --E option");
     }
+    // Check enviornment
+    V3Options::getenvSYSTEMC();
+    V3Options::getenvSYSTEMC_ARCH();
+    V3Options::getenvSYSTEMPERL();
 
     V3Error::abortIfErrors();
 

src/config_build.h.in

@@ -24,7 +24,7 @@
 //**********************************************************************
 //**** Version and host name
 
-#define DTVERSION	"Verilator 3.657 2008/01/18"
+#define DTVERSION	"Verilator 3.660 2008/03/23"
 
 //**********************************************************************
 //**** Functions
@@ -57,6 +57,26 @@
 // Set define if we have header: <inttypes.h>
 #define HAVE_INTTYPES_H 0
 
+//**********************************************************************
+//**** Default environment
+
+// Set defines to defaults for environment variables
+// If set to "", this default is ignored and the user is expected
+// to set them at Verilator runtime.
+
+#ifndef DEFENV_SYSTEMC
+# define DEFENV_SYSTEMC ""
+#endif
+#ifndef DEFENV_SYSTEMC_ARCH
+# define DEFENV_SYSTEMC_ARCH ""
+#endif
+#ifndef DEFENV_SYSTEMPERL
+# define DEFENV_SYSTEMPERL ""
+#endif
+#ifndef DEFENV_VERILATOR_ROOT
+# define DEFENV_VERILATOR_ROOT ""
+#endif
+
 //**********************************************************************
 //**** Compile options
 

src/verilog.l

@@ -634,14 +634,18 @@ escid	\\[^ \t\f\r\n]+
 			       if (!isalnum(yytext[i]))
 				   yytext[i] = '_';
 			   if (isalpha(yytext[1])) {
-			       yylval.strp = V3Read::newString(yytext+1); // +1 to skip the backslash
+			       yylval.strp = V3Read::newString(
+				   AstNode::encodeName(
+				       string(yytext+1))); // +1 to skip the backslash
 			   } else {
-			       yylval.strp = V3Read::newString(yytext); // Need _ as "6..." isn't legal ID
+			       yylval.strp = V3Read::newString(
+				   AstNode::encodeName(
+				       yytext)); // Need _ as "6..." isn't legal ID
 			   }
 			   return yaID;
 			 }
 
-  {id}			{  yylval.strp = V3Read::newString(yytext);
+  {id}			{  yylval.strp = V3Read::newString(AstNode::encodeName(string(yytext)));
 			   return yaID;
 			 }
 

src/verilog.y

@@ -1403,7 +1403,10 @@ AstVar* V3Parse::createVariable(FileLine* fileline, string name, AstRange* array
 			       rangep->cloneTree(false),
 			       arrayp);
     nodep->isSigned(V3Parse::s_varSigned);
-    if (type == AstVarType::INTEGER || V3Parse::s_varDecl == AstVarType::INTEGER) nodep->isSigned(true);
+    if (type == AstVarType::INTEGER || V3Parse::s_varDecl == AstVarType::INTEGER
+	|| type == AstVarType::GENVAR) {
+	nodep->isSigned(true);
+    }
     if (V3Parse::s_varDecl != AstVarType::UNKNOWN) nodep->combineType(V3Parse::s_varDecl);
     if (V3Parse::s_varIO != AstVarType::UNKNOWN) nodep->combineType(V3Parse::s_varIO);
 

test_regress/Makefile

@@ -39,6 +39,7 @@ endif
 
 ######################################################################
 
+.PHONY: test
 test:
 	$(PERL) driver.pl $(DRIVER_FLAGS) $(PRODUCTS)
 

test_regress/driver.pl

@@ -443,7 +443,8 @@ sub sc_or_sp {
 
 sub _run {
     my $self = (ref $_[0]? shift : $Last_Self);
-    my %param = (@_);
+    my %param = (tee=>1,
+		 @_);
     my $command = join(' ',@{$param{cmd}});
     print "\t$command\n";
 
@@ -451,7 +452,11 @@ sub _run {
 	open(SAVEOUT, ">&STDOUT") or die "%Error: Can't dup stdout";
 	open(SAVEERR, ">&STDERR") or die "%Error: Can't dup stderr";
 	if (0) {close(SAVEOUT); close(SAVEERR);}	# Prevent unused warning
-	open(STDOUT, "|tee $param{logfile}") or die "%Error: Can't redirect stdout";
+	if ($param{tee}) {
+	    open(STDOUT, "|tee $param{logfile}") or die "%Error: Can't redirect stdout";
+	} else {
+	    open(STDOUT, ">$param{logfile}") or die "%Error: Can't open $param{logfile}";
+	}
 	open(STDERR, ">&STDOUT") or die "%Error: Can't dup stdout";
 	autoflush STDOUT 1;
 	autoflush STDERR 1;

test_regress/t/t_func_mlog2.pl

@@ -0,0 +1,18 @@
+#!/usr/bin/perl
+if (!$::Driver) { use FindBin; exec("./driver.pl", @ARGV, $0); die; }
+# $Id$
+# DESCRIPTION: Verilator: Verilog Test driver/expect definition
+#
+# Copyright 2003 by Wilson Snyder. This program is free software; you can
+# redistribute it and/or modify it under the terms of either the GNU
+# General Public License or the Perl Artistic License.
+
+compile (
+	 );
+
+execute (
+	 check_finished=>1,
+     );
+
+ok(1);
+1;

test_regress/t/t_func_mlog2.v

@@ -0,0 +1,56 @@
+// $Id$
+// DESCRIPTION: Verilator: Verilog Test module
+//
+// This file ONLY is placed into the Public Domain, for any use,
+// without warranty, 2003-2008 by Wilson Snyder.
+
+module t (clk);
+   input clk;
+
+   integer cyc; initial cyc=1;
+   integer sum;
+   integer cpre;
+   always @ (posedge clk) begin
+      if (cyc!=0) begin
+	 cpre = cyc;
+	 cyc <= cyc + 1;
+	 if (cyc==1) begin
+	    if (mlog2(32'd0) != 32'd0) $stop;
+	    if (mlog2(32'd1) != 32'd0) $stop;
+	    if (mlog2(32'd3) != 32'd2) $stop;
+	    sum <= 32'd0;
+	 end
+	 else if (cyc<90) begin
+	    // (cyc) so if we trash the variable things will get upset.
+	    sum <= mlog2(cyc) + sum * 32'd42;
+	    if (cpre != cyc) $stop;
+	 end
+	 else if (cyc==90) begin
+	    if (sum !== 32'h0f12bb51) $stop;
+	    $write("*-* All Finished *-*\n");
+	    $finish;
+	 end
+      end
+   end
+
+   function integer mlog2;
+      input [31:0] value;
+      integer 	   i;
+      begin
+	 if(value < 32'd1) begin
+            mlog2 = 0;
+	 end
+	 else begin
+            value = value - 32'd1;
+            mlog2 = 0;
+            for(i=0;i<32;i=i+1) begin
+               if(value > 32'd0) begin
+                  mlog2 = mlog2 + 1;
+               end
+               value = value >> 1;
+            end
+	 end
+      end
+   endfunction
+
+endmodule

test_regress/t/t_gen_for1.pl

@@ -0,0 +1,18 @@
+#!/usr/bin/perl
+if (!$::Driver) { use FindBin; exec("./driver.pl", @ARGV, $0); die; }
+# $Id$
+# DESCRIPTION: Verilator: Verilog Test driver/expect definition
+#
+# Copyright 2003 by Wilson Snyder. This program is free software; you can
+# redistribute it and/or modify it under the terms of either the GNU
+# General Public License or the Perl Artistic License.
+
+compile (
+	 );
+
+execute (
+	 check_finished=>1,
+     );
+
+ok(1);
+1;

test_regress/t/t_gen_for1.v

@@ -0,0 +1,85 @@
+// $Id$
+// DESCRIPTION: Verilator: Verilog Test module
+//
+// This file ONLY is placed into the Public Domain, for any use,
+// without warranty, 2007 by Wilson Snyder.
+
+module t (/*AUTOARG*/
+   // Inputs
+   clk
+   );
+   input clk;
+
+   wire  b;
+   reg 	 reset;
+   integer 	cyc=0;
+
+   Testit testit (/*AUTOINST*/
+		  // Outputs
+		  .b			(b),
+		  // Inputs
+		  .clk			(clk),
+		  .reset		(reset));
+
+   always @ (posedge clk) begin
+      cyc <= cyc + 1;
+      if (cyc==0) begin
+	 reset <= 1'b0;
+      end
+      else if (cyc<10) begin
+	 reset <= 1'b1;
+      end
+      else if (cyc<90) begin
+	 reset <= 1'b0;
+      end
+      else if (cyc==99) begin
+	 $write("*-* All Finished *-*\n");
+	 $finish;
+      end
+   end
+
+endmodule
+
+module Testit (clk, reset, b);
+   input                  clk;
+   input 		  reset;
+   output 		  b;
+
+   wire [0:0] 		  c;
+   wire 		  my_sig;
+   wire [0:0] 		  d;
+
+   genvar 		     i;
+   generate
+      for(i = 0; i >= 0; i = i-1) begin: fnxtclk1
+	 fnxtclk fnxtclk1
+	   (.u(c[i]),
+	    .reset(reset),
+	    .clk(clk),
+	    .w(d[i]) );
+      end
+   endgenerate
+
+   assign b                    = d[0];
+   assign c[0]                 = my_sig;
+   assign my_sig               = 1'b1;
+
+endmodule 
+
+module fnxtclk (u, reset, clk, w );
+   input                    u;
+   input 		    reset;
+   input 		    clk;
+   output reg 		    w;
+
+   always @ (posedge clk or posedge reset) begin
+      if (reset == 1'b1) begin
+         w            <= 1'b0;
+      end
+      else begin
+         w            <= u;
+      end
+   end 
+
+endmodule 
+

test_regress/t/t_help.pl

@@ -0,0 +1,20 @@
+#!/usr/bin/perl
+if (!$::Driver) { use FindBin; exec("./driver.pl", @ARGV, $0); die; }
+# $Id$
+# DESCRIPTION: Verilator: Verilog Test driver/expect definition
+#
+# Copyright 2003-2007 by Wilson Snyder. This program is free software; you can
+# redistribute it and/or modify it under the terms of either the GNU
+# General Public License or the Perl Artistic License.
+
+$Last_Self->_run(fails=>1,
+		 cmd=>["perl","../bin/verilator",
+		       "--help"],
+		 logfile=>"obj_dir/t_help.log",
+		 tee=>0,
+		 ) if $Last_Self->{v3};
+
+file_grep ("obj_dir/t_help.log", qr/DISTRIBUTION/i);
+
+ok(1);
+1;

test_regress/t/t_lint_implicit.pl

@@ -0,0 +1,16 @@
+#!/usr/bin/perl
+if (!$::Driver) { use FindBin; exec("./driver.pl", @ARGV, $0); die; }
+# $Id$
+# DESCRIPTION: Verilator: Verilog Test driver/expect definition
+#
+# Copyright 2003 by Wilson Snyder. This program is free software; you can
+# redistribute it and/or modify it under the terms of either the GNU
+# General Public License or the Perl Artistic License.
+
+compile (
+	 v_flags2 => ["-Wno-IMPLICIT"],
+	 ) if $Last_Self->{v3};
+
+ok(1);
+1;
+

test_regress/t/t_lint_implicit.v

@@ -0,0 +1,16 @@
+// $Id$
+// DESCRIPTION: Verilator: Verilog Test module
+//
+// This file ONLY is placed into the Public Domain, for any use,
+// without warranty, 2008 by Wilson Snyder.
+
+module t (a,z);
+   input a;
+   output z;
+
+   assign b = 1'b1;
+
+   or   OR0 (nt0, a, b);
+
+   assign z = nt0;
+endmodule

test_regress/t/t_lint_implicit_bad.pl

@@ -0,0 +1,24 @@
+#!/usr/bin/perl
+if (!$::Driver) { use FindBin; exec("./driver.pl", @ARGV, $0); die; }
+# $Id$
+# DESCRIPTION: Verilator: Verilog Test driver/expect definition
+#
+# Copyright 2008 by Wilson Snyder. This program is free software; you can
+# redistribute it and/or modify it under the terms of either the GNU
+# General Public License or the Perl Artistic License.
+
+top_filename("t/t_lint_implicit.v");
+
+compile (
+	 v_flags2 => ["--lint-only"],
+	 fails=>1,
+	 expect=>
+'%Warning-IMPLICIT: t/t_lint_implicit.v:\d+: Signal definition not found, creating implicitly: b
+%Warning-IMPLICIT: Use .* to disable this message.
+%Warning-IMPLICIT: t/t_lint_implicit.v:\d+: Signal definition not found, creating implicitly: nt0
+%Error: Exiting due to.*',
+	 ) if $Last_Self->{v3};
+
+ok(1);
+1;
+

test_regress/t/t_pp_dupdef.pl

@@ -0,0 +1,16 @@
+#!/usr/bin/perl
+if (!$::Driver) { use FindBin; exec("./driver.pl", @ARGV, $0); die; }
+# $Id$
+# DESCRIPTION: Verilator: Verilog Test driver/expect definition
+#
+# Copyright 2003 by Wilson Snyder. This program is free software; you can
+# redistribute it and/or modify it under the terms of either the GNU
+# General Public License or the Perl Artistic License.
+
+compile (
+	 v_flags2 => ["-Wno-REDEFMACRO"],
+	 ) if $Last_Self->{v3};
+
+ok(1);
+1;
+

test_regress/t/t_pp_dupdef.v

@@ -0,0 +1,17 @@
+// $Id$
+// DESCRIPTION: Verilator: Verilog Test module
+//
+// This file ONLY is placed into the Public Domain, for any use,
+// without warranty, 2008 by Wilson Snyder.
+
+module t;
+
+`define DUP fred
+`define DUP barney
+
+`define DUPP paramed(x) (x)
+`define DUPP paramed(x,z) (x*z)
+   
+     initial $stop; // Should have failed
+
+endmodule

test_regress/t/t_pp_dupdef_bad.pl

@@ -0,0 +1,26 @@
+#!/usr/bin/perl
+if (!$::Driver) { use FindBin; exec("./driver.pl", @ARGV, $0); die; }
+# $Id$
+# DESCRIPTION: Verilator: Verilog Test driver/expect definition
+#
+# Copyright 2008 by Wilson Snyder. This program is free software; you can
+# redistribute it and/or modify it under the terms of either the GNU
+# General Public License or the Perl Artistic License.
+
+top_filename("t/t_pp_dupdef.v");
+
+compile (
+	 v_flags2 => ["--lint-only"],
+	 fails=>1,
+	 expect=>
+'%Warning-REDEFMACRO: t/t_pp_dupdef.v:\d+: Redefining existing define: DUP, with different value: barney 
+%Warning-REDEFMACRO: Use .* to disable this message.
+%Warning-REDEFMACRO: t/t_pp_dupdef.v:\d+: Previous definition is here, with value: fred 
+%Warning-REDEFMACRO: t/t_pp_dupdef.v:\d+: Redefining existing define: DUPP, with different value: .*
+%Warning-REDEFMACRO: t/t_pp_dupdef.v:\d+: Previous definition is here, with value: .*
+%Error: Exiting due to.*',
+	 ) if $Last_Self->{v3};
+
+ok(1);
+1;
+

test_regress/t/t_pp_lib.pl

@@ -0,0 +1,20 @@
+#!/usr/bin/perl
+if (!$::Driver) { use FindBin; exec("./driver.pl", @ARGV, $0); die; }
+# $Id$
+# DESCRIPTION: Verilator: Verilog Test driver/expect definition
+#
+# Copyright 2003 by Wilson Snyder. This program is free software; you can
+# redistribute it and/or modify it under the terms of either the GNU
+# General Public License or the Perl Artistic License.
+
+compile (
+	 v_flags2 => ['-v', 't/t_pp_lib_library.v'],
+	 );
+
+execute (
+	 check_finished=>1,
+     );
+
+ok(1);
+1;
+

test_regress/t/t_pp_lib.v

@@ -0,0 +1,11 @@
+// $Id$
+// DESCRIPTION: Verilator: Verilog Test module
+//
+// This file ONLY is placed into the Public Domain, for any use,
+// without warranty, 2008 by Wilson Snyder.
+
+`include "t_pp_lib_inc.v"
+module t();
+   wire [`WIDTH-1:0] a;
+   library_cell n1(a);
+endmodule

test_regress/t/t_pp_lib_inc.v

@@ -0,0 +1,7 @@
+// $Id$
+// DESCRIPTION: Verilator: Verilog Test module
+//
+// This file ONLY is placed into the Public Domain, for any use,
+// without warranty, 2008 by Wilson Snyder.
+
+`define WIDTH 10

test_regress/t/t_pp_lib_library.v

@@ -0,0 +1,13 @@
+// $Id$
+// DESCRIPTION: Verilator: Verilog Test module
+//
+// This file ONLY is placed into the Public Domain, for any use,
+// without warranty, 2008 by Wilson Snyder.
+
+module library_cell(a);
+   input [`WIDTH-1:0] a;
+   initial begin
+      $write("*-* All Finished *-*\n");
+      $finish;
+   end
+endmodule