Version stamp update

Detect delay precision overflow.
Fix a dangling reference to NetEParam objects in defparams.
2026-08-24 06:46:52 +02:00 · 2006-10-04 17:08:59 +00:00 · 2006-10-04 00:37:03 +00:00 · 2006-10-04 00:34:45 +00:00 · 2006-10-03 21:34:40 +00:00 · 2006-09-28 23:42:14 +00:00
787 changed files with 76654 additions and 180652 deletions
@@ -0,0 +1,26 @@
+lexor_keyword.cc
+parse.h
+parse.cc
+parse.cc.output
+parse.output
+syn-rules.cc
+syn-rules.cc.output
+syn-rules.output
+lexor.cc
+iverilog-vpi
+iverilog-vpi.pdf
+iverilog-vpi.ps
+ivl
+ivl.exp
+dep
+configure
+Makefile
+check
+check.cc
+config.status
+config.log
+config.cache
+autom4te.cache
+config.h
+_pli_types.h
+dosify
@@ -1,116 +0,0 @@
-# Lines that start with '#' are comments.
-#
-# This file is for the development branch of Icarus Verilog.
-#
-# The following files will be ignored by git.
-
-# Normal editor rules
-*.swp
-*~
-
-# Top level generic files
-tags
-TAGS
-cscope.*
-*.patch
-*.orig
-
-# Object files and libraries
-*.[oa]
-
-gmon*.out
-gmon*.txt
-
-# From autoconf
-configure
-config.log
-config.status
-Makefile
-
-/_pli_types.h
-config.h
-/tgt-pcb/pcb_config.h
-/tgt-pcb/fp.cc
-/tgt-pcb/fp.h
-/tgt-pcb/fp.output
-/tgt-pcb/fp_lex.cc
-/tgt-vvp/vvp_config.h
-/tgt-vhdl/vhdl_config.h
-/vpi/vpi_config.h
-stamp-*-h
-/version.h
-/version_tag.h
-
-# Directories
-autom4te.cache
-dep
-
-# Compiler back end and library files
-/tgt-vvp/*.conf
-*.tgt
-*.vpi
-/cadpli/cadpli.vpl
-
-/tgt-blif/Makefile
-
-# lex, yacc and gperf output
-/driver/cflexor.c
-/driver/cfparse.c
-/driver/cfparse.h
-/driver/cfparse.output
-
-/ivlpp/lexor.c
-
-/vhdlpp/lexor.cc
-/vhdlpp/lexor_keyword.cc
-/vhdlpp/parse.cc
-/vhdlpp/parse.h
-/vhdlpp/parse.output
-/vhdlpp/vhdlpp_config.h
-/vhdlpp/vhdlpp
-
-/lexor.cc
-/lexor_keyword.cc
-/parse.cc
-/parse.h
-/parse.output
-/syn-rules.cc
-/syn-rules.output
-
-/vpi/sdf_lexor.c
-/vpi/sdf_parse.c
-/vpi/sdf_parse.h
-/vpi/sdf_parse.output
-/vpi/sys_readmem_lex.c
-/vpi/table_mod_lexor.c
-/vpi/table_mod_parse.c
-/vpi/table_mod_parse.h
-/vpi/table_mod_parse.output
-
-/vvp/dump.*
-/vvp/lexor.cc
-/vvp/parse.cc
-/vvp/parse.h
-/vvp/parse.output
-
-# Program created files
-/vvp/tables.cc
-
-/iverilog-vpi.man
-/driver-vpi/res.rc
-/driver/iverilog.man
-/vvp/vvp.man
-
-# The executables.
-*.exe
-/driver/iverilog
-/iverilog-vpi
-/ivl
-/ivlpp/ivlpp
-/vvp/vvp
-
-/ivl.exp
-/vvp/vvp.exp
-
-# Check output
-/check.vvp
@@ -1,85 +0,0 @@
-#ifndef IVL_AStatement_H
-#define IVL_AStatement_H
-/*
- * Copyright (c) 2008-2014 Stephen Williams ([email protected])
- *
- *    This source code is free software; you can redistribute it
- *    and/or modify it in source code form under the terms of the GNU
- *    General Public License as published by the Free Software
- *    Foundation; either version 2 of the License, or (at your option)
- *    any later version.
- *
- *    This program 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.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include  <map>
-# include  "ivl_target.h"
-# include  "StringHeap.h"
-# include  "LineInfo.h"
-# include  "Statement.h"
-# include  "PExpr.h"
-
-class PExpr;
-class NetAnalog;
-class NetScope;
-class Design;
-
-/*
- * A contribution statement is like an assignment: there is an l-value
- * expression and an r-value expression. The l-value is a branch probe
- * expression.
- */
-class AContrib : public Statement {
-
-    public:
-      AContrib(PExpr*lval, PExpr*rval);
-      ~AContrib();
-
-      virtual void dump(ostream&out, unsigned ind) const;
-      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
-
-    private:
-      PExpr*lval_;
-      PExpr*rval_;
-};
-
-/*
- * An analog process is not a statement, but contains an analog
- * statement. The process is where we attach process characteristics
- * such as initial vs. always, attributes....
- */
-class AProcess : public LineInfo {
-
-    public:
-      AProcess(ivl_process_type_t t, Statement*st)
-      : type_(t), statement_(st) { }
-
-      ~AProcess();
-
-      bool elaborate(Design*des, NetScope*scope) const;
-
-      ivl_process_type_t type() const { return type_; }
-      Statement*statement() { return statement_; }
-
-      map<perm_string,PExpr*> attributes;
-
-	// Dump the analog process
-      void dump(ostream&out, unsigned ind) const;
-
-    private:
-      ivl_process_type_t type_;
-      Statement*statement_;
-
-    private: // not implemented
-      AProcess(const AProcess&);
-      AProcess& operator= (const AProcess&);
-};
-
-#endif /* IVL_AStatement_H */
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2010 Stephen Williams ([email protected])
+ * Copyright (c) 2000 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -14,13 +14,16 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: Attrib.cc,v 1.6 2004/02/20 18:53:33 steve Exp $"
+#endif

 # include "config.h"

 # include  "Attrib.h"
-# include  <cassert>
+# include  <assert.h>

 Attrib::Attrib()
 {
@@ -99,3 +102,37 @@ const verinum& Attrib::attr_value(unsigned idx) const
      assert(idx < nlist_);
      return list_[idx].val;
 }
+
+
+/*
+ * $Log: Attrib.cc,v $
+ * Revision 1.6  2004/02/20 18:53:33  steve
+ *  Addtrbute keys are perm_strings.
+ *
+ * Revision 1.5  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.4  2002/05/26 01:39:02  steve
+ *  Carry Verilog 2001 attributes with processes,
+ *  all the way through to the ivl_target API.
+ *
+ *  Divide signal reference counts between rval
+ *  and lval references.
+ *
+ * Revision 1.3  2002/05/23 03:08:50  steve
+ *  Add language support for Verilog-2001 attribute
+ *  syntax. Hook this support into existing $attribute
+ *  handling, and add number and void value types.
+ *
+ *  Add to the ivl_target API new functions for access
+ *  of complex attributes attached to gates.
+ *
+ * Revision 1.2  2001/07/25 03:10:48  steve
+ *  Create a config.h.in file to hold all the config
+ *  junk, and support gcc 3.0. (Stephan Boettcher)
+ *
+ * Revision 1.1  2000/12/04 17:37:03  steve
+ *  Add Attrib class for holding NetObj attributes.
+ *
+ */
+
@@ -1,7 +1,7 @@
-#ifndef IVL_Attrib_H
-#define IVL_Attrib_H
+#ifndef __Attrib_H
+#define __Attrib_H
 /*
- * Copyright (c) 2000-2014 Stephen Williams ([email protected])
+ * Copyright (c) 2000 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,8 +16,11 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: Attrib.h,v 1.5 2004/02/20 18:53:33 steve Exp $"
+#endif

 # include  "StringHeap.h"
 # include  "verinum.h"
@@ -30,7 +33,7 @@ class Attrib {

    public:
      Attrib();
-      virtual ~Attrib();
+      ~Attrib();

      const verinum&attribute(perm_string key) const;
      void attribute(perm_string key, const verinum&value);
@@ -57,4 +60,31 @@ class Attrib {
      Attrib& operator= (const Attrib&);
 };

-#endif /* IVL_Attrib_H */
+/*
+ * $Log: Attrib.h,v $
+ * Revision 1.5  2004/02/20 18:53:33  steve
+ *  Addtrbute keys are perm_strings.
+ *
+ * Revision 1.4  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.3  2002/05/26 01:39:02  steve
+ *  Carry Verilog 2001 attributes with processes,
+ *  all the way through to the ivl_target API.
+ *
+ *  Divide signal reference counts between rval
+ *  and lval references.
+ *
+ * Revision 1.2  2002/05/23 03:08:50  steve
+ *  Add language support for Verilog-2001 attribute
+ *  syntax. Hook this support into existing $attribute
+ *  handling, and add number and void value types.
+ *
+ *  Add to the ivl_target API new functions for access
+ *  of complex attributes attached to gates.
+ *
+ * Revision 1.1  2000/12/04 17:37:03  steve
+ *  Add Attrib class for holding NetObj attributes.
+ *
+ */
+#endif
@@ -4,24 +4,23 @@ HOW TO REPORT BUGS
 Before I can fix an error, I need to understand what the problem
 is. Try to explain what is wrong and why you think it is wrong. Please
 try to include sample code that demonstrates the problem. Include a
-description of what Icarus Verilog does that is wrong, and what you
-expect should happen. And include the command line flags passed to the
-compiler to make the error happen. (This is often overlooked, and
-sometimes important.)
+description of what ivl does that is wrong, and what you expect should
+happen. And include the command line flags passed to the compiler to make
+the error happen. (This is often overlooked, and sometimes important.)

 * The Compiler Doesn't Compile

-If Icarus Verilog doesn't compile, I need to know about the
+If the Icarus Verilog don't compile, I need to know about the
 compilation tools you are using. Specifically, I need to know:

 	- Operating system and processor type,
 	- Compiler w/ version,
-	- Versions of any libraries being linked, and
+	- Library version, and
 	- anything else you think relevant.

 Be aware that I do not have at my disposal a porting lab. I have the
-workstation on my desk, a Mac laptop, and the Linux/Intel box with a
-logic analyzer and 'scope hanging off it.
+alpha on my desk, and the Linux/Intel box with a logic analyzer and
+'scope hanging off it.

 * The Compiler Crashes

@@ -29,62 +28,61 @@ No compiler should crash, no matter what kind of garbage is fed to
 it. If the compiler crashes, you definitely found a bug and I need to
 know about it.

-Icarus Verilog internally checks its state while it works, and if it
-detects something wrong that it cannot recover from, it will abort
+Ivl internally checks its state while it works, and if it detects
+something wrong that it cannot recover from, it will abort
 intentionally. The "assertion failure" message that the program
 prints in the process of dying is very important. It tells me where in
 the source the bad thing happened. Include that message in the bug
 report.

-If there are no assertion messages, I need to know that as well.
+If there are not assertion messages, I need to know that as well.

 I also need a complete test program that demonstrates the crash.

 * It Doesn't Like My Perfectly Valid Program(tm)

-I need to know what you think is right that Icarus Verilog gets
-wrong. Does it reject your "Perfectly Valid Program(tm)" or does it
-compile it but give incorrect results? The latter is the most
-insidious as it doesn't scream out to be fixed unless someone is
-watching closely. However, if I get a sample program from you, and I
-can compile it, and I run it and nuclear junk doesn't fall from the
-sky, I'm moving on to the next problem.
+I need to know what you think is right that ivl gets wrong. Does it
+reject your "Perfectly Valid Program(tm)" or does it compile it but
+give incorrect results? The latter is the most insidious as it doesn't
+scream out to be fixed unless someone is watching closely. However, if
+I get a sample program from you, and I can compile it, and I run it
+and nuclear junk doesn't fall from the sky, I'm moving on to the next
+problem.

 So, if your program doesn't compile, tell me so, tell me where the
 error occurs, and include a complete Perfectly Valid Test Program(tm).
 You tell me that it fails to compile for you, and I find that it
 compiles for me, then hooray I fixed it. It can happen, you
-know. What's on my disk is more recent than the latest snapshot.
+know. What's on my disk is more recent then the latest snapshot.

 If your program does compile, but generates incorrect output, I need
 to know what it says and what you think it should say. From this I can
-take your sample program and work on Icarus Verilog until it gets the
-proper results. For this to work, of course, I first need to know what
-is wrong with the output. Spell it out, because I've been known to
-miss the obvious. Compiler writers often get buried in the details of
-the wrong problem.
+take your sample program and work on ivl until it gets the proper
+results. For this to work, of course, I first need to know what is
+wrong with the output. Spell it out, because I've been known to miss
+the obvious. Compiler writers often get buried in the details of the
+wrong problem.

-* It Generates Incorrect Target Code
+* It Generates Incorrect Target Code (XNF, EDIF/LPM, etc.)

-As Icarus Verilog adds target code generators, there will be cases
-where errors in the output netlist format occur. This is a tough nut
-because I might not have all the tools to test the target format you
-are reporting problems with. However, if you clearly explain what is
-right and wrong about the generated output, I will probably be able
-to fix the problem. It may take a few iterations.
+As ivl adds target code generators, there will be cases where errors
+in the output netlist format occur. This is a tough nut because I
+might not have all the tools to test the target format you are
+reporting problems with. However, if you clearly explain what is right
+and wrong about the generated netlist, I will probably be able to fix
+the problem. It may take a few iterations.

-In this case, if possible include not only the sample Verilog program,
+In this case, if possible include not only the sample verilog program,
 but the generated netlist file(s) and a clear indication of what went
-wrong or what is expected. If it is not clear to me, I will ask for
-clarification.
+wrong. If it is not clear to me, I will ask for clarification.

-* The Output is Correct, But Less Than Ideal
+* The Output is Correct, But Less Then Ideal

 If the output is strictly correct, but just not good enough for
 practical use, I would like to know. These sorts of problems are
-likely to be more subjective than a core dump, but are worthy of
+likely to be more subjective then a core dump, but are worthy of
 consideration. However, realize that outright errors will get more
-attention than missed optimizations.
+attention then missed optimizations.

 THE MAKING OF A GOOD TEST PROGRAM

@@ -93,36 +91,32 @@ demonstrates the problem. If the error occurs after elaboration,
 please include a top level module in the program that is suitable for
 the target format. If I have to write the module myself, I might not
 write it in a way that tickles the bug. So please, send all the
-Verilog source that I need to invoke the error.
+Verilog source (after preprocessing) that I need to invoke the error.

 Also, include the command line you use to invoke the compiler. For
 example:

-	iverilog -o foo.out -tvvp foo.v
-	iverilog foo.vl -s starthere
+	ivl foo.vl -o foo.cc -tvvm
+	ivl foo.vl -s starthere

 If the error occurs with the null target (``-tnull'') then a top level
 module may not be needed as long as the ``-s <name>'' switch is
 given.

 So when you send a test case, ask yourself "Can poor overworked Steve
-invoke the error without any Verilog other than what is included?" And
+invoke the error without any Verilog other then what is included?" And
 while we are at it, please place a copyright notice in your test
 program and include a GPL license statement if you can. Your test
 program may find its way into the test suite, and the notices will
-make it all nice and legal. Please look at the existing tests in the
-test suite <http://sourceforge.net/ivtest> for examples of good test
-programs.
+make it all nice and legal.

 RESEARCHING EXISTING/PAST BUGS, AND FILING REPORTS

-The URL <http://sourceforge.net/tracker/?group_id=149850> is the main
-bug tracking system. Once you believe you have found a bug, you may
-browse the bugs database for existing bugs that may be related to
-yours. You might find that your bug has already been fixed in a later
-release or snapshot. If that's the case, then you are set. Also,
-consider if you are reporting a bug or really asking for a new
-feature, and use the appropriate tracker.
+The URL <http://www.icarus.com/cgi-bin/ivl-bugs> is the main bug
+tracking system. Once you believe you have found a bug, you may browse
+the bugs database for existing bugs that may be related to yours. You
+might find that your bug has already been fixed in a later release or
+snapshot. If that's the case, then you are set.

 The bug database supports basic keyword searches, and you can
 optionally limit your search to active bugs, or fixed bugs. You may
@@ -131,7 +125,8 @@ broken. You may for example find a related bug that explains your
 symptom.

 The root page of the bug report database describes how to submit your
-completed bug report.
+completed bug report. You may submit it via the web form, or via
+e-mail.

 HOW TO SEND PATCHES

@@ -139,26 +134,21 @@ Bug reports with patches are very welcome, especially if they are
 formatted such that I can inspect them, decide that they are obviously
 correct, and apply them without worry.

-I prefer patches generated by the git source code tracking system. If
-you are editing the source, you really should be using the latest
-version from git. Please see the developer documentation for more
-detailed instructions -- <http://iverilog.wikia.com/wiki/>.
+I prefer context diffs as emitted by diff from GNU diffutils.  Human
+beings can read such things, and they are resilient to changing
+originals. A good set of flags to diff are ``diff -cNB''.  With such
+diffs, I can look at the changes you are offering and probably tell at
+a glance that they are plausible. Then I can use patch(1) to apply
+them. Or I can apply them by hand.

-When you make a patch, submit it to the "Patches" tracker at
-<http://sourceforge.net/tracker/?group_id=149850>. Patches added to
-the "Patches" tracker enter the developer workflow, are checked,
-applied to the appropriate git branch, and are pushed. Then the
-tracker item is closed.
-
-If you send patches, *please* tell me what this patch is supposed to
-accomplish, which branch you intended to be patched, and if
-appropriate include a test program that demonstrates the efficacy of
-the patch. (If I have no idea what the patch is for, I will ask for
-clarification before applying it.)
+However, if you send patches, *please* tell me what this patch is
+supposed to accomplish, and if appropriate include a test program that
+demonstrates the efficacy of the patch. (If I have no idea what the
+patch is for, I will ask for clarification before applying it.)

 COPYRIGHT ISSUES

-Icarus Verilog is Copyright (c) 1998-2008 Stephen Williams except
+Icarus Verilog is Copyright (c) 1998-2003 Stephen Williams except
 where otherwise noted. Minor patches are covered as derivative works
 (or editorial comment or whatever the appropriate legal term is) and
 folded into the rest of ivl. However, if a submission can reasonably
@@ -168,3 +158,16 @@ then falls under the "otherwise noted" category.

 I must insist that any copyright material submitted for inclusion
 include the GPL license notice as shown in the rest of the source.
+
+
+$Id: BUGS.txt,v 1.4 2003/02/19 04:36:31 steve Exp $
+$Log: BUGS.txt,v $
+Revision 1.4  2003/02/19 04:36:31  steve
+ Notes on hte bug database.
+
+Revision 1.3  2003/01/30 16:23:07  steve
+ Spelling fixes.
+
+Revision 1.2  1999/08/06 04:05:28  steve
+ Handle scope of parameters.
+
@@ -1,12 +1,12 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991

- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

-                            Preamble
+			    Preamble

  The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+the GNU Library General Public License instead.)  You can apply it to
 your programs, too.

  When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
 modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
+
+		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
  4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.

 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
  8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.

-                            NO WARRANTY
+			    NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.

-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
+		     END OF TERMS AND CONDITIONS
+
+	Appendix: How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+    Copyright (C) 19yy  <name of author>

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -303,16 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA

 Also add information on how to contact you by electronic and paper mail.

 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:

-    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision version 69, Copyright (C) 19yy name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
@@ -335,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
+library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
@@ -1,502 +0,0 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2014 Stephen Williams ([email protected])
+ * Copyright (c) 2001 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -14,108 +14,266 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: HName.cc,v 1.5 2002/11/02 03:27:52 steve Exp $"
+#endif

 # include  "config.h"
 # include  "HName.h"
 # include  <iostream>
-# include  <cstring>
-# include  <cstdlib>
-
-using namespace std;
+# include  <string.h>
+# include  <stdlib.h>
+#ifdef HAVE_MALLOC_H
+# include  <malloc.h>
+#endif

 hname_t::hname_t()
 {
+      item_ = 0;
+      count_ = 0;
 }

-hname_t::hname_t(perm_string text)
-: name_(text)
-{
-}
-
-hname_t::hname_t(perm_string text, int num)
-: name_(text), number_(1)
-{
-      number_[0] = num;
-}
-
-hname_t::hname_t(perm_string text, vector<int>&nums)
-: name_(text), number_(nums)
+hname_t::hname_t(const char*text)
 {
+      item_ = strdup(text);
+      count_ = 1;
 }

 hname_t::hname_t(const hname_t&that)
-: name_(that.name_), number_(that.number_)
 {
+      count_ = that.count_;
+      switch (count_) {
+	  case 0:
+	    item_ = 0;
+	    break;
+	  case 1:
+	    item_ = strdup(that.item_);
+	    break;
+	  default:
+	    array_ = new char*[count_];
+	    for (unsigned idx = 0 ;  idx < count_ ;  idx += 1)
+		  array_[idx] = strdup(that.array_[idx]);
+	    break;
+      }
 }

-hname_t& hname_t::operator = (const hname_t&that)
+hname_t::~hname_t()
 {
-      name_ = that.name_;
-      number_ = that.number_;
-      return *this;
+      switch (count_) {
+	  case 0:
+	    break;
+	  case 1:
+	    free(item_);
+	    break;
+	  default:
+	    for (unsigned idx = 0 ;  idx < count_ ;  idx += 1)
+		  free(array_[idx]);
+	    delete[]array_;
+	    break;
+      }
 }

-bool hname_t::operator < (const hname_t&r) const
+unsigned hname_t::component_count() const
 {
-      int cmp = strcmp(name_, r.name_);
-      if (cmp < 0) return true;
-      if (cmp > 0) return false;
+      return count_;
+}

-	// The text parts are equal, so compare then number
-	// parts. Finish as soon as we find one to be less or more
-	// than the other.
-      size_t idx = 0;
-      while (number_.size() > idx || r.number_.size() > idx) {
+void hname_t::append(const char*text)
+{
+      char**tmp;

-	      // Ran out of l numbers, so less.
-	    if (number_.size() <= idx)
+      switch (count_) {
+	  case 0:
+	    count_ = 1;
+	    item_ = strdup(text);
+	    break;
+	  case 1:
+	    count_ = 2;
+	    tmp = new char*[2];
+	    tmp[0] = item_;
+	    tmp[1] = strdup(text);
+	    array_ = tmp;
+	    break;
+	  default:
+	    tmp = new char*[count_+1];
+	    for (unsigned idx = 0 ;  idx < count_ ;  idx += 1)
+		  tmp[idx] = array_[idx];
+	    delete[]array_;
+	    array_ = tmp;
+	    array_[count_] = strdup(text);
+	    count_ += 1;
+      }
+}
+
+void hname_t::prepend(const char*text)
+{
+      char**tmp;
+
+      switch (count_) {
+	  case 0:
+	    count_ = 1;
+	    item_ = strdup(text);
+	    break;
+	  case 1:
+	    count_ = 2;
+	    tmp = new char*[2];
+	    tmp[0] = strdup(text);
+	    tmp[1] = item_;
+	    array_ = tmp;
+	    break;
+	  default:
+	    tmp = new char*[count_+1];
+	    tmp[0] = strdup(text);
+	    for (unsigned idx = 0 ;  idx < count_ ;  idx += 1)
+		  tmp[idx+1] = array_[idx];
+	    delete[]array_;
+	    array_ = tmp;
+	    count_ += 1;
+      }
+}
+
+char* hname_t::remove_tail_name()
+{
+      if (count_ == 0)
+	    return 0;
+
+      if (count_ == 1) {
+	    char*tmp = item_;
+	    count_ = 0;
+	    item_ = 0;
+	    return tmp;
+      }
+
+      if (count_ == 2) {
+	    char*tmp1 = array_[0];
+	    char*tmp2 = array_[1];
+	    delete[]array_;
+	    count_ = 1;
+	    item_ = tmp1;
+	    return tmp2;
+      }
+
+      char*tmpo = array_[count_-1];
+      char**tmpa = new char*[count_-1];
+      for (unsigned idx = 0 ;  idx < count_-1 ;  idx += 1)
+	    tmpa[idx] = array_[idx];
+
+      delete[]array_;
+      array_ = tmpa;
+      count_ -= 1;
+      return tmpo;
+}
+
+const char* hname_t::peek_name(unsigned idx) const
+{
+      if (idx >= count_)
+	    return 0;
+
+      if (count_ == 1)
+	    return item_;
+
+      return array_[idx];
+}
+
+const char* hname_t::peek_tail_name() const
+{
+      switch (count_) {
+	  case 0:
+	    return 0;
+	  case 1:
+	    return item_;
+	  default:
+	    return array_[count_-1];
+      }
+}
+
+bool operator < (const hname_t&l, const hname_t&r)
+{
+      unsigned idx = 0;
+      const char*lc = l.peek_name(idx);
+      const char*rc = r.peek_name(idx);
+
+      while (lc && rc) {
+	    int cmp = strcmp(lc, rc);
+	    if (cmp < 0)
 		  return true;
-
-	      // Ran out of r numbers, so greater.
-	    if (r.number_.size() <= idx)
+	    if (cmp > 0)
 		  return false;
-
-	    if (number_[idx] < r.number_[idx])
-		  return true;
-
-	    if (number_[idx] > r.number_[idx])
-		  return false;
-
 	    idx += 1;
+	    lc = l.peek_name(idx);
+	    rc = r.peek_name(idx);
      }

-	// Fall-through means that we are equal, including all the
-	// number parts, so not less.
+      if (lc && !rc)
+	    return false;
+      if (rc && !lc)
+	    return true;
+
+	// Must be ==
      return false;
 }

-bool hname_t::operator == (const hname_t&r) const
+bool operator == (const hname_t&l, const hname_t&r)
 {
-      if (name_ == r.name_) {
-	    if (number_.size() != r.number_.size())
+      unsigned idx = 0;
+      const char*lc = l.peek_name(idx);
+      const char*rc = r.peek_name(idx);
+
+      while (lc && rc) {
+	    int cmp = strcmp(lc, rc);
+	    if (cmp != 0)
 		  return false;
-
-	    for (size_t idx = 0 ; idx < number_.size() ; idx += 1)
-		  if (number_[idx] != r.number_[idx]) return false;
-
-	    return true;
+	    idx += 1;
+	    lc = l.peek_name(idx);
+	    rc = r.peek_name(idx);
      }

-      return false;
+      if (lc || rc)
+	    return false;
+
+	// Must be ==
+      return true;
 }

 ostream& operator<< (ostream&out, const hname_t&that)
 {
-      if (that.peek_name() == 0) {
+      switch (that.count_) {
+	  case 0:
 	    out << "";
 	    return out;
+	  case 1:
+	    out << that.item_;
+	    return out;
+
+	  default:
+	    out << that.array_[0];
+	    for (unsigned idx = 1 ;  idx < that.count_ ;  idx += 1)
+		  out << "." << that.array_[idx];
+
+	    return out;
      }
-
-      out << that.peek_name();
-      for (size_t idx = 0 ; idx < that.number_.size() ; idx += 1)
-	    out << "[" << that.number_[idx] << "]";
-
-      return out;
 }
+
+/*
+ * $Log: HName.cc,v $
+ * Revision 1.5  2002/11/02 03:27:52  steve
+ *  Allow named events to be referenced by
+ *  hierarchical names.
+ *
+ * Revision 1.4  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.3  2002/01/05 04:36:06  steve
+ *  include malloc.h only when available.
+ *
+ * Revision 1.2  2001/12/18 04:52:45  steve
+ *  Include config.h for namespace declaration.
+ *
+ * Revision 1.1  2001/12/03 04:47:14  steve
+ *  Parser and pform use hierarchical names as hname_t
+ *  objects instead of encoded strings.
+ *
+ */
+
@@ -1,7 +1,7 @@
-#ifndef IVL_HName_H
-#define IVL_HName_H
+#ifndef __HName_H
+#define __HName_H
 /*
- * Copyright (c) 2001-2014 Stephen Williams ([email protected])
+ * Copyright (c) 2001 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,92 +16,86 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: HName.h,v 1.4 2002/11/02 03:27:51 steve Exp $"
+#endif

 # include  <iostream>
-# include  <list>
-# include  <vector>
-# include  "StringHeap.h"
-
-# include  <cassert>
+#ifdef __GNUC__
+#if __GNUC__ > 2
+using namespace std;
+#endif
+#endif

 /*
- * This class represents a component of a Verilog hierarchical name. A
- * hierarchical component contains a name string (represented here
- * with a perm_string) and an optional signed number. This signed
- * number is used if the scope is part of an array, for example an
- * array of module instances or a loop generated scope.
+ * This class represents a Verilog hierarchical name. A hierarchical
+ * name is an ordered list of simple names.
 */

 class hname_t {

-      friend ostream& operator<< (ostream&out, const hname_t&that);
-
    public:
      hname_t ();
-      explicit hname_t (perm_string text);
-      explicit hname_t (perm_string text, int num);
-      explicit hname_t (perm_string text, std::vector<int>&nums);
+      explicit hname_t (const char*text);
      hname_t (const hname_t&that);
      ~hname_t();

-      hname_t& operator= (const hname_t&);
+	// This method adds a name to the end of the hierarchical
+	// path. This becomes a new base name.
+      void append(const char*text);

-      bool operator == (const hname_t&that) const;
-      bool operator <  (const hname_t&that) const;
+	// This method adds a name to the *front* of the hierarchical
+	// path. The base name remains the same, unless this is the
+	// only component.
+      void prepend(const char*text);

-	// Return the string part of the hname_t.
-      perm_string peek_name(void) const;
+	// This method removes the tail name from the hierarchy, and
+	// returns a pointer to that tail name. That tail name now
+	// must be removed by the caller.
+      char* remove_tail_name();

-      size_t has_numbers() const;
-      int peek_number(size_t idx) const;
+	// Return the given component in the hierarchical name. If the
+	// idx is too large, return 0.
+      const char*peek_name(unsigned idx) const;
+      const char*peek_tail_name() const;
+
+	// Return the number of components in the hierarchical
+	// name. If this is a simple name, this will return 1.
+      unsigned component_count() const;
+
+      friend ostream& operator<< (ostream&, const hname_t&);

    private:
-      perm_string name_;
-	// If the number is anything other than INT_MIN, then this is
-	// the numeric part of the name. Otherwise, it is not part of
-	// the name at all.
-      std::vector<int> number_;
+      union {
+	    char**array_;
+	    char* item_;
+      };
+      unsigned count_;

    private: // not implemented
+      hname_t& operator= (const hname_t&);
 };

-inline hname_t::~hname_t()
-{
-}
+extern bool operator <  (const hname_t&, const hname_t&);
+extern bool operator == (const hname_t&, const hname_t&);

-inline perm_string hname_t::peek_name(void) const
-{
-      return name_;
-}
-
-inline int hname_t::peek_number(size_t idx) const
-{
-      assert(number_.size() > idx);
-      return number_[idx];
-}
-
-inline size_t hname_t::has_numbers() const
-{
-      return number_.size();
-}
-
-extern ostream& operator<< (ostream&, const hname_t&);
-
-inline bool operator != (const hname_t&l, const hname_t&r)
-{ return ! (l == r); }
-
-inline ostream& operator<< (ostream&out, const list<hname_t>&ll)
-{
-      list<hname_t>::const_iterator cur = ll.begin();
-      out << *cur;
-      ++ cur;
-      while (cur != ll.end()) {
-	    out << "." << *cur;
-	    ++ cur;
-      }
-      return out;
-}
-
-#endif /* IVL_HName_H */
+/*
+ * $Log: HName.h,v $
+ * Revision 1.4  2002/11/02 03:27:51  steve
+ *  Allow named events to be referenced by
+ *  hierarchical names.
+ *
+ * Revision 1.3  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.2  2002/06/14 03:25:51  steve
+ *  Compiler portability.
+ *
+ * Revision 1.1  2001/12/03 04:47:14  steve
+ *  Parser and pform use hierarchical names as hname_t
+ *  objects instead of encoded strings.
+ *
+ */
+#endif
@@ -14,16 +14,19 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: LineInfo.cc,v 1.4.2.1 2005/08/13 00:45:53 steve Exp $"
+#endif
+
+# include "config.h"

 # include  "LineInfo.h"
 # include  <sstream>

-using namespace std;
-
 LineInfo::LineInfo()
-: lineno_(0)
+: file_(0), lineno_(0)
 {
 }

@@ -31,12 +34,12 @@ LineInfo::~LineInfo()
 {
 }

-string LineInfo::get_fileline() const
+std::string LineInfo::get_line() const
 {
-      ostringstream buf;
-      buf << (file_.str()? file_.str() : "") << ":" << lineno_;
+      std::ostringstream buf;
+      buf << (file_? file_ : "") << ":" << lineno_;

-      string res = buf.str();
+      std::string res = buf.str();
      return res;
 }

@@ -46,7 +49,7 @@ void LineInfo::set_line(const LineInfo&that)
      lineno_ = that.lineno_;
 }

-void LineInfo::set_file(perm_string f)
+void LineInfo::set_file(const char*f)
 {
      file_ = f;
 }
@@ -55,3 +58,24 @@ void LineInfo::set_lineno(unsigned n)
 {
      lineno_ = n;
 }
+
+/*
+ * $Log: LineInfo.cc,v $
+ * Revision 1.4.2.1  2005/08/13 00:45:53  steve
+ *  Fix compilation warnings/errors with newer compilers.
+ *
+ * Revision 1.4  2003/01/17 05:49:03  steve
+ *  Use stringstream in place of sprintf.
+ *
+ * Revision 1.3  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.2  2001/07/25 03:10:48  steve
+ *  Create a config.h.in file to hold all the config
+ *  junk, and support gcc 3.0. (Stephan Boettcher)
+ *
+ * Revision 1.1  2000/11/30 17:31:42  steve
+ *  Change LineInfo to store const C strings.
+ *
+ */
+
@@ -1,7 +1,7 @@
-#ifndef IVL_LineInfo_H
-#define IVL_LineInfo_H
+#ifndef __LineInfo_H
+#define __LineInfo_H
 /*
- * Copyright (c) 1999-2014 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1999 Stephen Williams (steve@icarus.com)
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,10 +16,12 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: LineInfo.h,v 1.7.2.2 2005/08/13 00:45:53 steve Exp $"
+#endif

-# include  "StringHeap.h"
 # include  <string>

 using namespace std;
@@ -36,22 +38,41 @@ using namespace std;
 class LineInfo {
    public:
      LineInfo();
-      virtual ~LineInfo();
+      ~LineInfo();
+
+      std::string get_line() const;

-	// Get a fully formatted file/lineno
-      string get_fileline() const;
-	// Set the file/line from another LineInfo object.
      void set_line(const LineInfo&that);

-	// Access parts of LineInfo data
-      void set_file(perm_string f);
+      void set_file(const char*f);
      void set_lineno(unsigned n);

-      perm_string get_file() const { return file_; }
-      unsigned  get_lineno() const { return lineno_; }
    private:
-      perm_string file_;
+      const char* file_;
      unsigned lineno_;
 };

-#endif /* IVL_LineInfo_H */
+/*
+ * $Log: LineInfo.h,v $
+ * Revision 1.7.2.2  2005/08/13 00:45:53  steve
+ *  Fix compilation warnings/errors with newer compilers.
+ *
+ * Revision 1.7.2.1  2005/06/14 15:33:54  steve
+ *  Fix gcc4 build issues.
+ *
+ * Revision 1.7  2003/01/17 05:49:03  steve
+ *  Use stringstream in place of sprintf.
+ *
+ * Revision 1.6  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.5  2000/11/30 17:31:42  steve
+ *  Change LineInfo to store const C strings.
+ *
+ * Revision 1.4  2000/02/23 02:56:53  steve
+ *  Macintosh compilers do not support ident.
+ *
+ * Revision 1.3  1999/02/15 02:06:15  steve
+ *  Elaborate gate ranges.
+ */
+#endif
@@ -12,380 +12,292 @@
 #
 #    You should have received a copy of the GNU Library General Public
 #    License along with this program; if not, write to the Free
-#    Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#    Boston, MA 02110-1301, USA.
+#    Software Foundation, Inc.,
+#    59 Temple Place - Suite 330
+#    Boston, MA 02111-1307, USA
+#
+#ident "$Id: Makefile.in,v 1.169.2.5 2006/10/04 17:08:59 steve Exp $"
+#
 #
 SHELL = /bin/sh

-# The interesting make targets are:
-#
-#   make version
-#      Force the version_tag.h file to be rebuilt. Otherwise, it will only
-#      be built if it is missing.
-#
-#   make all
-#   make install
-#
-# The "suffix" is used as an installation suffix. It modifies certain
-# key install paths/files such that a build and install of Icarus Verilog
-# with the same $(prefix) but a different $(suffix) will not interfere.
-# The normal configuration leaves suffix empty
-suffix = @install_suffix@
+# This version string is only used in the version message printed
+# by the compiler. It reflects the assigned version number for the
+# product as a whole. Most components also print the CVS Name: token
+# in order to get a more automatic version stamp as well.
+VERSION = 0.8.3

 prefix = @prefix@
 exec_prefix = @exec_prefix@
 srcdir = @srcdir@
-datarootdir = @datarootdir@

-SUBDIRS = ivlpp vhdlpp vvp vpi libveriuser cadpli tgt-null tgt-stub tgt-vvp \
-          tgt-vhdl tgt-vlog95 tgt-pcb tgt-blif tgt-sizer driver
-# Only run distclean for these directories.
-NOTUSED = tgt-fpga tgt-pal tgt-verilog
+SUBDIRS = @subdirs@

-ifeq (@MINGW32@,yes)
-SUBDIRS += driver-vpi
-else
-NOTUSED += driver-vpi
-endif
-
-# To get the version headers to build correctly we only want to look
-# for C++ files in the source directory. All other files will require
-# an explicit $(srcdir). The one exception to this is if we need to
-# rebuild the lexor_keyword.cc file. If we do, then we want to use the
-# local version instead of the one is $(srcdir).
-vpath lexor_keyword.cc .
-vpath %.cc $(srcdir)/libmisc
-vpath %.cc $(srcdir)
+VPATH = $(srcdir)

 bindir = @bindir@
 libdir = @libdir@
-# This is actually the directory where we install our own header files.
-# It is a little different from the generic includedir.
-includedir = @includedir@/iverilog$(suffix)
+includedir = @includedir@
 mandir = @mandir@

-dllib=@DLLIB@
+libdir64 = @libdir64@

-# For a cross compile these defines will need to be set accordingly.
-HOSTCC = @CC@
-HOSTCFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ @CFLAGS@
+dllib=@DLLIB@
+strip_dynamic=@strip_dynamic@

 CC = @CC@
 CXX = @CXX@
-DLLTOOL = @DLLTOOL@
 INSTALL = @INSTALL@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+STRIP = @STRIP@
 LEX = @LEX@
 YACC = @YACC@
 MAN = @MAN@
 PS2PDF = @PS2PDF@
-GIT = @GIT@

-ifeq (@srcdir@,.)
-INCLUDE_PATH = -I. -Ilibmisc
-else
-INCLUDE_PATH = -I. -I$(srcdir) -I$(srcdir)/libmisc
-endif
-
-CPPFLAGS = @DEFS@ $(INCLUDE_PATH) @CPPFLAGS@
-CFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ @CFLAGS@
-CXXFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CXX@ @CXXFLAGS@
+CPPFLAGS = @ident_support@ @DEFS@ -I. -I$(srcdir) @CPPFLAGS@
+CXXFLAGS = -Wall @CXXFLAGS@
 PICFLAGS = @PICFLAG@
 LDFLAGS = @rdynamic@ @LDFLAGS@
-CTARGETFLAGS = @CTARGETFLAGS@

-# Source files in the libmisc directory
-M = LineInfo.o StringHeap.o
+# The TARGETS variable lists the target modules that can be build and
+# installed. Some of them depend on external things, so are only
+# compiled if the prerequisites are installed.
+TARGETS = tgt-null

-TT = t-dll.o t-dll-api.o t-dll-expr.o t-dll-proc.o t-dll-analog.o
-FF = cprop.o nodangle.o synth.o synth2.o syn-rules.o
-
-O = main.o async.o design_dump.o discipline.o dup_expr.o elaborate.o \
-    elab_expr.o elaborate_analog.o elab_lval.o elab_net.o \
-    elab_scope.o elab_sig.o elab_sig_analog.o elab_type.o \
-    emit.o eval.o eval_attrib.o \
-    eval_tree.o expr_synth.o functor.o lexor.o lexor_keyword.o link_const.o \
-    load_module.o netlist.o netmisc.o nettypes.o net_analog.o net_assign.o \
-    net_design.o netclass.o netdarray.o \
-    netenum.o netparray.o netqueue.o netscalar.o netstruct.o netvector.o \
-    net_event.o net_expr.o net_func.o \
-    net_func_eval.o net_link.o net_modulo.o \
-    net_nex_input.o net_nex_output.o net_proc.o net_scope.o net_tran.o \
-    net_udp.o pad_to_width.o parse.o parse_misc.o pform.o pform_analog.o \
-    pform_disciplines.o pform_dump.o pform_package.o pform_pclass.o \
-    pform_class_type.o pform_string_type.o pform_struct_type.o pform_types.o \
-    symbol_search.o sync.o sys_funcs.o verinum.o verireal.o target.o \
-    Attrib.o HName.o Module.o PClass.o PDelays.o PEvent.o PExpr.o PGate.o \
-    PGenerate.o PPackage.o PScope.o PSpec.o PTask.o PUdp.o PFunction.o PWire.o \
-    Statement.o AStatement.o $M $(FF) $(TT)
-
-all: dep config.h _pli_types.h version_tag.h ivl@EXEEXT@ version.exe iverilog-vpi.man
-	$(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true
+all: dep ivl@EXEEXT@
+	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
+	for tgt in $(TARGETS); do (cd $$tgt ; $(MAKE) $@); done
+	for dir in ivlpp tgt-verilog tgt-stub; \
+	    do (cd $$dir ; $(MAKE) $@); done
+	cd driver ; $(MAKE) VERSION=$(VERSION) $@

 # In the windows world, the installer will need a dosify program to
 # dosify text files.
-ifeq (@MINGW32@,yes)
-all: dosify.exe
-dosify.exe: $(srcdir)/dosify.c
-	$(HOSTCC) $(HOSTCFLAGS) -o dosify.exe $(srcdir)/dosify.c
+ifeq (@WIN32@,yes)
+all: dep dosify.exe
+dosify.exe: dosify.c
+	$(CC) -o dosify.exe dosify.c
 endif

 # This rule rules the compiler in the trivial hello.vl program to make
 # sure the basics were compiled properly.
 check: all
-	$(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true
+	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) check); done
 	test -r check.conf || cp $(srcdir)/check.conf .
 	driver/iverilog -B. -BPivlpp -tcheck -ocheck.vvp $(srcdir)/examples/hello.vl
-ifeq (@WIN32@,yes)
-ifeq (@install_suffix@,)
 	vvp/vvp -M- -M./vpi ./check.vvp | grep 'Hello, World'
-else
-	# On Windows if we have a suffix we must run the vvp part of
-	# the test with a suffix since it was built/linked that way.
-	ln vvp/vvp.exe vvp/vvp$(suffix).exe
-	vvp/vvp$(suffix) -M- -M./vpi ./check.vvp | grep 'Hello, World'
-	rm vvp/vvp$(suffix).exe
-endif
-else
-	vvp/vvp -M- -M./vpi ./check.vvp | grep 'Hello, World'
-endif

 clean:
-	$(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true
-	rm -f *.o parse.cc parse.h lexor.cc
-	rm -f ivl.exp iverilog-vpi.man iverilog-vpi.pdf iverilog-vpi.ps
-	rm -f parse.output syn-rules.output dosify.exe ivl@EXEEXT@ check.vvp
-	rm -f lexor_keyword.cc libivl.a libvpi.a iverilog-vpi syn-rules.cc
-	rm -rf dep
-	rm -f version.exe
+	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
+	for tgt in $(TARGETS); do (cd $$tgt ; $(MAKE) $@); done
+	for dir in vpi ivlpp tgt-verilog tgt-stub driver; \
+	    do (cd $$dir ; $(MAKE) $@); done
+	rm -f *.o parse.cc parse.cc.output parse.h lexor.cc
+	rm -f lexor_keyword.cc libivl.a libvpi.a iverilog-vpi syn-rules.cc*
+	rm -rf dep ivl@EXEEXT@

 distclean: clean
-	$(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true
-	$(foreach dir,$(NOTUSED),$(MAKE) -C $(dir) $@ && ) true
-	rm -f Makefile config.status config.log config.cache
-	rm -f stamp-config-h config.h
-	rm -f stamp-_pli_types-h _pli_types.h
-ifneq (@srcdir@,.)
-	rm -f version_tag.h check.conf
-	rmdir $(SUBDIRS) $(NOTUSED)
-endif
+	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
+	for tgt in $(TARGETS); do (cd $$tgt ; $(MAKE) $@); done
+	for dir in vpi ivlpp tgt-verilog tgt-stub driver; \
+	    do (cd $$dir ; $(MAKE) $@); done
+	rm -f Makefile config.status config.log config.cache config.h
 	rm -rf autom4te.cache

-cppcheck: $(O:.o=.cc) $(srcdir)/dosify.c $(srcdir)/version.c
-	cppcheck --enable=all -f --suppressions-list=$(srcdir)/cppcheck.sup \
-	         -UYYPARSE_PARAM -UYYPRINT -Ushort -Usize_t -Uyyoverflow \
-	         -UYYTYPE_INT8 -UYYTYPE_INT16 -UYYTYPE_UINT8 -UYYTYPE_UINT16 \
-	         --relative-paths=$(srcdir) $(INCLUDE_PATH) $^
+TT = t-dll.o t-dll-api.o t-dll-expr.o t-dll-proc.o t-xnf.o
+FF = cprop.o nodangle.o synth.o synth2.o syn-rules.o xnfio.o

-cppcheck-all:
-	$(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) cppcheck && ) true
-	$(foreach dir,$(NOTUSED),$(MAKE) -C $(dir) cppcheck && ) true
-	$(MAKE) cppcheck
+O = main.o async.o design_dump.o dup_expr.o elaborate.o elab_expr.o \
+elab_lval.o elab_net.o elab_anet.o elab_pexpr.o elab_scope.o \
+elab_sig.o emit.o eval.o eval_attrib.o \
+eval_tree.o expr_synth.o functor.o lexor.o lexor_keyword.o link_const.o \
+load_module.o netlist.o netmisc.o net_assign.o \
+net_design.o net_event.o net_expr.o net_force.o net_func.o \
+net_link.o net_modulo.o net_nex_input.o net_nex_output.o \
+net_proc.o net_scope.o net_udp.o net_variable.o pad_to_width.o \
+parse.o parse_misc.o pform.o pform_dump.o \
+set_width.o symbol_search.o sync.o sys_funcs.o \
+verinum.o verireal.o target.o targets.o \
+Attrib.o HName.o LineInfo.o Module.o PData.o PDelays.o PEvent.o \
+PExpr.o PGate.o \
+PTask.o PUdp.o PFunction.o PWire.o Statement.o StringHeap.o \
+$(FF) $(TT)

-Makefile: $(srcdir)/Makefile.in config.status
-	./config.status --file=$@
-
-dep:
-	mkdir dep
-
-stamp-config-h: $(srcdir)/config.h.in config.status
-	@rm -f $@
-	./config.status config.h
-config.h: stamp-config-h
-
-stamp-_pli_types-h: $(srcdir)/_pli_types.h.in config.status
-	@rm -f $@
-	./config.status _pli_types.h
-_pli_types.h: stamp-_pli_types-h
-
-$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4
-	cd $(srcdir) && autoconf
-
-config.status: $(srcdir)/configure
-	./config.status --recheck
+Makefile: Makefile.in config.h.in config.status
 	./config.status

+
 ifeq (@WIN32@,yes)
 # Under Windows (mingw) I need to make the ivl.exe in two steps.
 # The first step makes an ivl.exe that dlltool can use to make an
 # export and import library, and the last link makes a, ivl.exe
 # that really exports the things that the import library imports.
-ivl@EXEEXT@: $O $(srcdir)/ivl.def
+ivl@EXEEXT@: $O ivl.def
 	$(CXX) -o ivl@EXEEXT@ $O $(dllib) @EXTRALIBS@
-	$(DLLTOOL) --dllname ivl@EXEEXT@ --def $(srcdir)/ivl.def \
+	dlltool --dllname ivl@EXEEXT@ --def ivl.def \
 		--output-lib libivl.a --output-exp ivl.exp
-	$(CXX) $(LDFLAGS) -o ivl@EXEEXT@ ivl.exp $O $(dllib) @EXTRALIBS@
+	$(CXX) -o ivl@EXEEXT@ ivl.exp $O $(dllib) @EXTRALIBS@
 else
 ivl@EXEEXT@: $O
 	$(CXX) $(LDFLAGS) -o ivl@EXEEXT@ $O $(dllib)
+
 endif

-ifeq (@MINGW32@,no)
-all: iverilog-vpi
+ifeq (@MINGW32@,yes)
+SUBDIRS += driver-vpi
+else
+all: dep iverilog-vpi

-iverilog-vpi: $(srcdir)/iverilog-vpi.sh Makefile
+iverilog-vpi: iverilog-vpi.sh
 	sed -e 's;@SHARED@;@shared@;' -e 's;@PIC@;@PICFLAG@;' \
-	    -e 's;@SUFFIX@;$(suffix);' \
-	    -e 's;@IVCC@;$(CC);' \
-	    -e 's;@IVCXX@;$(CXX);' \
-	    -e 's;@IVCFLAGS@;$(CFLAGS);' \
-	    -e 's;@IVCXXFLAGS@;$(CXXFLAGS);' \
-	    -e 's;@IVCTARGETFLAGS@;$(CTARGETFLAGS);' \
-	    -e 's;@INCLUDEDIR@;$(includedir);' \
+	    -e 's;@INCLUDEDIR@;@includedir@;' \
+	    -e 's;@LIBDIR64@;@libdir64@;' \
+	    -e 's;@VPIDIR1@;@vpidir1@;' -e 's;@VPIDIR2@;@vpidir2@;' \
 	    -e 's;@LIBDIR@;@libdir@;' $< > $@
 	chmod +x $@
 endif

-version.exe: $(srcdir)/version.c $(srcdir)/version_base.h version_tag.h
-	$(HOSTCC) $(HOSTCFLAGS) -o version.exe -I. -I$(srcdir) $(srcdir)/version.c
+dep:
+	mkdir dep

-%.o: %.cc config.h
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
+%.o: %.cc
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -MD -c $< -o $*.o
 	mv $*.d dep/$*.d

-# Here are some explicit dependencies needed to get things going.
-main.o: main.cc version_tag.h

 lexor.o: lexor.cc parse.h

 parse.o: parse.cc

-# Build this in two steps to avoid parallel build issues (see pr3462585)
-parse.cc: $(srcdir)/parse.y
-	$(YACC) --verbose -t -p VL -d -o $@ $<
-parse.h: parse.cc
-	mv parse.cc.h $@ 2>/dev/null || mv parse.hh $@
+parse.cc parse.h: $(srcdir)/parse.y
+	$(YACC) --verbose -t -p VL -d -o parse.cc $(srcdir)/parse.y
+	mv parse.cc.h parse.h 2>/dev/null || mv parse.hh parse.h

 syn-rules.cc: $(srcdir)/syn-rules.y
-	$(YACC) --verbose -t -p syn_ -o $@ $<
+	$(YACC) --verbose -p syn_ -o syn-rules.cc $(srcdir)/syn-rules.y

 lexor.cc: $(srcdir)/lexor.lex
-	$(LEX) -s -t $< > $@
+	$(LEX) -PVL -s -olexor.cc $(srcdir)/lexor.lex

 lexor_keyword.o: lexor_keyword.cc parse.h

-lexor_keyword.cc: $(srcdir)/lexor_keyword.gperf
-	gperf -o -i 7 -C -k 1-4,6,9,$$ -H keyword_hash -N check_identifier -t $(srcdir)/lexor_keyword.gperf > lexor_keyword.cc || (rm -f lexor_keyword.cc ; false)
+lexor_keyword.cc: lexor_keyword.gperf
+	gperf -o -i 7 -C -k 1-3,$$ -L ANSI-C -H keyword_hash -N check_identifier -t $(srcdir)/lexor_keyword.gperf > lexor_keyword.cc || (rm -f lexor_keyword.cc ; false)

-iverilog-vpi.man: $(srcdir)/iverilog-vpi.man.in version.exe
-	./version.exe `head -1 $(srcdir)/iverilog-vpi.man.in`'\n' > $@
-	tail -n +2 $(srcdir)/iverilog-vpi.man.in >> $@
-
-iverilog-vpi.ps: iverilog-vpi.man
-	$(MAN) -t ./iverilog-vpi.man > iverilog-vpi.ps
+iverilog-vpi.ps: $(srcdir)/iverilog-vpi.man
+	$(MAN) -t $(srcdir)/iverilog-vpi.man > iverilog-vpi.ps

 iverilog-vpi.pdf: iverilog-vpi.ps
 	$(PS2PDF) iverilog-vpi.ps iverilog-vpi.pdf

-# For VERSION_TAG in driver/main.c, first try git-describe, then look for a
-# version_tag.h file in the source tree (included in snapshots and releases),
-# and finally use nothing.
-
-# "true" and "false" in the next few lines are Unix shell command names
-ifeq ($(GIT),none)
-GIT_PRESENT = false
-else
-GIT_PRESENT = true
-endif
-version_tag.h version:
-	@if $(GIT_PRESENT) && test -d $(srcdir)/.git; then \
-	    echo "Using git-describe for VERSION_TAG"; \
-	    tmp=`$(GIT) --git-dir $(srcdir)/.git describe --always --dirty \
-		   | sed -e 's;\(.*\);#define VERSION_TAG "\1";'`; \
-	    echo "$$tmp" | diff - version_tag.h > /dev/null 2>&1 || echo "$$tmp" > version_tag.h || exit 1; \
-	elif test -r $(srcdir)/version_tag.h; then \
-	    echo "Using $(srcdir)/version_tag.h for VERSION_TAG"; \
-	    diff $(srcdir)/version_tag.h version_tag.h > /dev/null 2>&1 || cp $(srcdir)/version_tag.h version_tag.h; \
-	else \
-	    echo "Using empty VERSION_TAG"; \
-	    echo '#define VERSION_TAG ""' > version_tag.h; \
-	fi
-
-ifeq (@MINGW32@,yes)
+# Build and install the iverilog-vpi.pdf only if there is a man
+# program *and* a ps2pdf program.
+ifeq (@WIN32@,yes)
 ifeq ($(MAN),none)
-INSTALL_DOC = $(mandir)/man1/iverilog-vpi$(suffix).1
+INSTALL_DOC = $(mandir)/man1/iverilog-vpi.1
 else
 ifeq ($(PS2PDF),none)
-INSTALL_DOC = $(mandir)/man1/iverilog-vpi$(suffix).1
+INSTALL_DOC = $(mandir)/man1/iverilog-vpi.1
 else
-INSTALL_DOC = $(prefix)/iverilog-vpi$(suffix).pdf $(mandir)/man1/iverilog-vpi$(suffix).1
+INSTALL_DOC = $(prefix)/iverilog-vpi.pdf $(mandir)/man1/iverilog-vpi.1
 all: dep iverilog-vpi.pdf
 endif
 endif
 INSTALL_DOCDIR = $(mandir)/man1
 else
-INSTALL_DOC = $(mandir)/man1/iverilog-vpi$(suffix).1
+INSTALL_DOC = $(mandir)/man1/iverilog-vpi.1
 INSTALL_DOCDIR = $(mandir)/man1
 endif

 ifeq (@MINGW32@,yes)
-WIN32_INSTALL =
+WIN32_INSTALL = $(prefix)/hello.vl $(prefix)/sqrt.vl $(prefix)/sqrt-virtex.v $(prefix)/QUICK_START.txt
 else
-WIN32_INSTALL = $(bindir)/iverilog-vpi$(suffix)
+WIN32_INSTALL = $(bindir)/iverilog-vpi
 endif

-install: all installdirs $(libdir)/ivl$(suffix)/ivl@EXEEXT@  $(libdir)/ivl$(suffix)/include/constants.vams $(libdir)/ivl$(suffix)/include/disciplines.vams $(includedir)/ivl_target.h $(includedir)/_pli_types.h $(includedir)/sv_vpi_user.h $(includedir)/vpi_user.h $(includedir)/acc_user.h $(includedir)/veriuser.h $(WIN32_INSTALL) $(INSTALL_DOC)
-	$(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true
+XNF_INSTALL = $(libdir)/ivl/xnf.conf $(libdir)/ivl/xnf-s.conf

-$(bindir)/iverilog-vpi$(suffix): ./iverilog-vpi
-	$(INSTALL_SCRIPT) ./iverilog-vpi "$(DESTDIR)$(bindir)/iverilog-vpi$(suffix)"
+install: all installdirs $(libdir)/ivl/ivl@EXEEXT@  $(includedir)/ivl_target.h $(includedir)/_pli_types.h $(includedir)/vpi_user.h $(includedir)/acc_user.h $(includedir)/veriuser.h $(WIN32_INSTALL) $(INSTALL_DOC) $(XNF_INSTALL)
+	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
+	for tgt in $(TARGETS); do (cd $$tgt ; $(MAKE) $@); done
+	for dir in vpi ivlpp driver; \
+	    do (cd $$dir ; $(MAKE) $@); done

-$(libdir)/ivl$(suffix)/ivl@EXEEXT@: ./ivl@EXEEXT@
-	$(INSTALL_PROGRAM) ./ivl@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/ivl@EXEEXT@"
+$(bindir)/iverilog-vpi: ./iverilog-vpi
+	$(INSTALL_SCRIPT) ./iverilog-vpi $(bindir)/iverilog-vpi

-$(libdir)/ivl$(suffix)/include/constants.vams: $(srcdir)/constants.vams
-	$(INSTALL_DATA) $(srcdir)/constants.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/constants.vams"
+$(libdir)/ivl/ivl@EXEEXT@: ./ivl@EXEEXT@
+	$(INSTALL_PROGRAM) ./ivl@EXEEXT@ $(libdir)/ivl/ivl@EXEEXT@
+	$(STRIP) $(strip_dynamic) $(libdir)/ivl/ivl@EXEEXT@

-$(libdir)/ivl$(suffix)/include/disciplines.vams: $(srcdir)/disciplines.vams
-	$(INSTALL_DATA) $(srcdir)/disciplines.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/disciplines.vams"
+$(libdir)/ivl/xnf-s.conf: $(srcdir)/xnf-s.conf
+	$(INSTALL_DATA) $(srcdir)/xnf-s.conf $(libdir)/ivl/xnf-s.conf
+
+$(libdir)/ivl/xnf.conf: $(srcdir)/xnf.conf
+	$(INSTALL_DATA) $(srcdir)/xnf.conf $(libdir)/ivl/xnf.conf

 $(includedir)/ivl_target.h: $(srcdir)/ivl_target.h
-	$(INSTALL_DATA) $(srcdir)/ivl_target.h "$(DESTDIR)$(includedir)/ivl_target.h"
+	$(INSTALL_DATA) $(srcdir)/ivl_target.h $(includedir)/ivl_target.h

 $(includedir)/_pli_types.h: _pli_types.h
-	$(INSTALL_DATA) $< "$(DESTDIR)$(includedir)/_pli_types.h"
-
-$(includedir)/sv_vpi_user.h: $(srcdir)/sv_vpi_user.h
-	$(INSTALL_DATA) $(srcdir)/sv_vpi_user.h "$(DESTDIR)$(includedir)/sv_vpi_user.h"
+	$(INSTALL_DATA) $< $(includedir)/_pli_types.h

 $(includedir)/vpi_user.h: $(srcdir)/vpi_user.h
-	$(INSTALL_DATA) $(srcdir)/vpi_user.h "$(DESTDIR)$(includedir)/vpi_user.h"
+	$(INSTALL_DATA) $(srcdir)/vpi_user.h $(includedir)/vpi_user.h

 $(includedir)/acc_user.h: $(srcdir)/acc_user.h
-	$(INSTALL_DATA) $(srcdir)/acc_user.h "$(DESTDIR)$(includedir)/acc_user.h"
+	$(INSTALL_DATA) $(srcdir)/acc_user.h $(includedir)/acc_user.h

 $(includedir)/veriuser.h: $(srcdir)/veriuser.h
-	$(INSTALL_DATA) $(srcdir)/veriuser.h "$(DESTDIR)$(includedir)/veriuser.h"
+	$(INSTALL_DATA) $(srcdir)/veriuser.h $(includedir)/veriuser.h

-$(mandir)/man1/iverilog-vpi$(suffix).1: iverilog-vpi.man
-	$(INSTALL_DATA) iverilog-vpi.man "$(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1"
+$(mandir)/man1/iverilog-vpi.1: $(srcdir)/iverilog-vpi.man
+	$(INSTALL_DATA) $(srcdir)/iverilog-vpi.man $(mandir)/man1/iverilog-vpi.1

-$(prefix)/iverilog-vpi$(suffix).pdf: iverilog-vpi.pdf
-	$(INSTALL_DATA) iverilog-vpi.pdf "$(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf"
+$(prefix)/iverilog-vpi.pdf: iverilog-vpi.pdf
+	$(INSTALL_DATA) iverilog-vpi.pdf $(prefix)/iverilog-vpi.pdf

+# In windows installations, put a few examples and the quick_start
+# into the destination directory.
+ifeq (@MINGW32@,yes)
+$(prefix)/hello.vl: $(srcdir)/examples/hello.vl
+	./dosify.exe $(srcdir)/examples/hello.vl tmp.vl
+	mv tmp.vl $(prefix)/hello.vl

-installdirs: $(srcdir)/mkinstalldirs
-	$(srcdir)/mkinstalldirs "$(DESTDIR)$(bindir)" \
-	    "$(DESTDIR)$(includedir)" \
-	    "$(DESTDIR)$(libdir)/ivl$(suffix)" \
-	    "$(DESTDIR)$(libdir)/ivl$(suffix)/include" \
-	    "$(DESTDIR)$(mandir)" \
-	    "$(DESTDIR)$(mandir)/man1"
+$(prefix)/sqrt.vl: $(srcdir)/examples/sqrt.vl
+	./dosify.exe $(srcdir)/examples/sqrt.vl tmp.vl
+	mv tmp.vl $(prefix)/sqrt.vl
+
+$(prefix)/sqrt-virtex.v: $(srcdir)/examples/sqrt-virtex.v
+	./dosify.exe $(srcdir)/examples/sqrt-virtex.v tmp.vl
+	mv tmp.vl $(prefix)/sqrt-virtex.v
+
+$(prefix)/QUICK_START.txt: $(srcdir)/QUICK_START.txt
+	./dosify.exe $(srcdir)/QUICK_START.txt tmp.txt
+	mv tmp.txt $(prefix)/QUICK_START.txt
+endif
+
+installdirs: mkinstalldirs
+	$(srcdir)/mkinstalldirs $(bindir) $(includedir) $(libdir)/ivl \
+	    $(mandir) $(mandir)/man1

 uninstall:
-	$(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true
-	for f in ivl@EXEEXT@ include/constants.vams include/disciplines.vams; \
-	    do rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/$$f"; done
-	-rmdir "$(DESTDIR)$(libdir)/ivl$(suffix)/include"
-	-rmdir "$(DESTDIR)$(libdir)/ivl$(suffix)"
-	for f in verilog$(suffix) iverilog-vpi$(suffix) gverilog$(suffix)@EXEEXT@; \
-	    do rm -f "$(DESTDIR)$(bindir)/$$f"; done
-	for f in ivl_target.h vpi_user.h _pli_types.h sv_vpi_user.h acc_user.h veriuser.h; \
-	    do rm -f "$(DESTDIR)$(includedir)/$$f"; done
-	-test X$(suffix) = X || rmdir "$(DESTDIR)$(includedir)"
-	rm -f "$(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1" "$(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf"
+	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
+	for tgt in $(TARGETS); do (cd $$tgt ; $(MAKE) $@); done
+	for dir in vpi ivlpp driver; \
+	    do (cd $$dir ; $(MAKE) $@); done
+	for f in xnf.conf xnf-s.conf ivl; \
+	    do rm -f $(libdir)/ivl/$$f; done
+	-rmdir $(libdir)/ivl
+	for f in verilog iverilog-vpi gverilog@EXEEXT@; \
+	    do rm -f $(bindir)/$$f; done
+	for f in ivl_target.h vpi_user.h _pli_types.h acc_user.h veriuser.h; \
+	    do rm -f $(includedir)/$$f; done
+	rm -f $(mandir)/man1/iverilog-vpi.1


 -include $(patsubst %.o, dep/%.d, $O)
+-include $(patsubst %.o, dep/%.d, vpithunk.o)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2010 Stephen Williams ([email protected])
+ * Copyright (c) 1998-2000 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -14,30 +14,24 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: Module.cc,v 1.25 2004/10/04 01:10:51 steve Exp $"
+#endif

 # include "config.h"

 # include  "Module.h"
 # include  "PGate.h"
 # include  "PWire.h"
-# include  <cassert>
-
-list<Module::named_expr_t> Module::user_defparms;
+# include  <assert.h>

 /* n is a permallocated string. */
-Module::Module(LexicalScope*parent, perm_string n)
-: PScopeExtra(n, parent)
+Module::Module(perm_string n)
+: name_(n)
 {
-      library_flag = false;
-      is_cell = false;
-      program_block = false;
-      uc_drive = UCD_NONE;
-      timescale_warn_done = false;
-      time_unit = 0;
-      time_precision = 0;
-      time_from_timescale = false;
+      default_nettype = NetNet::NONE;
 }

 Module::~Module()
@@ -49,9 +43,34 @@ void Module::add_gate(PGate*gate)
      gates_.push_back(gate);
 }

+void Module::add_task(perm_string name, PTask*task)
+{
+      tasks_[name] = task;
+}
+
+void Module::add_function(perm_string name, PFunction *func)
+{
+      funcs_[name] = func;
+}
+
+PWire* Module::add_wire(PWire*wire)
+{
+      PWire*&ep = wires_[wire->path()];
+      if (ep) return ep;
+
+      assert(ep == 0);
+      ep = wire;
+      return wire;
+}
+
+void Module::add_behavior(PProcess*b)
+{
+      behaviors_.push_back(b);
+}
+
 unsigned Module::port_count() const
 {
-      return ports.size();
+      return ports.count();
 }

 /*
@@ -59,10 +78,10 @@ unsigned Module::port_count() const
 * module. If the port is internally unconnected, return an empty
 * array.
 */
-const vector<PEIdent*>& Module::get_port(unsigned idx) const
+const svector<PEIdent*>& Module::get_port(unsigned idx) const
 {
-      assert(idx < ports.size());
-      static const vector<PEIdent*> zero;
+      assert(idx < ports.count());
+      static svector<PEIdent*> zero;

      if (ports[idx])
 	    return ports[idx]->expr;
@@ -72,8 +91,8 @@ const vector<PEIdent*>& Module::get_port(unsigned idx) const

 unsigned Module::find_port(const char*name) const
 {
-      assert(name != 0);
-      for (unsigned idx = 0 ;  idx < ports.size() ;  idx += 1) {
+      assert(name != "");
+      for (unsigned idx = 0 ;  idx < ports.count() ;  idx += 1) {
 	    if (ports[idx] == 0) {
 		    /* It is possible to have undeclared ports. These
 		       are ports that are skipped in the declaration,
@@ -87,30 +106,24 @@ unsigned Module::find_port(const char*name) const
 		  return idx;
      }

-      return ports.size();
+      return ports.count();
 }

-perm_string Module::get_port_name(unsigned idx) const
+
+PWire* Module::get_wire(const hname_t&name) const
 {
-
-      assert(idx < ports.size());
-      if (ports[idx] == 0) {
-              /* It is possible to have undeclared ports. These
-                 are ports that are skipped in the declaration,
-                 for example like so: module foo(x ,, y); The
-                 port between x and y is unnamed and thus
-                 inaccessible to binding by name. */
-            return perm_string::literal("");
-      }
-      return ports[idx]->name;
+      map<hname_t,PWire*>::const_iterator obj = wires_.find(name);
+      if (obj == wires_.end())
+	    return 0;
+      else
+	    return (*obj).second;
 }

-
-
 PGate* Module::get_gate(perm_string name)
 {
      for (list<PGate*>::iterator cur = gates_.begin()
-		 ; cur != gates_.end() ; ++ cur ) {
+		 ; cur != gates_.end()
+		 ; cur ++ ) {

 	    if ((*cur)->get_name() == name)
 		  return *cur;
@@ -119,7 +132,105 @@ PGate* Module::get_gate(perm_string name)
      return 0;
 }

+const map<hname_t,PWire*>& Module::get_wires() const
+{
+      return wires_;
+}
+
 const list<PGate*>& Module::get_gates() const
 {
      return gates_;
 }
+
+const list<PProcess*>& Module::get_behaviors() const
+{
+      return behaviors_;
+}
+
+
+/*
+ * $Log: Module.cc,v $
+ * Revision 1.25  2004/10/04 01:10:51  steve
+ *  Clean up spurious trailing white space.
+ *
+ * Revision 1.24  2004/06/13 04:56:53  steve
+ *  Add support for the default_nettype directive.
+ *
+ * Revision 1.23  2004/02/20 06:22:56  steve
+ *  parameter keys are per_strings.
+ *
+ * Revision 1.22  2004/02/18 17:11:54  steve
+ *  Use perm_strings for named langiage items.
+ *
+ * Revision 1.21  2003/04/02 03:00:14  steve
+ *  Cope with empty module ports while binding by name.
+ *
+ * Revision 1.20  2003/03/06 04:37:12  steve
+ *  lex_strings.add module names earlier.
+ *
+ * Revision 1.19  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.18  2002/05/19 23:37:28  steve
+ *  Parse port_declaration_lists from the 2001 Standard.
+ *
+ * Revision 1.17  2001/12/03 04:47:14  steve
+ *  Parser and pform use hierarchical names as hname_t
+ *  objects instead of encoded strings.
+ *
+ * Revision 1.16  2001/10/20 05:21:51  steve
+ *  Scope/module names are char* instead of string.
+ *
+ * Revision 1.15  2001/07/25 03:10:48  steve
+ *  Create a config.h.in file to hold all the config
+ *  junk, and support gcc 3.0. (Stephan Boettcher)
+ *
+ * Revision 1.14  2000/11/15 20:31:05  steve
+ *  Fix warning about temporaries.
+ *
+ * Revision 1.13  2000/11/05 06:05:59  steve
+ *  Handle connectsion to internally unconnected modules (PR#38)
+ *
+ * Revision 1.12  2000/05/16 04:05:15  steve
+ *  Module ports are really special PEIdent
+ *  expressions, because a name can be used
+ *  many places in the port list.
+ *
+ * Revision 1.11  2000/03/12 17:09:40  steve
+ *  Support localparam.
+ *
+ * Revision 1.10  2000/02/23 02:56:53  steve
+ *  Macintosh compilers do not support ident.
+ *
+ * Revision 1.9  2000/01/09 20:37:57  steve
+ *  Careful with wires connected to multiple ports.
+ *
+ * Revision 1.8  1999/12/11 05:45:41  steve
+ *  Fix support for attaching attributes to primitive gates.
+ *
+ * Revision 1.7  1999/09/17 02:06:25  steve
+ *  Handle unconnected module ports.
+ *
+ * Revision 1.6  1999/08/04 02:13:02  steve
+ *  Elaborate module ports that are concatenations of
+ *  module signals.
+ *
+ * Revision 1.5  1999/08/03 04:14:49  steve
+ *  Parse into pform arbitrarily complex module
+ *  port declarations.
+ *
+ * Revision 1.4  1999/07/31 19:14:47  steve
+ *  Add functions up to elaboration (Ed Carter)
+ *
+ * Revision 1.3  1999/07/03 02:12:51  steve
+ *  Elaborate user defined tasks.
+ *
+ * Revision 1.2  1999/06/17 05:34:42  steve
+ *  Clean up interface of the PWire class,
+ *  Properly match wire ranges.
+ *
+ * Revision 1.1  1998/11/03 23:28:51  steve
+ *  Introduce verilog to CVS.
+ *
+ */
+
@@ -1,7 +1,7 @@
-#ifndef IVL_Module_H
-#define IVL_Module_H
+#ifndef __Module_H
+#define __Module_H
 /*
- * Copyright (c) 1998-2014 Stephen Williams ([email protected])
+ * Copyright (c) 1998-2004 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,26 +16,25 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
-
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: Module.h,v 1.37 2004/06/13 04:56:53 steve Exp $"
+#endif

 # include  <list>
 # include  <map>
-# include  <vector>
-# include  <utility>
+# include  "svector.h"
 # include  "StringHeap.h"
 # include  "HName.h"
 # include  "named.h"
-# include  "PScope.h"
 # include  "LineInfo.h"
 # include  "netlist.h"
-# include  "pform_types.h"
+class PData;
+class PEvent;
 class PExpr;
 class PEIdent;
 class PGate;
-class PGenerate;
-class PSpecPath;
 class PTask;
 class PFunction;
 class PWire;
@@ -49,7 +48,7 @@ class NetScope;
 * therefore the handle for grasping the described circuit.
 */

-class Module : public PScopeExtra, public LineInfo {
+class Module : public LineInfo {

 	/* The module ports are in general a vector of port_t
 	   objects. Each port has a name and an ordered list of
@@ -59,43 +58,40 @@ class Module : public PScopeExtra, public LineInfo {
    public:
      struct port_t {
 	    perm_string name;
-	    vector<PEIdent*> expr;
+	    svector<PEIdent*> expr;
      };

    public:
 	/* The name passed here is the module name, not the instance
 	   name. This make must be a permallocated string. */
-      explicit Module(LexicalScope*parent, perm_string name);
+      explicit Module(perm_string name);
      ~Module();

-	/* Initially false. This is set to true if the module has been
-	   declared as a library module. This makes the module
-	   ineligible for being chosen as an implicit root. It has no
-	   other effect. */
-      bool library_flag;
+      NetNet::Type default_nettype;

-      bool is_cell;
+	/* The module has parameters that are evaluated when the
+	   module is elaborated. During parsing, I put the parameters
+	   into this map. */
+      struct param_expr_t {
+	    PExpr*expr;
+	    PExpr*msb;
+	    PExpr*lsb;
+	    bool signed_flag;
+      };
+      map<perm_string,param_expr_t>parameters;
+      map<perm_string,param_expr_t>localparams;

-	/* This is true if the module represents a program block
-	   instead of a module/cell. Program blocks have content
-	   restrictions and slightly modify scheduling semantics. */
-      bool program_block;

-      enum UCDriveType { UCD_NONE, UCD_PULL0, UCD_PULL1 };
-      UCDriveType uc_drive;
-
-	/* specparams are simpler than other parameters, in that they
-	   can have a range, but not an explicit type. The restrictions
-	   are enforced by the parser. */
-      map<perm_string,param_expr_t>specparams;
+	/* specparams are simpler then other params, in that they have
+	   no type information. They are merely constant
+	   expressions. */
+      map<perm_string,PExpr*>specparams;

 	/* The module also has defparam assignments which don't create
 	   new parameters within the module, but may be used to set
 	   values within this module (when instantiated) or in other
 	   instantiated modules. */
-      typedef pair<pform_name_t,PExpr*> named_expr_t;
-      list<named_expr_t>defparms;
-      static list<named_expr_t>user_defparms;
+      map<hname_t,PExpr*>defparms;

        /* Parameters may be overridden at instantiation time;
           the overrides do not contain explicit parameter names,
@@ -107,57 +103,109 @@ class Module : public PScopeExtra, public LineInfo {

 	/* This is an array of port descriptors, which is in turn a
 	   named array of PEident pointers. */
-      vector<port_t*> ports;
+      svector<port_t*> ports;
+
+	/* Keep a table of named events declared in the module. */
+      map<perm_string,PEvent*>events;
+
+	/* Keep a table of datum variables declared in the module. */
+      map<hname_t,PData*>datum;

      map<perm_string,PExpr*> attributes;

 	/* These are the timescale for this module. The default is
 	   set by the `timescale directive. */
      int time_unit, time_precision;
-      bool time_from_timescale;
-      bool timescale_warn_done;

-	/* The module has a list of generate schemes that appear in
-	   the module definition. These are used at elaboration time. */
-      list<PGenerate*> generate_schemes;
-
-	/* Nested modules are placed here, and are not elaborated
-	   unless they are instantiated, implicitly or explicitly. */
-      std::map<perm_string,Module*> nested_modules;
-
-      list<PSpecPath*> specify_paths;
-
-	// The mod_name() is the name of the module type.
-      perm_string mod_name() const { return pscope_name(); }
+      perm_string mod_name() const { return name_; }

      void add_gate(PGate*gate);

+	// The add_wire method adds a wire by name, but only if the
+	// wire name doesn't already exist. Either way, the result is
+	// the existing wire or the pointer passed in.
+      PWire* add_wire(PWire*wire);
+
+      void add_behavior(PProcess*behave);
+      void add_task(perm_string name, PTask*def);
+      void add_function(perm_string name, PFunction*def);
+
      unsigned port_count() const;
-      const vector<PEIdent*>& get_port(unsigned idx) const;
+      const svector<PEIdent*>& get_port(unsigned idx) const;
      unsigned find_port(const char*name) const;

-      // Return port name ("" for undeclared port)
-      perm_string get_port_name(unsigned idx) const;
-
+	// Find a wire by name. This is used for connecting gates to
+	// existing wires, etc.
+      PWire* get_wire(const hname_t&name) const;
      PGate* get_gate(perm_string name);

+      const map<hname_t,PWire*>& get_wires() const;
      const list<PGate*>& get_gates() const;
+      const list<PProcess*>& get_behaviors() const;

      void dump(ostream&out) const;
      bool elaborate(Design*, NetScope*scope) const;

-      typedef map<perm_string,PExpr*> replace_t;
-      bool elaborate_scope(Design*, NetScope*scope, const replace_t&rep);
+      bool elaborate_scope(Design*, NetScope*scope) const;

      bool elaborate_sig(Design*, NetScope*scope) const;

    private:
-      void dump_specparams_(ostream&out, unsigned indent) const;
+      perm_string name_;
+
+      map<hname_t,PWire*> wires_;
      list<PGate*> gates_;
+      list<PProcess*> behaviors_;
+      map<perm_string,PTask*> tasks_;
+      map<perm_string,PFunction*> funcs_;

    private: // Not implemented
      Module(const Module&);
      Module& operator= (const Module&);
 };

-#endif /* IVL_Module_H */
+
+/*
+ * $Log: Module.h,v $
+ * Revision 1.37  2004/06/13 04:56:53  steve
+ *  Add support for the default_nettype directive.
+ *
+ * Revision 1.36  2004/05/25 19:21:06  steve
+ *  More identifier lists use perm_strings.
+ *
+ * Revision 1.35  2004/02/20 18:53:33  steve
+ *  Addtrbute keys are perm_strings.
+ *
+ * Revision 1.34  2004/02/20 06:22:56  steve
+ *  parameter keys are per_strings.
+ *
+ * Revision 1.33  2004/02/18 17:11:54  steve
+ *  Use perm_strings for named langiage items.
+ *
+ * Revision 1.32  2003/06/20 00:53:19  steve
+ *  Module attributes from the parser
+ *  through to elaborated form.
+ *
+ * Revision 1.31  2003/06/13 19:10:45  steve
+ *  Properly manage real variables in subscopes.
+ *
+ * Revision 1.30  2003/03/06 04:37:12  steve
+ *  lex_strings.add module names earlier.
+ *
+ * Revision 1.29  2003/02/27 06:45:11  steve
+ *  specparams as far as pform.
+ *
+ * Revision 1.28  2003/01/26 21:15:58  steve
+ *  Rework expression parsing and elaboration to
+ *  accommodate real/realtime values and expressions.
+ *
+ * Revision 1.27  2002/08/19 02:39:16  steve
+ *  Support parameters with defined ranges.
+ *
+ * Revision 1.26  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.25  2002/05/19 23:37:28  steve
+ *  Parse port_declaration_lists from the 2001 Standard.
+ */
+#endif
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2012 Stephen Williams ([email protected])
- *
- *    This source code is free software; you can redistribute it
- *    and/or modify it in source code form under the terms of the GNU
- *    General Public License as published by the Free Software
- *    Foundation; either version 2 of the License, or (at your option)
- *    any later version.
- *
- *    This program 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.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include  "PClass.h"
-
-PClass::PClass(perm_string name, LexicalScope*parent)
-: PScopeExtra(name, parent), type(0)
-{
-}
-
-
-PClass::~PClass()
-{
-}
@@ -1,47 +0,0 @@
-#ifndef IVL_PClass_H
-#define IVL_PClass_H
-/*
- * Copyright (c) 2012-2014 Stephen Williams ([email protected])
- *
- *    This source code is free software; you can redistribute it
- *    and/or modify it in source code form under the terms of the GNU
- *    General Public License as published by the Free Software
- *    Foundation; either version 2 of the License, or (at your option)
- *    any later version.
- *
- *    This program 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.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include  "PScope.h"
-# include  "LineInfo.h"
-# include  "StringHeap.h"
-# include  <iostream>
-
-class PChainConstructor;
-
-/*
- * SystemVerilog supports class declarations with their own lexical
- * scope, etc. The parser arranges for these to be created and
- * collected.
- */
-
-class PClass : public PScopeExtra, public LineInfo {
-
-    public:
-      explicit PClass (perm_string name, LexicalScope*parent);
-      ~PClass();
-
-      void dump(std::ostream&out, unsigned indent) const;
-
-    public:
-      class_type_t*type;
-};
-
-#endif /* IVL_PClass_H */
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2003 Stephen Williams (steve@icarus.com)
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -14,19 +14,37 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: PData.cc,v 1.2 2003/11/10 20:11:01 steve Exp $"
+#endif

 # include  "config.h"
-# include  "priv.h"
-# include  <string.h>
+# include  "PData.h"

-void show_class(ivl_type_t net)
+PData::PData(const hname_t&h)
+: hname_(h)
 {
-      fprintf(out, "  class %s\n", ivl_type_name(net));
-      for (int idx = 0 ; idx < ivl_type_properties(net) ; idx += 1) {
-	    fprintf(out, "      ");
-	    show_net_type(ivl_type_prop_type(net,idx));
-	    fprintf(out, " %s\n", ivl_type_prop_name(net,idx));
-      }
 }
+
+PData::~PData()
+{
+}
+
+const hname_t&PData::name() const
+{
+      return hname_;
+}
+
+/*
+ * $Log: PData.cc,v $
+ * Revision 1.2  2003/11/10 20:11:01  steve
+ *  missing include of config.h
+ *
+ * Revision 1.1  2003/01/26 21:15:58  steve
+ *  Rework expression parsing and elaboration to
+ *  accommodate real/realtime values and expressions.
+ *
+ */
+
@@ -0,0 +1,63 @@
+#ifndef __PData_H
+#define __PData_H
+/*
+ * Copyright (c) 2003 Stephen Williams ([email protected])
+ *
+ *    This source code is free software; you can redistribute it
+ *    and/or modify it in source code form under the terms of the GNU
+ *    General Public License as published by the Free Software
+ *    Foundation; either version 2 of the License, or (at your option)
+ *    any later version.
+ *
+ *    This program 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.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: PData.h,v 1.1 2003/01/26 21:15:58 steve Exp $"
+#endif
+
+# include  "HName.h"
+# include  "netlist.h"
+# include  "LineInfo.h"
+
+/*
+ * The PData object represents declaration of atomic datum such as
+ * real and realtime variables. These are variables that cannot be bit
+ * or part selected, but can be used in expressions.
+ */
+
+class PData : public LineInfo {
+
+    public:
+      PData(const hname_t&hname);
+      ~PData();
+
+	// Return a hierarchical name.
+      const hname_t&name() const;
+
+      void elaborate_scope(Design*des, NetScope*scope) const;
+
+      map<string,PExpr*> attributes;
+
+    private:
+      hname_t hname_;
+
+    private:
+      PData(const PData&);
+      PData& operator= (const PData&);
+};
+
+/*
+ * $Log: PData.h,v $
+ * Revision 1.1  2003/01/26 21:15:58  steve
+ *  Rework expression parsing and elaboration to
+ *  accommodate real/realtime values and expressions.
+ *
+ */
+#endif
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2011 Stephen Williams ([email protected])
+ * Copyright (c) 1999 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -14,8 +14,11 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: PDelays.cc,v 1.11.2.1 2006/10/04 00:37:03 steve Exp $"
+#endif

 # include "config.h"

@@ -24,12 +27,6 @@
 # include  "PDelays.h"
 # include  "PExpr.h"
 # include  "verinum.h"
-# include  "netmisc.h"
-
-bool dly_used_no_timescale = false;
-bool dly_used_timescale = false;
-bool display_ts_dly_warning = true;
-

 PDelays::PDelays()
 {
@@ -55,43 +52,38 @@ void PDelays::set_delay(PExpr*del)
 }


-void PDelays::set_delays(const list<PExpr*>*del, bool df)
+void PDelays::set_delays(const svector<PExpr*>*del, bool df)
 {
      assert(del);
-      assert(del->size() <= 3);
-
-      list<PExpr*>::const_iterator cur = del->begin();
-      for (unsigned idx = 0 ;  cur != del->end() ;  idx += 1, ++cur)
-	    delay_[idx] = *cur;
+      assert(del->count() <= 3);
+      for (unsigned idx = 0 ;  idx < del->count() ;  idx += 1)
+	    delay_[idx] = (*del)[idx];

      delete_flag_ = df;
 }

-unsigned PDelays::delay_count() const
+static unsigned long calculate_val(Design*des, NetScope*scope,
+				   const PExpr*expr)
 {
-      unsigned dly_cnt = 0;
-      for (unsigned idx = 0 ;  idx < 3 ;  idx += 1)
-	    if (delay_[idx]) dly_cnt += 1;

-      return dly_cnt;
-}
+      NetExpr*dex = expr->elaborate_expr(des, scope);
+      if (NetExpr*tmp = dex->eval_tree()) {
+	    delete dex;
+	    dex = tmp;
+      }

-static NetExpr*calculate_val(Design*des, NetScope*scope, PExpr*expr)
-{
-      NetExpr*dex = elab_and_eval(des, scope, expr, -1);
-
-	/* Print a warning if we find default and `timescale based
-	 * delays in the design, since this is likely an error. */
-      if (scope->time_from_timescale()) dly_used_timescale = true;
-      else dly_used_no_timescale = true;
-
-      if (display_ts_dly_warning &&
-          dly_used_no_timescale && dly_used_timescale) {
-	    cerr << "warning: Found both default and "
-	            "`timescale based delays. Use" << endl;
-	    cerr << "         -Wtimescale to find the "
-	            "module(s) with no `timescale." << endl;
-	    display_ts_dly_warning = false;
+      int shift = scope->time_unit() - des->get_precision();
+      if (sizeof(unsigned) <= 4 && shift > 9) {
+	    cerr << expr->get_line() << ": error: Precision overflow"
+		 << " in scope " << scope->name() << "." << endl;
+	    cerr << expr->get_line() << ":      :"
+		 << " Units are 10e" << scope->time_unit()
+		 << " minus precision 10e" << des->get_precision()
+		 << " is 10e" << shift << "." << endl;
+	    cerr << expr->get_line() << ":      : Perhaps a timescale "
+		 << "is missing or incorrect?" << endl;
+	    des->errors += 1;
+	    return 0;
      }

 	/* If the delay expression is a real constant or vector
@@ -99,93 +91,59 @@ static NetExpr*calculate_val(Design*des, NetScope*scope, PExpr*expr)
 	   units, and return an adjusted value. */

      if (NetECReal*tmp = dynamic_cast<NetECReal*>(dex)) {
-	    uint64_t delay = get_scaled_time_from_real(des, scope, tmp);
+	    verireal fn = tmp->value();
+
+	    long delay = fn.as_long(shift);
+	    if (delay < 0)
+		  delay = 0;

 	    delete tmp;
-	    NetEConst*tmp2 = new NetEConst(verinum(delay, 64));
-	    tmp2->set_line(*expr);
-	    return tmp2;
+	    return delay;
      }


      if (NetEConst*tmp = dynamic_cast<NetEConst*>(dex)) {
 	    verinum fn = tmp->value();
-	    uint64_t delay = des->scale_to_precision(fn.as_ulong64(), scope);
+
+	    unsigned long delay =
+		  des->scale_to_precision(fn.as_ulong(), scope);

 	    delete tmp;
-	    NetEConst*tmp2 = new NetEConst(verinum(delay, 64));
-	    tmp2->set_line(*expr);
-	    return tmp2;
+	    return delay;
      }

-	/* Oops, cannot evaluate down to a constant. */
-      return dex;
-}
-
-static NetExpr* make_delay_nets(Design*des, NetScope*scope, NetExpr*expr)
-{
-      if (expr == 0)
-            return 0;
-
-      if (dynamic_cast<NetESignal*> (expr))
-	    return expr;
-
-      if (dynamic_cast<NetEConst*> (expr))
-	    return expr;
-
-      NetNet*sig = expr->synthesize(des, scope, expr);
-      if (sig == 0) {
-	    cerr << expr->get_fileline() << ": error: Expression " << *expr
-		 << " is not suitable as a delay expression." << endl;
-	    des->errors += 1;
-	    return 0;
-      }
-
-      expr = new NetESignal(sig);
-      return expr;
-}
-
-static NetExpr* calc_decay_time(NetExpr *rise, NetExpr *fall)
-{
-      NetEConst *c_rise = dynamic_cast<NetEConst*>(rise);
-      NetEConst *c_fall = dynamic_cast<NetEConst*>(fall);
-      if (c_rise && c_fall) {
-	    if (c_rise->value() < c_fall->value()) return rise;
-	    else return fall;
-      }
+	/* Oops, cannot evaluate down to a constant. Error message. */
+      delete dex;

+      cerr << expr->get_line() << ": sorry: non-constant "
+	   << "delays not supported here: " << *expr << endl;
+      des->errors += 1;
      return 0;
+
 }

 void PDelays::eval_delays(Design*des, NetScope*scope,
-			  NetExpr*&rise_time,
-			  NetExpr*&fall_time,
-			  NetExpr*&decay_time,
-			  bool as_nets_flag) const
+			  unsigned long&rise_time,
+			  unsigned long&fall_time,
+			  unsigned long&decay_time) const
 {
      assert(scope);


      if (delay_[0]) {
 	    rise_time = calculate_val(des, scope, delay_[0]);
-	    if (as_nets_flag)
-		  rise_time = make_delay_nets(des, scope, rise_time);

 	    if (delay_[1]) {
 		  fall_time = calculate_val(des, scope, delay_[1]);
-		  if (as_nets_flag)
-			fall_time = make_delay_nets(des, scope, fall_time);

 		  if (delay_[2]) {
 			decay_time = calculate_val(des, scope, delay_[2]);
-			if (as_nets_flag)
-			      decay_time = make_delay_nets(des, scope,
-			                                   decay_time);

 		  } else {
-			// If this is zero then we need to do the min()
-			// at run time.
-			decay_time = calc_decay_time(rise_time, fall_time);
+			if (rise_time < fall_time)
+			      decay_time = rise_time;
+			else
+			      decay_time = fall_time;
 		  }
 	    } else {
 		  assert(delay_[2] == 0);
@@ -198,3 +156,52 @@ void PDelays::eval_delays(Design*des, NetScope*scope,
 	    decay_time = 0;
      }
 }
+
+/*
+ * $Log: PDelays.cc,v $
+ * Revision 1.11.2.1  2006/10/04 00:37:03  steve
+ *  Detect delay precision overflow.
+ *
+ * Revision 1.11  2003/06/21 01:21:42  steve
+ *  Harmless fixup of warnings.
+ *
+ * Revision 1.10  2003/02/08 19:49:21  steve
+ *  Calculate delay statement delays using elaborated
+ *  expressions instead of pre-elaborated expression
+ *  trees.
+ *
+ *  Remove the eval_pexpr methods from PExpr.
+ *
+ * Revision 1.9  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.8  2001/12/29 20:19:31  steve
+ *  Do not delete delay expressions of UDP instances.
+ *
+ * Revision 1.7  2001/11/22 06:20:59  steve
+ *  Use NetScope instead of string for scope path.
+ *
+ * Revision 1.6  2001/11/07 04:01:59  steve
+ *  eval_const uses scope instead of a string path.
+ *
+ * Revision 1.5  2001/07/25 03:10:48  steve
+ *  Create a config.h.in file to hold all the config
+ *  junk, and support gcc 3.0. (Stephan Boettcher)
+ *
+ * Revision 1.4  2001/01/20 02:15:50  steve
+ *  apologize for not supporting non-constant delays.
+ *
+ * Revision 1.3  2001/01/14 23:04:55  steve
+ *  Generalize the evaluation of floating point delays, and
+ *  get it working with delay assignment statements.
+ *
+ *  Allow parameters to be referenced by hierarchical name.
+ *
+ * Revision 1.2  2000/02/23 02:56:53  steve
+ *  Macintosh compilers do not support ident.
+ *
+ * Revision 1.1  1999/09/04 19:11:46  steve
+ *  Add support for delayed non-blocking assignments.
+ *
+ */
+
@@ -1,7 +1,7 @@
-#ifndef IVL_PDelays_H
-#define IVL_PDelays_H
+#ifndef __PDelays_H
+#define __PDelays_H
 /*
- * Copyright (c) 1999-2014 Stephen Williams ([email protected])
+ * Copyright (c) 1999-2002 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,12 +16,14 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: PDelays.h,v 1.7 2002/08/12 01:34:58 steve Exp $"
+#endif

 # include  "svector.h"
 # include  <string>
-# include  <list>
 # include  <iostream>

 #ifdef __GNUC__
@@ -32,7 +34,6 @@ using namespace std;

 class Design;
 class NetScope;
-class NetExpr;
 class PExpr;

 /*
@@ -49,15 +50,12 @@ class PDelays {
 	   this object takes ownership of the expressions, and will
 	   delete it in the destructor. */
      void set_delay(PExpr*);
-      void set_delays(const list<PExpr*>*del, bool delete_flag=true);
-
-      unsigned delay_count() const;
+      void set_delays(const svector<PExpr*>*del, bool delete_flag=true);

      void eval_delays(Design*des, NetScope*scope,
-		       NetExpr*&rise_time,
-		       NetExpr*&fall_time,
-		       NetExpr*&decay_time,
-		       bool as_nets_flag =false) const;
+		       unsigned long&rise_time,
+		       unsigned long&fall_time,
+		       unsigned long&decay_time) const;

      void dump_delays(ostream&out) const;

@@ -72,4 +70,28 @@ class PDelays {

 ostream& operator << (ostream&o, const PDelays&);

-#endif /* IVL_PDelays_H */
+/*
+ * $Log: PDelays.h,v $
+ * Revision 1.7  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.6  2002/06/14 03:25:51  steve
+ *  Compiler portability.
+ *
+ * Revision 1.5  2001/12/29 20:19:31  steve
+ *  Do not delete delay expressions of UDP instances.
+ *
+ * Revision 1.4  2001/11/22 06:20:59  steve
+ *  Use NetScope instead of string for scope path.
+ *
+ * Revision 1.3  2001/01/16 02:44:17  steve
+ *  Use the iosfwd header if available.
+ *
+ * Revision 1.2  2000/02/23 02:56:53  steve
+ *  Macintosh compilers do not support ident.
+ *
+ * Revision 1.1  1999/09/04 19:11:46  steve
+ *  Add support for delayed non-blocking assignments.
+ *
+ */
+#endif
@@ -14,8 +14,11 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: PEvent.cc,v 1.5 2004/02/19 06:57:10 steve Exp $"
+#endif

 # include "config.h"

@@ -35,3 +38,26 @@ perm_string  PEvent::name() const
      return name_;
 }

+/*
+ * $Log: PEvent.cc,v $
+ * Revision 1.5  2004/02/19 06:57:10  steve
+ *  Memory and Event names use perm_string.
+ *
+ * Revision 1.4  2003/03/01 06:25:30  steve
+ *  Add the lex_strings string handler, and put
+ *  scope names and system task/function names
+ *  into this table. Also, permallocate event
+ *  names from the beginning.
+ *
+ * Revision 1.3  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.2  2001/07/25 03:10:48  steve
+ *  Create a config.h.in file to hold all the config
+ *  junk, and support gcc 3.0. (Stephan Boettcher)
+ *
+ * Revision 1.1  2000/04/01 19:31:57  steve
+ *  Named events as far as the pform.
+ *
+ */
+
@@ -1,7 +1,7 @@
-#ifndef IVL_PEvent_H
-#define IVL_PEvent_H
+#ifndef __PEvent_H
+#define __PEvent_H
 /*
- * Copyright (c) 2000-2014 Stephen Williams ([email protected])
+ * Copyright (c) 2000-2004 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,8 +16,11 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: PEvent.h,v 1.9 2004/02/19 06:57:10 steve Exp $"
+#endif

 # include  "LineInfo.h"
 # include  "StringHeap.h"
@@ -51,4 +54,38 @@ class PEvent : public LineInfo {
      PEvent& operator= (const PEvent&);
 };

-#endif /* IVL_PEvent_H */
+/*
+ * $Log: PEvent.h,v $
+ * Revision 1.9  2004/02/19 06:57:10  steve
+ *  Memory and Event names use perm_string.
+ *
+ * Revision 1.8  2003/03/01 06:25:30  steve
+ *  Add the lex_strings string handler, and put
+ *  scope names and system task/function names
+ *  into this table. Also, permallocate event
+ *  names from the beginning.
+ *
+ * Revision 1.7  2003/01/30 16:23:07  steve
+ *  Spelling fixes.
+ *
+ * Revision 1.6  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.5  2001/12/03 04:47:14  steve
+ *  Parser and pform use hierarchical names as hname_t
+ *  objects instead of encoded strings.
+ *
+ * Revision 1.4  2001/01/16 02:44:18  steve
+ *  Use the iosfwd header if available.
+ *
+ * Revision 1.3  2000/04/09 17:44:30  steve
+ *  Catch event declarations during scope elaborate.
+ *
+ * Revision 1.2  2000/04/04 03:20:15  steve
+ *  Simulate named event trigger and waits.
+ *
+ * Revision 1.1  2000/04/01 19:31:57  steve
+ *  Named events as far as the pform.
+ *
+ */
+#endif
@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 1998-2012 Stephen Williams <[email protected]>
- * Copyright CERN 2013 / Stephen Williams ([email protected])
+ * Copyright (c) 1998-1999 Stephen Williams <[email protected]>
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -15,104 +14,43 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: PExpr.cc,v 1.35.2.1 2006/02/07 22:46:23 steve Exp $"
+#endif

 # include "config.h"

 # include  <iostream>

-# include  "compiler.h"
 # include  "PExpr.h"
-# include  "PWire.h"
 # include  "Module.h"
-# include  "netmisc.h"
-# include  "util.h"
 # include  <typeinfo>

 PExpr::PExpr()
 {
-      expr_type_   = IVL_VT_NO_TYPE;
-      expr_width_  = 0;
-      min_width_   = 0;
-      signed_flag_ = false;
 }

 PExpr::~PExpr()
 {
 }

-void PExpr::declare_implicit_nets(LexicalScope*, NetNet::Type)
-{
-}
-
-bool PExpr::has_aa_term(Design*, NetScope*) const
-{
-      return false;
-}
-
 bool PExpr::is_the_same(const PExpr*that) const
 {
      return typeid(this) == typeid(that);
 }

-NetNet* PExpr::elaborate_lnet(Design*, NetScope*) const
-{
-      cerr << get_fileline() << ": error: "
-           << "expression not valid in assign l-value: "
-           << *this << endl;
-      return 0;
-}
-
-NetNet* PExpr::elaborate_bi_net(Design*, NetScope*) const
-{
-      cerr << get_fileline() << ": error: "
-           << "expression not valid as argument to inout port: "
-           << *this << endl;
-      return 0;
-}
-
-bool PExpr::is_collapsible_net(Design*, NetScope*) const
+bool PExpr::is_constant(Module*) const
 {
      return false;
 }

-
-const char* PExpr::width_mode_name(width_mode_t mode)
-{
-      switch (mode) {
-          case PExpr::SIZED:
-            return "sized";
-          case PExpr::UNSIZED:
-            return "unsized";
-          case PExpr::EXPAND:
-            return "expand";
-          case PExpr::LOSSLESS:
-            return "lossless";
-          case PExpr::UPSIZE:
-            return "upsize";
-          default:
-            return "??";
-      }
-}
-
-PEAssignPattern::PEAssignPattern()
-{
-}
-
-PEAssignPattern::PEAssignPattern(const list<PExpr*>&p)
-: parms_(p.size())
-{
-      size_t idx = 0;
-      for (list<PExpr*>::const_iterator cur = p.begin()
-		 ; cur != p.end() ; ++cur) {
-	    parms_[idx] = *cur;
-	    idx += 1;
-      }
-}
-
-PEAssignPattern::~PEAssignPattern()
+NetNet* PExpr::elaborate_lnet(Design*des, NetScope*, bool) const
 {
+      cerr << get_line() << ": error: expression not valid in assign l-value: "
+	   << *this << endl;
+      return 0;
 }

 PEBinary::PEBinary(char op, PExpr*l, PExpr*r)
@@ -124,175 +62,39 @@ PEBinary::~PEBinary()
 {
 }

-void PEBinary::declare_implicit_nets(LexicalScope*scope, NetNet::Type type)
+bool PEBinary::is_constant(Module*mod) const
 {
-      assert(left_ && right_);
-      left_->declare_implicit_nets(scope, type);
-      right_->declare_implicit_nets(scope, type);
+      return left_->is_constant(mod) && right_->is_constant(mod);
 }

-bool PEBinary::has_aa_term(Design*des, NetScope*scope) const
-{
-      assert(left_ && right_);
-      return left_->has_aa_term(des, scope) || right_->has_aa_term(des, scope);
-}
-
-PECastSize::PECastSize(unsigned si, PExpr*b)
-: size_(si), base_(b)
+PECallFunction::PECallFunction(const hname_t&n, const svector<PExpr *> &parms)
+: path_(n), parms_(parms)
 {
 }

-PECastSize::~PECastSize()
+PECallFunction::PECallFunction(const hname_t&n)
+: path_(n)
 {
 }

-PECastType::PECastType(data_type_t*t, PExpr*b)
-: target_(t), base_(b)
-{
-}
-
-PECastType::~PECastType()
-{
-}
-
-PEBComp::PEBComp(char op, PExpr*l, PExpr*r)
-: PEBinary(op, l, r)
-{
-      l_width_ = 0;
-      r_width_ = 0;
-}
-
-PEBComp::~PEBComp()
-{
-}
-
-PEBLogic::PEBLogic(char op, PExpr*l, PExpr*r)
-: PEBinary(op, l, r)
-{
-      assert(op == 'a' || op == 'o');
-}
-
-PEBLogic::~PEBLogic()
-{
-}
-
-PEBLeftWidth::PEBLeftWidth(char op, PExpr*l, PExpr*r)
-: PEBinary(op, l, r)
-{
-}
-
-PEBLeftWidth::~PEBLeftWidth()
-{
-}
-
-PEBPower::PEBPower(char op, PExpr*l, PExpr*r)
-: PEBLeftWidth(op, l, r)
-{
-}
-
-PEBPower::~PEBPower()
-{
-}
-
-PEBShift::PEBShift(char op, PExpr*l, PExpr*r)
-: PEBLeftWidth(op, l, r)
-{
-}
-
-PEBShift::~PEBShift()
-{
-}
-
-PECallFunction::PECallFunction(const pform_name_t&n, const vector<PExpr *> &parms)
-: package_(0), path_(n), parms_(parms)
-{
-}
-
-PECallFunction::PECallFunction(PPackage*pkg, const pform_name_t&n, const vector<PExpr *> &parms)
-: package_(pkg), path_(n), parms_(parms)
-{
-}
-
-static pform_name_t pn_from_ps(perm_string n)
-{
-      name_component_t tmp_name (n);
-      pform_name_t tmp;
-      tmp.push_back(tmp_name);
-      return tmp;
-}
-
-PECallFunction::PECallFunction(PPackage*pkg, perm_string n, const list<PExpr *> &parms)
-: package_(pkg), path_(pn_from_ps(n)), parms_(parms.size())
-{
-      int tmp_idx = 0;
-      assert(parms_.size() == parms.size());
-      for (list<PExpr*>::const_iterator idx = parms.begin()
-		 ; idx != parms.end() ; ++idx)
-	    parms_[tmp_idx++] = *idx;
-}
-
-PECallFunction::PECallFunction(perm_string n, const vector<PExpr*>&parms)
-: package_(0), path_(pn_from_ps(n)), parms_(parms)
-{
-}
-
-PECallFunction::PECallFunction(perm_string n)
-: package_(0), path_(pn_from_ps(n))
-{
-}
-
-// NOTE: Anachronism. Try to work all use of svector out.
-PECallFunction::PECallFunction(const pform_name_t&n, const list<PExpr *> &parms)
-: package_(0), path_(n), parms_(parms.size())
-{
-      int tmp_idx = 0;
-      assert(parms_.size() == parms.size());
-      for (list<PExpr*>::const_iterator idx = parms.begin()
-		 ; idx != parms.end() ; ++idx)
-	    parms_[tmp_idx++] = *idx;
-}
-
-PECallFunction::PECallFunction(perm_string n, const list<PExpr*>&parms)
-: package_(0), path_(pn_from_ps(n)), parms_(parms.size())
-{
-      int tmp_idx = 0;
-      assert(parms_.size() == parms.size());
-      for (list<PExpr*>::const_iterator idx = parms.begin()
-		 ; idx != parms.end() ; ++idx)
-	    parms_[tmp_idx++] = *idx;
-}
-
 PECallFunction::~PECallFunction()
 {
 }

-void PECallFunction::declare_implicit_nets(LexicalScope*scope, NetNet::Type type)
+PEConcat::PEConcat(const svector<PExpr*>&p, PExpr*r)
+: parms_(p), repeat_(r)
 {
-      for (unsigned idx = 0 ; idx < parms_.size() ; idx += 1) {
-	    parms_[idx]->declare_implicit_nets(scope, type);
-      }
 }

-bool PECallFunction::has_aa_term(Design*des, NetScope*scope) const
+bool PEConcat::is_constant(Module *mod) const
 {
-      bool flag = false;
-      for (unsigned idx = 0 ; idx < parms_.size() ; idx += 1) {
-	    flag = parms_[idx]->has_aa_term(des, scope) || flag;
+      bool constant = repeat_? repeat_->is_constant(mod) : true;
+      for (unsigned i = 0; constant && i < parms_.count(); ++i) {
+	    if (parms_[i] == 0)
+		  continue;
+	    constant = constant && parms_[i]->is_constant(mod);
      }
-      return flag;
-}
-
-PEConcat::PEConcat(const list<PExpr*>&p, PExpr*r)
-: parms_(p.size()), width_modes_(SIZED, p.size()), repeat_(r)
-{
-      int tmp_idx = 0;
-      assert(parms_.size() == p.size());
-      for (list<PExpr*>::const_iterator idx = p.begin()
-		 ; idx != p.end() ; ++idx)
-	    parms_[tmp_idx++] = *idx;
-
-      tested_scope_ = 0;
-      repeat_count_ = 1;
+      return constant;
 }

 PEConcat::~PEConcat()
@@ -300,25 +102,6 @@ PEConcat::~PEConcat()
      delete repeat_;
 }

-void PEConcat::declare_implicit_nets(LexicalScope*scope, NetNet::Type type)
-{
-      for (unsigned idx = 0 ; idx < parms_.size() ; idx += 1) {
-	    parms_[idx]->declare_implicit_nets(scope, type);
-      }
-}
-
-bool PEConcat::has_aa_term(Design*des, NetScope*scope) const
-{
-      bool flag = false;
-      for (unsigned idx = 0 ; idx < parms_.size() ; idx += 1) {
-	    flag = parms_[idx]->has_aa_term(des, scope) || flag;
-      }
-      if (repeat_)
-            flag = repeat_->has_aa_term(des, scope) || flag;
-
-      return flag;
-}
-
 PEEvent::PEEvent(PEEvent::edge_t t, PExpr*e)
 : type_(t), expr_(e)
 {
@@ -333,25 +116,11 @@ PEEvent::edge_t PEEvent::type() const
      return type_;
 }

-bool PEEvent::has_aa_term(Design*des, NetScope*scope) const
-{
-      assert(expr_);
-      return expr_->has_aa_term(des, scope);
-}
-
 PExpr* PEEvent::expr() const
 {
      return expr_;
 }

-PENull::PENull(void)
-{
-}
-
-PENull::~PENull()
-{
-}
-
 PEFNumber::PEFNumber(verireal*v)
 : value_(v)
 {
@@ -367,19 +136,13 @@ const verireal& PEFNumber::value() const
      return *value_;
 }

-PEIdent::PEIdent(const pform_name_t&that)
-: package_(0), path_(that), no_implicit_sig_(false)
+bool PEFNumber::is_constant(Module*) const
 {
+      return true;
 }

-PEIdent::PEIdent(perm_string s, bool no_implicit_sig)
-: package_(0), no_implicit_sig_(no_implicit_sig)
-{
-      path_.push_back(name_component_t(s));
-}
-
-PEIdent::PEIdent(PPackage*pkg, const pform_name_t&that)
-: package_(pkg), path_(that), no_implicit_sig_(true)
+PEIdent::PEIdent(const hname_t&s)
+: path_(s), msb_(0), lsb_(0), idx_(0)
 {
 }

@@ -387,101 +150,36 @@ PEIdent::~PEIdent()
 {
 }

-void PEIdent::declare_implicit_nets(LexicalScope*scope, NetNet::Type type)
+const hname_t& PEIdent::path() const
 {
-        /* We create an implicit wire if:
-	   - this is a simple identifier
-           - an identifier of that name has not already been declared in
-             any enclosing scope.
-	   - this is not an implicit named port connection */
-     if (no_implicit_sig_)
-	    return;
-     if ((path_.size() == 1) && (path_.front().index.size() == 0)) {
-            perm_string name = path_.front().name;
-            LexicalScope*ss = scope;
-            while (ss) {
-                  if (ss->wires.find(name) != ss->wires.end())
-                        return;
-                  if (ss->localparams.find(name) != ss->localparams.end())
-                        return;
-                  if (ss->parameters.find(name) != ss->parameters.end())
-                        return;
-                  if (ss->genvars.find(name) != ss->genvars.end())
-                        return;
-                  if (ss->events.find(name) != ss->events.end())
-                        return;
-                  /* Strictly speaking, we should also check for name clashes
-                     with tasks, functions, named blocks, module instances,
-                     and generate blocks. However, this information is not
-                     readily available. As these names would not be legal in
-                     this context, we can declare implicit nets here and rely
-                     on later checks for name clashes to report the error. */
+      return path_;
+}

-                  ss = ss->parent_scope();
-            }
-            PWire*net = new PWire(name, type, NetNet::NOT_A_PORT, IVL_VT_LOGIC);
-            net->set_file(get_file());
-            net->set_lineno(get_lineno());
-            net->set_range_scalar(SR_NET);
-            scope->wires[name] = net;
-            if (warn_implicit) {
-                  cerr << get_fileline() << ": warning: implicit "
-                       "definition of wire '" << name << "'." << endl;
-            }
+/*
+ * An identifier can be in a constant expression if (and only if) it is
+ * a parameter.
+ */
+bool PEIdent::is_constant(Module*mod) const
+{
+      if (mod == 0) return false;
+
+	/* This is a work-around for map not matching < even when
+	   there is a perm_string operator that can do the comprare.
+
+	   The real fix is to make the path_ carry perm_strings. */
+      perm_string tmp = perm_string::literal(path_.peek_name(0));
+
+      { map<perm_string,Module::param_expr_t>::const_iterator cur;
+        cur = mod->parameters.find(tmp);
+	if (cur != mod->parameters.end()) return true;
      }
-}

-bool PEIdent::has_aa_term(Design*des, NetScope*scope) const
-{
-      NetNet*       net = 0;
-      const NetExpr*par = 0;
-      NetEvent*     eve = 0;
-
-      const NetExpr*ex1, *ex2;
-
-      scope = symbol_search(this, des, scope, path_, net, par, eve, ex1, ex2);
-
-      if (scope)
-            return scope->is_auto();
-      else
-            return false;
-}
-
-PENewArray::PENewArray(PExpr*size_expr, PExpr*init_expr)
-: size_(size_expr), init_(init_expr)
-{
-}
-
-PENewArray::~PENewArray()
-{
-      delete size_;
-}
-
-PENewClass::PENewClass(void)
-{
-}
-
-PENewClass::PENewClass(const list<PExpr*>&p)
-: parms_(p.size())
-{
-      size_t tmp_idx = 0;
-      for (list<PExpr*>::const_iterator cur = p.begin()
-		 ; cur != p.end() ; ++ cur) {
-	    parms_[tmp_idx++] = *cur;
+      { map<perm_string,Module::param_expr_t>::const_iterator cur;
+        cur = mod->localparams.find(tmp);
+	if (cur != mod->localparams.end()) return true;
      }
-}

-PENewClass::~PENewClass()
-{
-}
-
-PENewCopy::PENewCopy(PExpr*src)
-: src_(src)
-{
-}
-
-PENewCopy::~PENewCopy()
-{
+      return false;
 }

 PENumber::PENumber(verinum*vp)
@@ -509,6 +207,11 @@ bool PENumber::is_the_same(const PExpr*that) const
      return *value_ == *obj->value_;
 }

+bool PENumber::is_constant(Module*) const
+{
+      return true;
+}
+
 PEString::PEString(char*s)
 : text_(s)
 {
@@ -524,6 +227,11 @@ string PEString::value() const
      return text_;
 }

+bool PEString::is_constant(Module*) const
+{
+      return true;
+}
+
 PETernary::PETernary(PExpr*e, PExpr*t, PExpr*f)
 : expr_(e), tru_(t), fal_(f)
 {
@@ -533,29 +241,11 @@ PETernary::~PETernary()
 {
 }

-void PETernary::declare_implicit_nets(LexicalScope*scope, NetNet::Type type)
-{
-      assert(expr_ && tru_ && fal_);
-      expr_->declare_implicit_nets(scope, type);
-      tru_->declare_implicit_nets(scope, type);
-      fal_->declare_implicit_nets(scope, type);
-}
-
-bool PETernary::has_aa_term(Design*des, NetScope*scope) const
-{
-      assert(expr_ && tru_ && fal_);
-      return expr_->has_aa_term(des, scope)
-           || tru_->has_aa_term(des, scope)
-           || fal_->has_aa_term(des, scope);
-}
-
-PETypename::PETypename(data_type_t*dt)
-: data_type_(dt)
-{
-}
-
-PETypename::~PETypename()
+bool PETernary::is_constant(Module*m) const
 {
+      return expr_->is_constant(m)
+	    && tru_->is_constant(m)
+	    && fal_->is_constant(m);
 }

 PEUnary::PEUnary(char op, PExpr*ex)
@@ -567,22 +257,150 @@ PEUnary::~PEUnary()
 {
 }

-void PEUnary::declare_implicit_nets(LexicalScope*scope, NetNet::Type type)
+bool PEUnary::is_constant(Module*m) const
 {
-      assert(expr_);
-      expr_->declare_implicit_nets(scope, type);
+      return expr_->is_constant(m);
 }

-bool PEUnary::has_aa_term(Design*des, NetScope*scope) const
-{
-      assert(expr_);
-      return expr_->has_aa_term(des, scope);
-}
+/*
+ * $Log: PExpr.cc,v $
+ * Revision 1.35.2.1  2006/02/07 22:46:23  steve
+ *  More robust test for concat constant-ness.
+ *
+ * Revision 1.35  2004/10/04 01:10:51  steve
+ *  Clean up spurious trailing white space.
+ *
+ * Revision 1.34  2004/02/20 06:22:56  steve
+ *  parameter keys are per_strings.
+ *
+ * Revision 1.33  2003/01/27 05:09:17  steve
+ *  Spelling fixes.
+ *
+ * Revision 1.32  2002/11/09 19:20:48  steve
+ *  Port expressions for output ports are lnets, not nets.
+ *
+ * Revision 1.31  2002/08/19 02:39:16  steve
+ *  Support parameters with defined ranges.
+ *
+ * Revision 1.30  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.29  2001/12/30 21:32:03  steve
+ *  Support elaborate_net for PEString objects.
+ *
+ * Revision 1.28  2001/12/03 04:47:14  steve
+ *  Parser and pform use hierarchical names as hname_t
+ *  objects instead of encoded strings.
+ *
+ * Revision 1.27  2001/11/08 05:15:50  steve
+ *  Remove string paths from PExpr elaboration.
+ *
+ * Revision 1.26  2001/11/07 04:26:46  steve
+ *  elaborate_lnet uses scope instead of string path.
+ *
+ * Revision 1.25  2001/11/06 06:11:55  steve
+ *  Support more real arithmetic in delay constants.
+ *
+ * Revision 1.24  2001/07/25 03:10:48  steve
+ *  Create a config.h.in file to hold all the config
+ *  junk, and support gcc 3.0. (Stephan Boettcher)
+ *
+ * Revision 1.23  2001/01/14 23:04:55  steve
+ *  Generalize the evaluation of floating point delays, and
+ *  get it working with delay assignment statements.
+ *
+ *  Allow parameters to be referenced by hierarchical name.
+ *
+ * Revision 1.22  2001/01/12 04:31:27  steve
+ *  Handle error idents in constants not in any scope (PR#97)
+ *
+ * Revision 1.21  2000/12/16 19:03:30  steve
+ *  Evaluate <= and ?: in parameter expressions (PR#81)
+ *
+ * Revision 1.20  2000/12/10 22:01:35  steve
+ *  Support decimal constants in behavioral delays.
+ *
+ * Revision 1.19  2000/06/30 15:50:20  steve
+ *  Allow unary operators in constant expressions.
+ *
+ * Revision 1.18  2000/05/07 04:37:55  steve
+ *  Carry strength values from Verilog source to the
+ *  pform and netlist for gates.
+ *
+ *  Change vvm constants to use the driver_t to drive
+ *  a constant value. This works better if there are
+ *  multiple drivers on a signal.
+ *
+ * Revision 1.17  2000/05/04 03:37:58  steve
+ *  Add infrastructure for system functions, move
+ *  $time to that structure and add $random.
+ *
+ * Revision 1.16  2000/04/12 04:23:57  steve
+ *  Named events really should be expressed with PEIdent
+ *  objects in the pform,
+ *
+ *  Handle named events within the mix of net events
+ *  and edges. As a unified lot they get caught together.
+ *  wait statements are broken into more complex statements
+ *  that include a conditional.
+ *
+ *  Do not generate NetPEvent or NetNEvent objects in
+ *  elaboration. NetEvent, NetEvWait and NetEvProbe
+ *  take over those functions in the netlist.
+ *
+ * Revision 1.15  2000/04/01 19:31:57  steve
+ *  Named events as far as the pform.
+ *
+ * Revision 1.14  2000/03/12 18:22:11  steve
+ *  Binary and unary operators in parameter expressions.
+ *
+ * Revision 1.13  2000/02/23 02:56:53  steve
+ *  Macintosh compilers do not support ident.
+ *
+ * Revision 1.12  1999/12/31 17:38:37  steve
+ *  Standardize some of the error messages.
+ *
+ * Revision 1.11  1999/10/31 04:11:27  steve
+ *  Add to netlist links pin name and instance number,
+ *  and arrange in vvm for pin connections by name
+ *  and instance number.
+ *
+ * Revision 1.10  1999/09/25 02:57:29  steve
+ *  Parse system function calls.
+ *
+ * Revision 1.9  1999/09/16 04:18:15  steve
+ *  elaborate concatenation repeats.
+ *
+ * Revision 1.8  1999/09/15 04:17:52  steve
+ *  separate assign lval elaboration for error checking.
+ *
+ * Revision 1.7  1999/07/22 02:05:20  steve
+ *  is_constant method for PEConcat.
+ *
+ * Revision 1.6  1999/07/17 19:50:59  steve
+ *  netlist support for ternary operator.
+ *
+ * Revision 1.5  1999/06/16 03:13:29  steve
+ *  More syntax parse with sorry stubs.
+ *
+ * Revision 1.4  1999/06/10 04:03:52  steve
+ *  Add support for the Ternary operator,
+ *  Add support for repeat concatenation,
+ *  Correct some seg faults cause by elaboration
+ *  errors,
+ *  Parse the casex anc casez statements.
+ *
+ * Revision 1.3  1999/05/16 05:08:42  steve
+ *  Redo constant expression detection to happen
+ *  after parsing.
+ *
+ *  Parse more operators and expressions.
+ *
+ * Revision 1.2  1998/11/11 00:01:51  steve
+ *  Check net ranges in declarations.
+ *
+ * Revision 1.1  1998/11/03 23:28:53  steve
+ *  Introduce verilog to CVS.
+ *
+ */

-PEVoid::PEVoid()
-{
-}
-
-PEVoid::~PEVoid()
-{
-}
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2013 Stephen Williams ([email protected])
+ * Copyright (c) 1999 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -14,26 +14,32 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: PFunction.cc,v 1.7 2004/05/31 23:34:36 steve Exp $"
+#endif

 # include "config.h"
-# include "PTask.h"
-# include "Statement.h"
-# include <cassert>
-# include "ivl_assert.h"

-PFunction::PFunction(perm_string name, LexicalScope*parent, bool is_auto__)
-: PTaskFunc(name, parent), statement_(0)
+#include "PTask.h"
+
+PFunction::PFunction(perm_string name)
+: name_(name), ports_(0), statement_(0)
 {
-      is_auto_ = is_auto__;
-      return_type_ = 0;
+      return_type_.type = PTF_NONE;
 }

 PFunction::~PFunction()
 {
 }

+void PFunction::set_ports(svector<PWire *>*p)
+{
+      assert(ports_ == 0);
+      ports_ = p;
+}
+
 void PFunction::set_statement(Statement*s)
 {
      assert(s != 0);
@@ -41,45 +47,32 @@ void PFunction::set_statement(Statement*s)
      statement_ = s;
 }

-void PFunction::push_statement_front(Statement*stmt)
-{
-	// This can only happen after the statement is initially set.
-      ivl_assert(*this, statement_);
-
-	// Get the PBlock of the statement. If it is not a PBlock,
-	// then create one to wrap the existing statement and the new
-	// statement that we're pushing.
-      PBlock*blk = dynamic_cast<PBlock*> (statement_);
-      if (blk == 0) {
-	    PBlock*tmp = new PBlock(PBlock::BL_SEQ);
-	    tmp->set_line(*this);
-	    vector<Statement*>tmp_list(1);
-	    tmp_list[0] = statement_;
-	    tmp->set_statement(tmp_list);
-
-	    statement_ = tmp;
-	    blk = tmp;
-      }
-
-	// Now do the push.
-      blk->push_statement_front(stmt);
-}
-
-void PFunction::set_return(data_type_t*t)
+void PFunction::set_return(PTaskFuncArg t)
 {
      return_type_ = t;
 }

-PChainConstructor* PFunction::extract_chain_constructor()
-{
-      PChainConstructor*res = 0;
-
-      if ((res = dynamic_cast<PChainConstructor*> (statement_))) {
-	    statement_ = 0;
-
-      } else if (PBlock*blk = dynamic_cast<PBlock*>(statement_)) {
-	    res = blk->extract_chain_constructor();
-      }
-
-      return res;
-}
+/*
+ * $Log: PFunction.cc,v $
+ * Revision 1.7  2004/05/31 23:34:36  steve
+ *  Rewire/generalize parsing an elaboration of
+ *  function return values to allow for better
+ *  speed and more type support.
+ *
+ * Revision 1.6  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.5  2001/07/25 03:10:48  steve
+ *  Create a config.h.in file to hold all the config
+ *  junk, and support gcc 3.0. (Stephan Boettcher)
+ *
+ * Revision 1.4  2001/01/13 22:20:08  steve
+ *  Parse parameters within nested scopes.
+ *
+ * Revision 1.3  2000/02/23 02:56:53  steve
+ *  Macintosh compilers do not support ident.
+ *
+ * Revision 1.2  1999/08/25 22:22:41  steve
+ *  elaborate some aspects of functions.
+ *
+ */
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2013 Stephen Williams ([email protected])
+ * Copyright (c) 1999-2004 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -14,76 +14,66 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: PGate.cc,v 1.16 2004/02/18 17:11:54 steve Exp $"
+#endif

 # include "config.h"

 # include  "PGate.h"
 # include  "PExpr.h"
 # include  "verinum.h"
-# include  <cassert>
+# include  <assert.h>

-void PGate::set_pins_(list<PExpr*>*pins)
+PGate::PGate(perm_string name,
+	     svector<PExpr*>*pins,
+	     const svector<PExpr*>*del)
+: name_(name), pins_(pins)
 {
-      assert(pins);
-      assert(pins->size() == pins_.size());
-
-      for (size_t idx = 0 ; idx < pins_.size() ; idx += 1) {
-	    pins_[idx] = pins->front();
-	    pins->pop_front();
-      }
-
-      assert(pins->empty());
-      delete pins;
-}
-
-PGate::PGate(perm_string name, list<PExpr*>*pins, const list<PExpr*>*del)
-: name_(name), pins_(pins? pins->size() : 0)
-{
-      if (pins) set_pins_(pins);
      if (del) delay_.set_delays(del);
-      str0_ = IVL_DR_STRONG;
-      str1_ = IVL_DR_STRONG;
+      str0_ = STRONG;
+      str1_ = STRONG;
 }

-PGate::PGate(perm_string name, list<PExpr*>*pins, PExpr*del)
-: name_(name), pins_(pins? pins->size() : 0)
+PGate::PGate(perm_string name,
+	     svector<PExpr*>*pins,
+	     PExpr*del)
+: name_(name), pins_(pins)
 {
-      if (pins) set_pins_(pins);
      if (del) delay_.set_delay(del);
-      str0_ = IVL_DR_STRONG;
-      str1_ = IVL_DR_STRONG;
+      str0_ = STRONG;
+      str1_ = STRONG;
 }

-PGate::PGate(perm_string name, list<PExpr*>*pins)
-: name_(name), pins_(pins? pins->size() : 0)
+PGate::PGate(perm_string name, svector<PExpr*>*pins)
+: name_(name), pins_(pins)
 {
-      if (pins) set_pins_(pins);
-      str0_ = IVL_DR_STRONG;
-      str1_ = IVL_DR_STRONG;
+      str0_ = STRONG;
+      str1_ = STRONG;
 }

 PGate::~PGate()
 {
 }

-ivl_drive_t PGate::strength0() const
+PGate::strength_t PGate::strength0() const
 {
      return str0_;
 }

-void PGate::strength0(ivl_drive_t s)
+void PGate::strength0(PGate::strength_t s)
 {
      str0_ = s;
 }

-ivl_drive_t PGate::strength1() const
+PGate::strength_t PGate::strength1() const
 {
      return str1_;
 }

-void PGate::strength1(ivl_drive_t s)
+void PGate::strength1(PGate::strength_t s)
 {
      str1_ = s;
 }
@@ -100,33 +90,24 @@ void PGate::elaborate_scope(Design*, NetScope*) const
 * parameters. This method understands how to handle the different
 * numbers of expressions.
 */
-
 void PGate::eval_delays(Design*des, NetScope*scope,
-			NetExpr*&rise_expr,
-			NetExpr*&fall_expr,
-			NetExpr*&decay_expr,
-			bool as_net_flag) const
+			unsigned long&rise_time,
+			unsigned long&fall_time,
+			unsigned long&decay_time) const
 {
-      delay_.eval_delays(des, scope,
-			 rise_expr, fall_expr, decay_expr,
-			 as_net_flag);
+      delay_.eval_delays(des, scope, rise_time, fall_time, decay_time);
 }

-unsigned PGate::delay_count() const
-{
-      return delay_.delay_count();
-}
-
-PGAssign::PGAssign(list<PExpr*>*pins)
+PGAssign::PGAssign(svector<PExpr*>*pins)
 : PGate(perm_string(), pins)
 {
-      assert(pin_count() == 2);
+      assert(pins->count() == 2);
 }

-PGAssign::PGAssign(list<PExpr*>*pins, list<PExpr*>*dels)
+PGAssign::PGAssign(svector<PExpr*>*pins, svector<PExpr*>*dels)
 : PGate(perm_string(), pins, dels)
 {
-      assert(pin_count() == 2);
+      assert(pins->count() == 2);
 }

 PGAssign::~PGAssign()
@@ -134,14 +115,14 @@ PGAssign::~PGAssign()
 }

 PGBuiltin::PGBuiltin(Type t, perm_string name,
-		     list<PExpr*>*pins,
-		     list<PExpr*>*del)
+		     svector<PExpr*>*pins,
+		     svector<PExpr*>*del)
 : PGate(name, pins, del), type_(t), msb_(0), lsb_(0)
 {
 }

 PGBuiltin::PGBuiltin(Type t, perm_string name,
-		     list<PExpr*>*pins,
+		     svector<PExpr*>*pins,
 		     PExpr*del)
 : PGate(name, pins, del), type_(t), msb_(0), lsb_(0)
 {
@@ -161,128 +142,26 @@ void PGBuiltin::set_range(PExpr*msb, PExpr*lsb)
      lsb_ = lsb;
 }

-const char* PGBuiltin::gate_name() const
-{
-      switch(type_) {
-	case AND:
-	    return "AND";
-	    break;
-	case NAND:
-	    return "NAND";
-	    break;
-
-	case OR:
-	    return "OR";
-	    break;
-	case NOR:
-	    return "NOR";
-	    break;
-
-	case XOR:
-	    return "XOR";
-	    break;
-	case XNOR:
-	    return "XNOR";
-	    break;
-
-	case BUF:
-	    return "BUF";
-	    break;
-	case NOT:
-	    return "NOT";
-	    break;
-
-	case BUFIF0:
-	    return "BUFIF0";
-	    break;
-	case NOTIF0:
-	    return "NOTIF0";
-	    break;
-
-	case BUFIF1:
-	    return "BUFIF1";
-	    break;
-	case NOTIF1:
-	    return "NOTIF1";
-	    break;
-
-	case NMOS:
-	    return "NMOS";
-	    break;
-	case RNMOS:
-	    return "RNMOS";
-	    break;
-
-	case PMOS:
-	    return "PMOS";
-	    break;
-	case RPMOS:
-	    return "RPMOS";
-	    break;
-
-	case TRAN:
-	    return "TRAN";
-	    break;
-	case RTRAN:
-	    return "RTRAN";
-	    break;
-
-	case TRANIF0:
-	    return "TRANIF0";
-	    break;
-	case RTRANIF0:
-	    return "RTRANIF0";
-	    break;
-
-	case TRANIF1:
-	    return "TRANIF1";
-	    break;
-	case RTRANIF1:
-	    return "RTRANIF1";
-	    break;
-
-	case CMOS:
-	    return "CMOS";
-	    break;
-	case RCMOS:
-	    return "RCMOS";
-	    break;
-
-	case PULLUP:
-	    return "PULLUP";
-	    break;
-	case PULLDOWN:
-	    return "PULLDOWN";
-	    break;
-      }
-
-      return "<unknown>";
-}
-
-PGModule::PGModule(perm_string type, perm_string name, list<PExpr*>*pins)
-: PGate(name, pins), bound_type_(0), type_(type), overrides_(0), pins_(0),
+PGModule::PGModule(perm_string type, perm_string name, svector<PExpr*>*pins)
+: PGate(name, pins), overrides_(0), pins_(0),
  npins_(0), parms_(0), nparms_(0), msb_(0), lsb_(0)
 {
+      type_ = type;
 }

 PGModule::PGModule(perm_string type, perm_string name,
 		   named<PExpr*>*pins, unsigned npins)
-: PGate(name, 0), bound_type_(0), type_(type), overrides_(0), pins_(pins),
+: PGate(name, 0), overrides_(0), pins_(pins),
  npins_(npins), parms_(0), nparms_(0), msb_(0), lsb_(0)
 {
-}
-
-PGModule::PGModule(Module*type, perm_string name)
-: PGate(name, 0), bound_type_(type), overrides_(0), pins_(0),
-  npins_(0), parms_(0), nparms_(0), msb_(0), lsb_(0)
-{
+      type_ = type;
 }

 PGModule::~PGModule()
 {
 }

-void PGModule::set_parameters(list<PExpr*>*o)
+void PGModule::set_parameters(svector<PExpr*>*o)
 {
      assert(overrides_ == 0);
      overrides_ = o;
@@ -305,7 +184,67 @@ void PGModule::set_range(PExpr*msb, PExpr*lsb)
      lsb_ = lsb;
 }

-perm_string PGModule::get_type() const
+perm_string PGModule::get_type()
 {
      return type_;
 }
+
+/*
+ * $Log: PGate.cc,v $
+ * Revision 1.16  2004/02/18 17:11:54  steve
+ *  Use perm_strings for named langiage items.
+ *
+ * Revision 1.15  2003/03/06 04:37:12  steve
+ *  lex_strings.add module names earlier.
+ *
+ * Revision 1.14  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.13  2001/11/22 06:20:59  steve
+ *  Use NetScope instead of string for scope path.
+ *
+ * Revision 1.12  2001/10/21 00:42:47  steve
+ *  Module types in pform are char* instead of string.
+ *
+ * Revision 1.11  2001/10/19 01:55:32  steve
+ *  Method to get the type_ member
+ *
+ * Revision 1.10  2001/07/25 03:10:48  steve
+ *  Create a config.h.in file to hold all the config
+ *  junk, and support gcc 3.0. (Stephan Boettcher)
+ *
+ * Revision 1.9  2000/05/06 15:41:56  steve
+ *  Carry assignment strength to pform.
+ *
+ * Revision 1.8  2000/03/08 04:36:53  steve
+ *  Redesign the implementation of scopes and parameters.
+ *  I now generate the scopes and notice the parameters
+ *  in a separate pass over the pform. Once the scopes
+ *  are generated, I can process overrides and evalutate
+ *  paremeters before elaboration begins.
+ *
+ * Revision 1.7  2000/02/23 02:56:53  steve
+ *  Macintosh compilers do not support ident.
+ *
+ * Revision 1.6  2000/02/18 05:15:02  steve
+ *  Catch module instantiation arrays.
+ *
+ * Revision 1.5  1999/09/14 01:50:35  steve
+ *  Handle gates without delays.
+ *
+ * Revision 1.4  1999/09/04 19:11:46  steve
+ *  Add support for delayed non-blocking assignments.
+ *
+ * Revision 1.3  1999/08/01 21:18:55  steve
+ *  elaborate rise/fall/decay for continuous assign.
+ *
+ * Revision 1.2  1999/08/01 16:34:50  steve
+ *  Parse and elaborate rise/fall/decay times
+ *  for gates, and handle the rules for partial
+ *  lists of times.
+ *
+ * Revision 1.1  1999/02/15 02:06:15  steve
+ *  Elaborate gate ranges.
+ *
+ */
+
@@ -1,7 +1,7 @@
-#ifndef IVL_PGate_H
-#define IVL_PGate_H
+#ifndef __PGate_H
+#define __PGate_H
 /*
- * Copyright (c) 1998-2014 Stephen Williams ([email protected])
+ * Copyright (c) 1998-2004 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,21 +16,23 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: PGate.h,v 1.29 2004/10/04 01:10:52 steve Exp $"
+#endif

 # include  "svector.h"
 # include  "StringHeap.h"
 # include  "named.h"
 # include  "LineInfo.h"
 # include  "PDelays.h"
-# include  "netlist.h"
 # include  <map>
-# include  <list>
-# include  <vector>
 # include  <string>
 class PExpr;
 class PUdp;
+class Design;
+class NetScope;
 class Module;

 /*
@@ -50,46 +52,43 @@ class Module;
 class PGate : public LineInfo {

    public:
-      explicit PGate(perm_string name, list<PExpr*>*pins,
-		     const list<PExpr*>*del);
+      enum strength_t { HIGHZ, WEAK, PULL, STRONG, SUPPLY };

-      explicit PGate(perm_string name, list<PExpr*>*pins,
+      explicit PGate(perm_string name, svector<PExpr*>*pins,
+		     const svector<PExpr*>*del);
+
+      explicit PGate(perm_string name, svector<PExpr*>*pins,
 		     PExpr*del);

-      explicit PGate(perm_string name, list<PExpr*>*pins);
+      explicit PGate(perm_string name, svector<PExpr*>*pins);

      virtual ~PGate();

      perm_string get_name() const { return name_; }

-	// This evaluates the delays as far as possible, but returns
-	// an expression, and do not signal errors.
      void eval_delays(Design*des, NetScope*scope,
-		       NetExpr*&rise_time,
-		       NetExpr*&fall_time,
-		       NetExpr*&decay_time,
-		       bool as_net_flag =false) const;
+		       unsigned long&rise_time,
+		       unsigned long&fall_time,
+		       unsigned long&decay_time) const;

-      unsigned delay_count() const;
+      unsigned pin_count() const { return pins_? pins_->count() : 0; }
+      const PExpr*pin(unsigned idx) const { return (*pins_)[idx]; }

-      unsigned pin_count() const { return pins_.size(); }
-      PExpr*pin(unsigned idx) const { return pins_[idx]; }
+      strength_t strength0() const;
+      strength_t strength1() const;

-      ivl_drive_t strength0() const;
-      ivl_drive_t strength1() const;
-
-      void strength0(ivl_drive_t);
-      void strength1(ivl_drive_t);
+      void strength0(strength_t);
+      void strength1(strength_t);

      map<perm_string,PExpr*> attributes;

-      virtual void dump(ostream&out, unsigned ind =4) const;
+      virtual void dump(ostream&out) const;
      virtual void elaborate(Design*des, NetScope*scope) const;
      virtual void elaborate_scope(Design*des, NetScope*sc) const;
      virtual bool elaborate_sig(Design*des, NetScope*scope) const;

    protected:
-      const vector<PExpr*>& get_pins() const { return pins_; }
+      const svector<PExpr*>& get_pins() const { return *pins_; }

      void dump_pins(ostream&out) const;
      void dump_delays(ostream&out) const;
@@ -97,11 +96,9 @@ class PGate : public LineInfo {
    private:
      perm_string name_;
      PDelays delay_;
-      vector<PExpr*>pins_;
+      svector<PExpr*>*pins_;

-      ivl_drive_t str0_, str1_;
-
-      void set_pins_(list<PExpr*>*pins);
+      strength_t str0_, str1_;

    private: // not implemented
      PGate(const PGate&);
@@ -115,16 +112,14 @@ class PGate : public LineInfo {
 class PGAssign  : public PGate {

    public:
-      explicit PGAssign(list<PExpr*>*pins);
-      explicit PGAssign(list<PExpr*>*pins, list<PExpr*>*dels);
+      explicit PGAssign(svector<PExpr*>*pins);
+      explicit PGAssign(svector<PExpr*>*pins, svector<PExpr*>*dels);
      ~PGAssign();

-      void dump(ostream&out, unsigned ind =4) const;
+      void dump(ostream&out) const;
      virtual void elaborate(Design*des, NetScope*scope) const;
-      virtual bool elaborate_sig(Design*des, NetScope*scope) const;

    private:
-      void elaborate_unpacked_array_(Design*des, NetScope*scope, NetNet*lval) const;
 };


@@ -148,35 +143,22 @@ class PGBuiltin  : public PGate {

    public:
      explicit PGBuiltin(Type t, perm_string name,
-			 list<PExpr*>*pins,
-			 list<PExpr*>*del);
+			 svector<PExpr*>*pins,
+			 svector<PExpr*>*del);
      explicit PGBuiltin(Type t, perm_string name,
-			 list<PExpr*>*pins,
+			 svector<PExpr*>*pins,
 			 PExpr*del);
      ~PGBuiltin();

      Type type() const { return type_; }
-      const char * gate_name() const;
      void set_range(PExpr*msb, PExpr*lsb);

-      virtual void dump(ostream&out, unsigned ind =4) const;
+      virtual void dump(ostream&out) const;
      virtual void elaborate(Design*, NetScope*scope) const;
-      virtual bool elaborate_sig(Design*des, NetScope*scope) const;

    private:
-      unsigned calculate_array_count_(Design*, NetScope*,
-				      long&high, long&low) const;
-
-      void calculate_gate_and_lval_count_(unsigned&gate_count,
-                                          unsigned&lval_count) const;
-
-      NetNode* create_gate_for_output_(Design*, NetScope*,
-				       perm_string gate_name,
-				       unsigned instance_width) const;
-
-      bool check_delay_count(Design*des) const;
-
      Type type_;
+
      PExpr*msb_;
      PExpr*lsb_;
 };
@@ -195,41 +177,37 @@ class PGModule  : public PGate {
 	// If the binding of ports is by position, this constructor
 	// builds everything all at once.
      explicit PGModule(perm_string type, perm_string name,
-			list<PExpr*>*pins);
+			svector<PExpr*>*pins);

 	// If the binding of ports is by name, this constructor takes
 	// the bindings and stores them for later elaboration.
      explicit PGModule(perm_string type, perm_string name,
 			named<PExpr*>*pins, unsigned npins);

-	// If the module type is known by design, then use this
-	// constructor.
-      explicit PGModule(Module*type, perm_string name);

      ~PGModule();

 	// Parameter overrides can come as an ordered list, or a set
 	// of named expressions.
-      void set_parameters(list<PExpr*>*o);
+      void set_parameters(svector<PExpr*>*o);
      void set_parameters(named<PExpr*>*pa, unsigned npa);

 	// Modules can be instantiated in ranges. The parser uses this
 	// method to pass the range to the pform.
      void set_range(PExpr*msb, PExpr*lsb);

-      virtual void dump(ostream&out, unsigned ind =4) const;
+      virtual void dump(ostream&out) const;
      virtual void elaborate(Design*, NetScope*scope) const;
      virtual void elaborate_scope(Design*des, NetScope*sc) const;
      virtual bool elaborate_sig(Design*des, NetScope*scope) const;

 	// This returns the module name of this module. It is a
 	// permallocated string.
-      perm_string get_type() const;
+      perm_string get_type();

    private:
-      Module*bound_type_;
      perm_string type_;
-      list<PExpr*>*overrides_;
+      svector<PExpr*>*overrides_;
      named<PExpr*>*pins_;
      unsigned npins_;

@@ -241,23 +219,132 @@ class PGModule  : public PGate {
      PExpr*msb_;
      PExpr*lsb_;

-      friend class delayed_elaborate_scope_mod_instances;
      void elaborate_mod_(Design*, Module*mod, NetScope*scope) const;
      void elaborate_udp_(Design*, PUdp  *udp, NetScope*scope) const;
-      unsigned calculate_instance_count_(Design*, NetScope*,
-                                         long&high, long&low,
-                                         perm_string name) const;
      void elaborate_scope_mod_(Design*des, Module*mod, NetScope*sc) const;
-      void elaborate_scope_mod_instances_(Design*des, Module*mod, NetScope*sc) const;
      bool elaborate_sig_mod_(Design*des, NetScope*scope, Module*mod) const;
-	// Not currently used.
-#if 0
-      bool elaborate_sig_udp_(Design*des, NetScope*scope, PUdp*udp) const;
-#endif
-
-      NetNet*resize_net_to_port_(Design*des, NetScope*scope,
-				 NetNet*sig, unsigned port_wid,
-				 NetNet::PortType dir, bool as_signed) const;
 };

-#endif /* IVL_PGate_H */
+/*
+ * $Log: PGate.h,v $
+ * Revision 1.29  2004/10/04 01:10:52  steve
+ *  Clean up spurious trailing white space.
+ *
+ * Revision 1.28  2004/03/08 00:47:44  steve
+ *  primitive ports can bind bi name.
+ *
+ * Revision 1.27  2004/02/20 18:53:33  steve
+ *  Addtrbute keys are perm_strings.
+ *
+ * Revision 1.26  2004/02/18 17:11:54  steve
+ *  Use perm_strings for named langiage items.
+ *
+ * Revision 1.25  2003/03/06 04:37:12  steve
+ *  lex_strings.add module names earlier.
+ *
+ * Revision 1.24  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.23  2002/05/23 03:08:51  steve
+ *  Add language support for Verilog-2001 attribute
+ *  syntax. Hook this support into existing $attribute
+ *  handling, and add number and void value types.
+ *
+ *  Add to the ivl_target API new functions for access
+ *  of complex attributes attached to gates.
+ *
+ * Revision 1.22  2001/11/22 06:20:59  steve
+ *  Use NetScope instead of string for scope path.
+ *
+ * Revision 1.21  2001/10/21 00:42:47  steve
+ *  Module types in pform are char* instead of string.
+ *
+ * Revision 1.20  2001/10/19 01:55:32  steve
+ *  Method to get the type_ member
+ *
+ * Revision 1.19  2001/04/22 23:09:45  steve
+ *  More UDP consolidation from Stephan Boettcher.
+ *
+ * Revision 1.18  2000/05/06 15:41:56  steve
+ *  Carry assignment strength to pform.
+ *
+ * Revision 1.17  2000/05/02 16:27:38  steve
+ *  Move signal elaboration to a seperate pass.
+ *
+ * Revision 1.16  2000/03/29 04:37:10  steve
+ *  New and improved combinational primitives.
+ *
+ * Revision 1.15  2000/03/08 04:36:53  steve
+ *  Redesign the implementation of scopes and parameters.
+ *  I now generate the scopes and notice the parameters
+ *  in a separate pass over the pform. Once the scopes
+ *  are generated, I can process overrides and evalutate
+ *  paremeters before elaboration begins.
+ *
+ * Revision 1.14  2000/02/23 02:56:53  steve
+ *  Macintosh compilers do not support ident.
+ *
+ * Revision 1.13  2000/02/18 05:15:02  steve
+ *  Catch module instantiation arrays.
+ *
+ * Revision 1.12  2000/01/09 05:50:48  steve
+ *  Support named parameter override lists.
+ *
+ * Revision 1.11  1999/12/11 05:45:41  steve
+ *  Fix support for attaching attributes to primitive gates.
+ *
+ * Revision 1.10  1999/09/04 19:11:46  steve
+ *  Add support for delayed non-blocking assignments.
+ *
+ * Revision 1.9  1999/08/23 16:48:39  steve
+ *  Parameter overrides support from Peter Monta
+ *  AND and XOR support wide expressions.
+ *
+ * Revision 1.8  1999/08/01 21:18:55  steve
+ *  elaborate rise/fall/decay for continuous assign.
+ *
+ * Revision 1.7  1999/08/01 16:34:50  steve
+ *  Parse and elaborate rise/fall/decay times
+ *  for gates, and handle the rules for partial
+ *  lists of times.
+ *
+ * Revision 1.6  1999/05/29 02:36:17  steve
+ *  module parameter bind by name.
+ *
+ * Revision 1.5  1999/05/10 00:16:58  steve
+ *  Parse and elaborate the concatenate operator
+ *  in structural contexts, Replace vector<PExpr*>
+ *  and list<PExpr*> with svector<PExpr*>, evaluate
+ *  constant expressions with parameters, handle
+ *  memories as lvalues.
+ *
+ *  Parse task declarations, integer types.
+ *
+ * Revision 1.4  1999/02/15 02:06:15  steve
+ *  Elaborate gate ranges.
+ *
+ * Revision 1.3  1999/01/25 05:45:56  steve
+ *  Add the LineInfo class to carry the source file
+ *  location of things. PGate, Statement and PProcess.
+ *
+ *  elaborate handles module parameter mismatches,
+ *  missing or incorrect lvalues for procedural
+ *  assignment, and errors are propogated to the
+ *  top of the elaboration call tree.
+ *
+ *  Attach line numbers to processes, gates and
+ *  assignment statements.
+ *
+ * Revision 1.2  1998/12/01 00:42:13  steve
+ *  Elaborate UDP devices,
+ *  Support UDP type attributes, and
+ *  pass those attributes to nodes that
+ *  are instantiated by elaboration,
+ *  Put modules into a map instead of
+ *  a simple list.
+ *
+ * Revision 1.1  1998/11/03 23:28:54  steve
+ *  Introduce verilog to CVS.
+ *
+ */
+#endif
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Stephen Williams ([email protected])
- *
- *    This source code is free software; you can redistribute it
- *    and/or modify it in source code form under the terms of the GNU
- *    General Public License as published by the Free Software
- *    Foundation; either version 2 of the License, or (at your option)
- *    any later version.
- *
- *    This program 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.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include  "PGenerate.h"
-# include  "PWire.h"
-# include  "ivl_assert.h"
-
-PGenerate::PGenerate(LexicalScope*parent, unsigned id)
-: LexicalScope(parent), id_number(id)
-{
-      direct_nested_ = false;
-      scheme_type = GS_NONE;
-      loop_init = 0;
-      loop_test = 0;
-      loop_step = 0;
-}
-
-PGenerate::~PGenerate()
-{
-}
-
-void PGenerate::add_gate(PGate*gate)
-{
-      gates.push_back(gate);
-}
-
-void PGenerate::probe_for_direct_nesting_(void)
-{
-      direct_nested_ = false;
-
-      ivl_assert(*this, scheme_type==GS_CASE_ITEM || scheme_type==GS_CONDIT || scheme_type==GS_ELSE);
-
-	// If this scheme has received an explicit name, then it
-	// cannot be direct nested.
-      if (scope_name[0] != '$') return;
-
-      if (! tasks.empty()) return;
-      if (! funcs.empty()) return;
-      if (! gates.empty()) return;
-      if (! parameters.empty()) return;
-      if (! localparams.empty()) return;
-      if (! events.empty()) return;
-      if (! wires.empty()) return;
-      if (! genvars.empty()) return;
-      if (! behaviors.empty()) return;
-      if (! analog_behaviors.empty()) return;
-
-      if (generate_schemes.empty()) return;
-
-      switch (generate_schemes.size()) {
-	  case 1: {
-		PGenerate*child = generate_schemes.front();
-		if (child->scheme_type == GS_CONDIT)
-		      direct_nested_ = true;
-		if (child->scheme_type == GS_CASE)
-		      direct_nested_ = true;
-		break;
-	  }
-
-	  case 2: {
-		PGenerate*child1 = generate_schemes.front();
-		PGenerate*child2 = generate_schemes.back();
-		if (child1->scheme_type==GS_CONDIT && child2->scheme_type==GS_ELSE)
-		      direct_nested_ = true;
-		if (child2->scheme_type==GS_CONDIT && child1->scheme_type==GS_ELSE)
-		      direct_nested_ = true;
-		break;
-	  }
-      }
-}
-
-ostream& operator << (ostream&out, PGenerate::scheme_t type)
-{
-      switch (type) {
-	  case PGenerate::GS_NONE:
-	    out << "GS_NONE";
-	    break;
-	  case PGenerate::GS_LOOP:
-	    out << "GS_LOOP";
-	    break;
-	  case PGenerate::GS_CONDIT:
-	    out << "GS_CONDIT";
-	    break;
-	  case PGenerate::GS_ELSE:
-	    out << "GS_ELSE";
-	    break;
-	  case PGenerate::GS_CASE:
-	    out << "GS_CASE";
-	    break;
-	  case PGenerate::GS_CASE_ITEM:
-	    out << "GS_CASE_ITEM";
-	    break;
-	  case PGenerate::GS_NBLOCK:
-	    out << "GS_NBLOCK";
-	    break;
-      }
-      return out;
-}
@@ -1,142 +0,0 @@
-#ifndef IVL_PGenerate_H
-#define IVL_PGenerate_H
-/*
- * Copyright (c) 2006-2014 Stephen Williams ([email protected])
- *
- *    This source code is free software; you can redistribute it
- *    and/or modify it in source code form under the terms of the GNU
- *    General Public License as published by the Free Software
- *    Foundation; either version 2 of the License, or (at your option)
- *    any later version.
- *
- *    This program 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.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include  "LineInfo.h"
-# include  "StringHeap.h"
-# include  "HName.h"
-# include  "PScope.h"
-# include  <list>
-# include  <map>
-# include  <valarray>
-# include  "pform_types.h"
-
-class Design;
-class NetScope;
-class PExpr;
-class PFunction;
-class PProcess;
-class PTask;
-class PGate;
-class PWire;
-
-/*
- * This represents a generate scheme. The interpretation of the
- * members depends on the scheme_type.
- *
- * GS_LOOP
- *
- * GS_CASE
- *    loop_test is the expression to be compared.
- *    generates contains only GS_CASE_ITEM schemes.
- * GS_CASE_ITEM
- *    The parent points to the GS_CASE that contains this item.
- *    the loop_test is compared with the parent->loop_test expression.
- */
-class PGenerate : public LineInfo, public LexicalScope {
-
-    public:
-      explicit PGenerate(LexicalScope*parent, unsigned id_number);
-      ~PGenerate();
-
-	// Generate schemes have an ID number, for when the scope is
-	// implicit.
-      const unsigned id_number;
-      perm_string scope_name;
-
-	// This is used during parsing to stack lexical scopes within
-	// this generate scheme.
-//      LexicalScope*lexical_scope;
-
-      enum scheme_t {GS_NONE, GS_LOOP, GS_CONDIT, GS_ELSE,
-		     GS_CASE, GS_CASE_ITEM, GS_NBLOCK};
-      scheme_t scheme_type;
-
-	// generate loops have an index variable and three
-	// expressions: for (index = <init>; <test>; index=<step>)
-      perm_string loop_index;
-      PExpr*loop_init;
-      PExpr*loop_test;
-      PExpr*loop_step;
-	// Case items may have multiple guard expression values. It is
-	// enough for any on of the guards to match the case statement
-	// test value.
-      std::valarray<PExpr*> item_test;
-
-	// defparam assignments found in this scope.
-      typedef pair<pform_name_t,PExpr*> named_expr_t;
-      list<named_expr_t>defparms;
-
-      list<PGate*> gates;
-      void add_gate(PGate*);
-
-	// Tasks instantiated within this scheme.
-      map<perm_string,PTask*> tasks;
-      map<perm_string,PFunction*>funcs;
-
-	// Generate schemes can contain further generate schemes.
-      list<PGenerate*> generate_schemes;
-//      PGenerate*parent;
-
-	// This method is called by the elaboration of a module to
-	// generate scopes. the container is the scope that is to
-	// contain the generated scope.
-      bool generate_scope(Design*des, NetScope*container);
-
-	// Elaborate signals within any of the generated scopes that
-	// were made by this generate block within the given container scope.
-      bool elaborate_sig(Design*des, NetScope*container) const;
-      bool elaborate(Design*des, NetScope*container) const;
-
-      void dump(ostream&out, unsigned indent) const;
-
-    private:
-      bool generate_scope_loop_(Design*des, NetScope*container);
-      bool generate_scope_condit_(Design*des, NetScope*container, bool else_flag);
-      bool generate_scope_case_(Design*des, NetScope*container);
-      bool generate_scope_nblock_(Design*des, NetScope*container);
-
-	// Call probe during elaborate_scope to calculate the
-	// direct_nested_ flag. It is OK to store the direct_nested_
-	// information here because "direct nested" is a property of
-	// the lexical generate code.
-      void probe_for_direct_nesting_(void);
-      bool direct_nested_;
-
-	// Elaborate_scope within a generated scope.
-      void elaborate_subscope_(Design*des, NetScope*scope);
-      void elaborate_subscope_direct_(Design*des, NetScope*scope);
-
-	// These are the scopes created by generate_scope.
-      list<NetScope*>scope_list_;
-	// internal function called on each scope generated by this scheme.
-      bool elaborate_sig_(Design*des, NetScope*scope) const;
-      bool elaborate_sig_direct_(Design*des, NetScope*scope) const;
-      bool elaborate_(Design*des, NetScope*scope) const;
-      bool elaborate_direct_(Design*des, NetScope*scope) const;
-
-    private: // not implemented
-      PGenerate(const PGenerate&);
-      PGenerate& operator= (const PGenerate&);
-};
-
-extern std::ostream& operator << (std::ostream&, PGenerate::scheme_t);
-
-#endif /* IVL_PGenerate_H */
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2012 Stephen Williams ([email protected])
- * Copyright CERN 2013 / Stephen Williams ([email protected])
- *
- *    This source code is free software; you can redistribute it
- *    and/or modify it in source code form under the terms of the GNU
- *    General Public License as published by the Free Software
- *    Foundation; either version 2 of the License, or (at your option)
- *    any later version.
- *
- *    This program 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.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include  "PPackage.h"
-
-PPackage::PPackage(perm_string name, LexicalScope*parent)
-: PScopeExtra(name, parent)
-{
-}
-
-PPackage::~PPackage()
-{
-}
@@ -1,47 +0,0 @@
-#ifndef IVL_PPackage_H
-#define IVL_PPackage_H
-/*
- * Copyright (c) 2012-2014 Stephen Williams ([email protected])
- * Copyright CERN 2013 / Stephen Williams ([email protected])
- *
- *    This source code is free software; you can redistribute it
- *    and/or modify it in source code form under the terms of the GNU
- *    General Public License as published by the Free Software
- *    Foundation; either version 2 of the License, or (at your option)
- *    any later version.
- *
- *    This program 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.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include  "PScope.h"
-# include  "LineInfo.h"
-# include  "StringHeap.h"
-# include  <iostream>
-
-/*
- * SystemVerilog supports class declarations with their own lexical
- * scope, etc. The parser arranges for these to be created and
- * collected.
- */
-
-class PPackage : public PScopeExtra, public LineInfo {
-
-    public:
-      explicit PPackage (perm_string name, LexicalScope*parent);
-      ~PPackage();
-
-      bool elaborate_scope(Design*des, NetScope*scope);
-      bool elaborate_sig(Design*des, NetScope*scope) const;
-      bool elaborate(Design*des, NetScope*scope) const;
-
-      void pform_dump(std::ostream&out) const;
-};
-
-#endif /* IVL_PPackage_H */
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2008,2010 Stephen Williams ([email protected])
- *
- *    This source code is free software; you can redistribute it
- *    and/or modify it in source code form under the terms of the GNU
- *    General Public License as published by the Free Software
- *    Foundation; either version 2 of the License, or (at your option)
- *    any later version.
- *
- *    This program 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.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include  "PScope.h"
-
-PScope::PScope(perm_string n, LexicalScope*parent)
-: LexicalScope(parent), name_(n)
-{
-}
-
-PScope::PScope(perm_string n)
-: LexicalScope(0), name_(n)
-{
-}
-
-PScope::~PScope()
-{
-    for(map<perm_string, data_type_t*>::iterator it = typedefs.begin();
-        it != typedefs.end(); ++it)
-        delete it->second;
-}
-
-PWire* LexicalScope::wires_find(perm_string name)
-{
-      map<perm_string,PWire*>::const_iterator cur = wires.find(name);
-      if (cur == wires.end())
-	    return 0;
-      else
-	    return (*cur).second;
-}
-
-PScopeExtra::PScopeExtra(perm_string n, LexicalScope*parent)
-: PScope(n, parent)
-{
-}
-
-PScopeExtra::PScopeExtra(perm_string n)
-: PScope(n)
-{
-}
-
-PScopeExtra::~PScopeExtra()
-{
-}
-
@@ -1,190 +0,0 @@
-#ifndef IVL_PScope_H
-#define IVL_PScope_H
-/*
- * Copyright (c) 2008-2014 Stephen Williams ([email protected])
- *
- *    This source code is free software; you can redistribute it
- *    and/or modify it in source code form under the terms of the GNU
- *    General Public License as published by the Free Software
- *    Foundation; either version 2 of the License, or (at your option)
- *    any later version.
- *
- *    This program 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.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include  "LineInfo.h"
-# include  "StringHeap.h"
-# include  "pform_types.h"
-# include  "ivl_target.h"
-# include  <map>
-# include  <set>
-# include  <vector>
-
-class PEvent;
-class PExpr;
-class PFunction;
-class PPackage;
-class AProcess;
-class PProcess;
-class PClass;
-class PTask;
-class PWire;
-
-class Design;
-class NetScope;
-
-/*
- * The PScope class is a base representation of an object that
- * represents lexical scope. For example, a module, a function/task, a
- * named block is derived from a PScope.
- *
- * NOTE: This is not the same concept as the "scope" of an elaborated
- * hierarchy. That is represented by NetScope objects after elaboration.
- */
-
-class LexicalScope {
-
-    public:
-      explicit LexicalScope(LexicalScope*parent) : parent_(parent) { }
-	// A virtual destructor is so that dynamic_cast can work.
-      virtual ~LexicalScope() { }
-
-      struct range_t {
-	      // True if this is an exclude
-	    bool exclude_flag;
-	      // lower bound
-	      // If low_open_flag is false and low_expr=0, then use -inf
-	    bool low_open_flag;
-	    PExpr*low_expr;
-	      // upper bound
-	      // If high_open_flag is false and high_expr=0, then use +inf
-	    bool high_open_flag;
-	    PExpr*high_expr;
-	      // Next range description in list
-	    struct range_t*next;
-      };
-
-	/* The scope has parameters that are evaluated when the scope
-	   is elaborated. During parsing, I put the parameters into
-	   this map. */
-      struct param_expr_t : public LineInfo {
-	    param_expr_t() : type(IVL_VT_NO_TYPE), msb(0), lsb(0), signed_flag(false), expr(0), range(0) { }
-	      // Type information
-	    ivl_variable_type_t type;
-	    PExpr*msb;
-	    PExpr*lsb;
-	    bool signed_flag;
-	      // Value expression
-	    PExpr*expr;
-	      // If there are range constraints, list them here
-	    range_t*range;
-      };
-      map<perm_string,param_expr_t>parameters;
-      map<perm_string,param_expr_t>localparams;
-
-	// Defined types in the scope.
-      map<perm_string,data_type_t*>typedefs;
-
-	// Named events in the scope.
-      map<perm_string,PEvent*>events;
-
-	// Symbols that are imported. Bind the imported name to the
-	// package from which the name is imported.
-      std::map<perm_string,PPackage*>imports;
-
-	// Nets and variables (wires) in the scope
-      map<perm_string,PWire*>wires;
-      PWire* wires_find(perm_string name);
-
-        // Genvars in the scope. These will only be present in module
-        // scopes, but are listed here to allow them to be found when
-        // creating implicit nets.
-      map<perm_string,LineInfo*> genvars;
-
-	// Behaviors (processes) in this scope
-      list<PProcess*> behaviors;
-      list<AProcess*> analog_behaviors;
-
-	// Enumeration sets.
-      std::set<enum_type_t*> enum_sets;
-
-      LexicalScope* parent_scope() const { return parent_; }
-
-    protected:
-      void dump_typedefs_(ostream&out, unsigned indent) const;
-
-      void dump_parameters_(ostream&out, unsigned indent) const;
-
-      void dump_localparams_(ostream&out, unsigned indent) const;
-
-      void dump_enumerations_(ostream&out, unsigned indent) const;
-
-      void dump_events_(ostream&out, unsigned indent) const;
-
-      void dump_wires_(ostream&out, unsigned indent) const;
-
-    private:
-      LexicalScope*parent_;
-};
-
-class PScope : public LexicalScope {
-
-    public:
-	// When created, a scope has a name and a parent. The name is
-	// the name of the definition. For example, if this is a
-	// module declaration, the name is the name after the "module"
-	// keyword, and if this is a task scope, the name is the task
-	// name. The parent is the lexical parent of this scope. Since
-	// modules do not nest in Verilog, the parent must be nil for
-	// modules. Scopes for tasks and functions point to their
-	// containing module.
-      PScope(perm_string name, LexicalScope*parent);
-      PScope(perm_string name);
-      virtual ~PScope();
-
-      perm_string pscope_name() const { return name_; }
-
-    protected:
-      bool elaborate_sig_wires_(Design*des, NetScope*scope) const;
-
-      bool elaborate_behaviors_(Design*des, NetScope*scope) const;
-
-    private:
-      perm_string name_;
-};
-
-/*
- * Some scopes can carry definitions. These include Modules and PClass
- * scopes. These derive from PScopeExtra so that they hold the maps of
- * extra definitions.
- */
-class PScopeExtra : public PScope {
-
-    public:
-      PScopeExtra(perm_string, LexicalScope*parent);
-      PScopeExtra(perm_string);
-      ~PScopeExtra();
-
-	/* Task definitions within this module */
-      std::map<perm_string,PTask*> tasks;
-      std::map<perm_string,PFunction*> funcs;
-	/* class definitions within this module. */
-      std::map<perm_string,PClass*> classes;
-	/* This is the lexical order of the classes, and is used by
-	   elaboration to choose an elaboration order. */
-      std::vector<PClass*> classes_lexical;
-
-    protected:
-      void dump_classes_(ostream&out, unsigned indent) const;
-      void dump_tasks_(ostream&out, unsigned indent) const;
-      void dump_funcs_(ostream&out, unsigned indent) const;
-};
-
-#endif /* IVL_PScope_H */
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Stephen Williams <[email protected]>
- *
- *    This source code is free software; you can redistribute it
- *    and/or modify it in source code form under the terms of the GNU
- *    General Public License as published by the Free Software
- *    Foundation; either version 2 of the License, or (at your option)
- *    any later version.
- *
- *    This program 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.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include  "PSpec.h"
-
-PSpecPath::PSpecPath(unsigned src_cnt, unsigned dst_cnt, char polarity,
-                     bool full_flag)
-: conditional(false), condition(0), edge(0),
-  src(src_cnt), dst(dst_cnt),
-  data_source_expression(0)
-{
-      full_flag_ = full_flag;
-      polarity_ = polarity;
-}
-
-PSpecPath::~PSpecPath()
-{
-}
@@ -1,87 +0,0 @@
-#ifndef IVL_PSpec_H
-#define IVL_PSpec_H
-/*
- * Copyright (c) 2006-2014 Stephen Williams <[email protected]>
- *
- *    This source code is free software; you can redistribute it
- *    and/or modify it in source code form under the terms of the GNU
- *    General Public License as published by the Free Software
- *    Foundation; either version 2 of the License, or (at your option)
- *    any later version.
- *
- *    This program 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.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include  "LineInfo.h"
-# include  "StringHeap.h"
-# include  <vector>
-
-class PExpr;
-
-/*
-* The PSpecPath is the parse of a specify path, which is in its most
-* general form <path> = <delays>. The <delays> are collected into the
-* "delays" vector in all cases, and the variety is in the other
-* members.
-*
-* All paths also have a list of source names in the src vector, and a
-* list of destination names in the dst vector. These pairs are the
-* actual paths.
-*
-* If the path is a simple path, then:
-*      condition == nil
-*      edge == 0
-*      data_source_expression == nil
-*
-* If the path is conditional, then conditional == true and condition
-* is the condition expression. If the condition expression is nil,
-* then this is an ifnone conditional path.
-*
-* If data_source_expression != nil, then the path is edge sensitive
-* and the edge might not be 0.
-*
-* The full flag is used to verify that only vectors of the same size
-* are used in a parallel connection. Icarus always creates a full
-* connection between the source and destination. The polarity is for
-* informational (display) purposes only. The polarity is either '+',
-* '-' or 0.
-*/
-class PSpecPath  : public LineInfo {
-
-    public:
-      PSpecPath(unsigned src_cnt, unsigned dst_cnt, char polarity,
-                bool full_flag);
-      ~PSpecPath();
-
-      void elaborate(class Design*des, class NetScope*scope) const;
-
-      void dump(std::ostream&out, unsigned ind) const;
-
-    public:
-	// Condition expression, if present.
-      bool conditional;
-      class PExpr* condition;
-	// Edge specification (-1==negedge, 0 = no edge, 1==posedge)
-      int edge;
-	// Is this a full connection.
-      bool full_flag_;
-	// What is the polarity of the connection.
-      char polarity_;
-	// Ordered set of source nodes of a path
-      std::vector<perm_string> src;
-	// Ordered set of destination nodes of a path
-      std::vector<perm_string> dst;
-	// Data source expression
-      class PExpr* data_source_expression;
-
-      std::vector<class PExpr*>delays;
-};
-
-#endif /* IVL_PSpec_H */
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2008,2010 Stephen Williams ([email protected])
+ * Copyright (c) 1999 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -14,57 +14,61 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: PTask.cc,v 1.7 2002/08/12 01:34:58 steve Exp $"
+#endif

 # include "config.h"
+
 # include  "PTask.h"
-# include  <cassert>

-PTaskFunc::PTaskFunc(perm_string n, LexicalScope*p)
-: PScope(n,p), this_type_(0), ports_(0)
+PTask::PTask()
+: ports_(0), statement_(0)
 {
 }

-PTaskFunc::~PTaskFunc()
-{
-}
-
-void PTaskFunc::set_ports(vector<pform_tf_port_t>*p)
-{
-      assert(ports_ == 0);
-      ports_ = p;
-}
-
-void PTaskFunc::set_this(class_type_t*type, PWire*this_wire)
-{
-      assert(this_type_ == 0);
-      this_type_ = type;
-
-	// Push a synthethis argument that is the "this" value.
-      if (ports_==0)
-	    ports_ = new vector<pform_tf_port_t>;
-
-      size_t use_size = ports_->size();
-      ports_->resize(use_size + 1);
-      for (size_t idx = use_size ; idx > 0 ; idx -= 1)
-	    ports_->at(idx) = ports_->at(idx-1);
-
-      ports_->at(0) = pform_tf_port_t(this_wire);
-}
-
-PTask::PTask(perm_string name, LexicalScope*parent, bool is_auto__)
-: PTaskFunc(name, parent), statement_(0)
-{
-      is_auto_ = is_auto__;
-}
-
 PTask::~PTask()
 {
 }

+void PTask::set_ports(svector<PWire*>*p)
+{
+      assert(ports_ == 0);
+      ports_ = p;
+}
+
 void PTask::set_statement(Statement*s)
 {
      assert(statement_ == 0);
      statement_ = s;
 }
+
+
+/*
+ * $Log: PTask.cc,v $
+ * Revision 1.7  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.6  2001/07/25 03:10:48  steve
+ *  Create a config.h.in file to hold all the config
+ *  junk, and support gcc 3.0. (Stephan Boettcher)
+ *
+ * Revision 1.5  2001/04/19 03:04:47  steve
+ *  Spurious assert of empty statemnt.
+ *
+ * Revision 1.4  2001/01/13 22:20:08  steve
+ *  Parse parameters within nested scopes.
+ *
+ * Revision 1.3  2000/02/23 02:56:53  steve
+ *  Macintosh compilers do not support ident.
+ *
+ * Revision 1.2  1999/07/24 02:11:19  steve
+ *  Elaborate task input ports.
+ *
+ * Revision 1.1  1999/07/03 02:12:51  steve
+ *  Elaborate user defined tasks.
+ *
+ */
+
@@ -1,7 +1,7 @@
-#ifndef IVL_PTask_H
-#define IVL_PTask_H
+#ifndef __PTask_H
+#define __PTask_H
 /*
- * Copyright (c) 1999-2014 Stephen Williams ([email protected])
+ * Copyright (c) 1999-2000 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,69 +16,46 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: PTask.h,v 1.13.2.1 2005/08/13 00:45:53 steve Exp $"
+#endif

 # include  "LineInfo.h"
-# include  "PScope.h"
+# include  "svector.h"
 # include  "StringHeap.h"
 # include  <string>
-# include  <vector>
-# include  <list>
 class Design;
-class NetExpr;
-class NetNet;
 class NetScope;
-class PChainConstructor;
 class PWire;
 class Statement;
 class PExpr;

+enum PTaskFuncEnum {
+      PTF_NONE,
+      PTF_REG,
+      PTF_INTEGER,
+      PTF_REAL,
+      PTF_REALTIME,
+      PTF_TIME
+};

-class PTaskFunc : public PScope, public LineInfo {
-
-    public:
-      PTaskFunc(perm_string name, LexicalScope*parent);
-      ~PTaskFunc();
-
-      void set_ports(std::vector<pform_tf_port_t>*p);
-
-      void set_this(class_type_t*use_type, PWire*this_wire);
-
-	// If this task is a method of a class, this returns a pointer
-	// to the class type.
-      inline class_type_t* method_of() const { return this_type_; }
-
-
-      virtual void elaborate_sig(Design*des, NetScope*scope) const =0;
-      virtual void elaborate(Design*des, NetScope*scope) const =0;
-
-      virtual void dump(std::ostream&, unsigned) const =0;
-
-    protected:
-	// Elaborate the ports list. Write into the ports vector the
-	// NetNet pointers for the ports, and write into the pdefs the
-	// default value expressions, if any.
-      void elaborate_sig_ports_(Design*des, NetScope*scope,
-				std::vector<NetNet*>&ports,
-				std::vector<NetExpr*>&pdefs) const;
-
-      void dump_ports_(std::ostream&out, unsigned ind) const;
-
-    private:
-      class_type_t*this_type_;
-      std::vector<pform_tf_port_t>*ports_;
+struct PTaskFuncArg {
+      PTaskFuncEnum type;
+      svector<PExpr*>*range;
 };

 /*
 * The PTask holds the parsed definitions of a task.
 */
-class PTask  : public PTaskFunc {
+class PTask  : public LineInfo {

    public:
-      explicit PTask(perm_string name, LexicalScope*parent, bool is_auto);
+      explicit PTask();
      ~PTask();

+      void set_ports(svector<PWire *>*p);
      void set_statement(Statement *s);

 	// Tasks introduce scope, to need to be handled during the
@@ -93,13 +70,11 @@ class PTask  : public PTaskFunc {
 	// Elaborate the statement to finish off the task definition.
      void elaborate(Design*des, NetScope*scope) const;

-      bool is_auto() const { return is_auto_; };
-
-      void dump(ostream&, unsigned) const;
+      void dump(std::ostream&, unsigned) const;

    private:
+      svector<PWire*>*ports_;
      Statement*statement_;
-      bool is_auto_;

    private: // Not implemented
      PTask(const PTask&);
@@ -113,26 +88,15 @@ class PTask  : public PTaskFunc {
 *
 * The output value is not elaborated until elaborate_sig.
 */
-class PFunction : public PTaskFunc {
+class PFunction : public LineInfo {

    public:
-      explicit PFunction(perm_string name, LexicalScope*parent, bool is_auto);
+      explicit PFunction(perm_string name);
      ~PFunction();

+      void set_ports(svector<PWire *>*p);
      void set_statement(Statement *s);
-      void set_return(data_type_t*t);
-
-      inline Statement* get_statement() { return statement_; }
-
-	// Push this statement to the front of the existing
-	// definition. If the statement is a simple statement, make a
-	// block to contain the statements.
-      void push_statement_front(Statement*stmt);
-
-	// This is only used if this function is a constructor. In
-	// that case, this method looks for a PChainConstructor in the
-	// statement and extracts it if found.
-      PChainConstructor*extract_chain_constructor();
+      void set_return(PTaskFuncArg t);

      void elaborate_scope(Design*des, NetScope*scope) const;

@@ -142,14 +106,71 @@ class PFunction : public PTaskFunc {
 	/* Elaborate the behavioral statement. */
      void elaborate(Design *des, NetScope*) const;

-      bool is_auto() const { return is_auto_; };
-
-      void dump(ostream&, unsigned) const;
+      void dump(std::ostream&, unsigned) const;

    private:
-      data_type_t* return_type_;
+      perm_string name_;
+      PTaskFuncArg return_type_;
+      svector<PWire *> *ports_;
      Statement *statement_;
-      bool is_auto_;
 };

-#endif /* IVL_PTask_H */
+/*
+ * $Log: PTask.h,v $
+ * Revision 1.13.2.1  2005/08/13 00:45:53  steve
+ *  Fix compilation warnings/errors with newer compilers.
+ *
+ * Revision 1.13  2004/05/31 23:34:36  steve
+ *  Rewire/generalize parsing an elaboration of
+ *  function return values to allow for better
+ *  speed and more type support.
+ *
+ * Revision 1.12  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.11  2001/11/22 06:20:59  steve
+ *  Use NetScope instead of string for scope path.
+ *
+ * Revision 1.10  2001/01/13 22:20:08  steve
+ *  Parse parameters within nested scopes.
+ *
+ * Revision 1.9  2000/07/30 18:25:43  steve
+ *  Rearrange task and function elaboration so that the
+ *  NetTaskDef and NetFuncDef functions are created during
+ *  signal enaboration, and carry these objects in the
+ *  NetScope class instead of the extra, useless map in
+ *  the Design class.
+ *
+ * Revision 1.8  2000/03/08 04:36:53  steve
+ *  Redesign the implementation of scopes and parameters.
+ *  I now generate the scopes and notice the parameters
+ *  in a separate pass over the pform. Once the scopes
+ *  are generated, I can process overrides and evalutate
+ *  paremeters before elaboration begins.
+ *
+ * Revision 1.7  2000/02/23 02:56:53  steve
+ *  Macintosh compilers do not support ident.
+ *
+ * Revision 1.6  1999/09/30 21:28:34  steve
+ *  Handle mutual reference of tasks by elaborating
+ *  task definitions in two passes, like functions.
+ *
+ * Revision 1.5  1999/09/01 20:46:19  steve
+ *  Handle recursive functions and arbitrary function
+ *  references to other functions, properly pass
+ *  function parameters and save function results.
+ *
+ * Revision 1.4  1999/08/25 22:22:41  steve
+ *  elaborate some aspects of functions.
+ *
+ * Revision 1.3  1999/07/31 19:14:47  steve
+ *  Add functions up to elaboration (Ed Carter)
+ *
+ * Revision 1.2  1999/07/24 02:11:19  steve
+ *  Elaborate task input ports.
+ *
+ * Revision 1.1  1999/07/03 02:12:51  steve
+ *  Elaborate user defined tasks.
+ *
+ */
+#endif
@@ -14,8 +14,11 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: PUdp.cc,v 1.3 2004/03/08 00:47:44 steve Exp $"
+#endif

 # include  "PUdp.h"

@@ -35,3 +38,16 @@ unsigned PUdp::find_port(const char*name)
      return ports.count();
 }

+/*
+ * $Log: PUdp.cc,v $
+ * Revision 1.3  2004/03/08 00:47:44  steve
+ *  primitive ports can bind bi name.
+ *
+ * Revision 1.2  2004/02/18 17:11:54  steve
+ *  Use perm_strings for named langiage items.
+ *
+ * Revision 1.1  2003/07/15 05:07:13  steve
+ *  Move PUdp constructor into compiled file.
+ *
+ */
+
@@ -1,7 +1,7 @@
-#ifndef IVL_PUdp_H
-#define IVL_PUdp_H
+#ifndef __PUdp_H
+#define __PUdp_H
 /*
- * Copyright (c) 1998-2014 Stephen Williams ([email protected])
+ * Copyright (c) 1998-2004 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,11 +16,13 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: PUdp.h,v 1.12.2.1 2005/08/13 00:45:53 steve Exp $"
+#endif

 # include  <map>
-# include  "LineInfo.h"
 # include  "StringHeap.h"
 # include  "svector.h"
 # include  "verinum.h"
@@ -29,7 +31,7 @@ class PExpr;

 /*
 * This class represents a parsed UDP. This is a much simpler object
- * than a module or macromodule.
+ * then a module or macromodule.
 *
 *   - all ports are scalar,
 *   - pin 0 (the first port) is always output,
@@ -48,25 +50,25 @@ class PExpr;
 * If the UDP is sequential, the "initial" member is taken to be the
 * initial value assigned in the source, or 'x' if none is given.
 */
-class PUdp : public LineInfo {
+class PUdp {

    public:
      explicit PUdp(perm_string n, unsigned nports);

-      svector<string>ports;
+      svector<std::string>ports;
      unsigned find_port(const char*name);

      bool sequential;

-      svector<string>tinput;
+      svector<std::string>tinput;
      svector<char>  tcurrent;
      svector<char>  toutput;

      verinum::V initial;

-      map<string,PExpr*> attributes;
+      std::map<std::string,PExpr*> attributes;

-      void dump(ostream&out) const;
+      void dump(std::ostream&out) const;

      perm_string name_;
    private:
@@ -76,4 +78,56 @@ class PUdp : public LineInfo {
      PUdp& operator= (const PUdp&);
 };

-#endif /* IVL_PUdp_H */
+/*
+ * $Log: PUdp.h,v $
+ * Revision 1.12.2.1  2005/08/13 00:45:53  steve
+ *  Fix compilation warnings/errors with newer compilers.
+ *
+ * Revision 1.12  2004/03/08 00:47:44  steve
+ *  primitive ports can bind bi name.
+ *
+ * Revision 1.11  2004/02/18 17:11:54  steve
+ *  Use perm_strings for named langiage items.
+ *
+ * Revision 1.10  2003/07/15 05:07:13  steve
+ *  Move PUdp constructor into compiled file.
+ *
+ * Revision 1.9  2003/07/15 03:49:22  steve
+ *  Spelling fixes.
+ *
+ * Revision 1.8  2003/01/30 16:23:07  steve
+ *  Spelling fixes.
+ *
+ * Revision 1.7  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.6  2002/05/23 03:08:51  steve
+ *  Add language support for Verilog-2001 attribute
+ *  syntax. Hook this support into existing $attribute
+ *  handling, and add number and void value types.
+ *
+ *  Add to the ivl_target API new functions for access
+ *  of complex attributes attached to gates.
+ *
+ * Revision 1.5  2001/04/22 23:09:45  steve
+ *  More UDP consolidation from Stephan Boettcher.
+ *
+ * Revision 1.4  2000/02/23 02:56:53  steve
+ *  Macintosh compilers do not support ident.
+ *
+ * Revision 1.3  1999/06/15 03:44:53  steve
+ *  Get rid of the STL vector template.
+ *
+ * Revision 1.2  1998/12/01 00:42:13  steve
+ *  Elaborate UDP devices,
+ *  Support UDP type attributes, and
+ *  pass those attributes to nodes that
+ *  are instantiated by elaboration,
+ *  Put modules into a map instead of
+ *  a simple list.
+ *
+ * Revision 1.1  1998/11/25 02:35:53  steve
+ *  Parse UDP primitives all the way to pform.
+ *
+ */
+#endif
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2012 Stephen Williams ([email protected])
+ * Copyright (c) 1999 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -14,23 +14,30 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: PWire.cc,v 1.10 2002/08/12 01:34:58 steve Exp $"
+#endif

 # include "config.h"
 # include  "PWire.h"
-# include  "PExpr.h"
-# include  <cassert>
+# include  <assert.h>

-PWire::PWire(perm_string n,
-	     NetNet::Type t,
-	     NetNet::PortType pt,
-	     ivl_variable_type_t dt)
-: name_(n), type_(t), port_type_(pt), data_type_(dt),
-  signed_(false), isint_(false),
-  port_set_(false), net_set_(false), is_scalar_(false),
-  error_cnt_(0), set_data_type_(0),
-  discipline_(0)
+PWire::PWire(const hname_t&n, NetNet::Type t, NetNet::PortType pt)
+: hname_(n), type_(t), port_type_(pt), signed_(false), isint_(false),
+lidx_(0), ridx_(0)
+{
+      if (t == NetNet::INTEGER) {
+	    type_ = NetNet::REG;
+	    signed_ = true;
+	    isint_ = true;
+      }
+}
+
+PWire::PWire(char*n, NetNet::Type t, NetNet::PortType pt)
+: hname_(n), type_(t), port_type_(pt), signed_(false), isint_(false),
+lidx_(0), ridx_(0)
 {
      if (t == NetNet::INTEGER) {
 	    type_ = NetNet::REG;
@@ -44,9 +51,9 @@ NetNet::Type PWire::get_wire_type() const
      return type_;
 }

-perm_string PWire::basename() const
+const hname_t& PWire::path() const
 {
-      return name_;
+      return hname_;
 }

 bool PWire::set_wire_type(NetNet::Type t)
@@ -58,15 +65,7 @@ bool PWire::set_wire_type(NetNet::Type t)
 	    type_ = t;
 	    return true;
 	  case NetNet::IMPLICIT_REG:
-	    if (t == NetNet::REG) {
-		  type_ = t;
-		  return true;
-	    }
-	    if (t == NetNet::INTEGER) {
-		  type_ = NetNet::REG;
-		  isint_ = true;
-		  return true;
-	    }
+	    if (t == NetNet::REG) { type_ = t; return true; }
 	    return false;
 	  case NetNet::REG:
 	    if (t == NetNet::INTEGER) {
@@ -109,26 +108,6 @@ bool PWire::set_port_type(NetNet::PortType pt)
      }
 }

-bool PWire::set_data_type(ivl_variable_type_t dt)
-{
-      if (data_type_ != IVL_VT_NO_TYPE) {
-	    if (data_type_ != dt)
-		  return false;
-	    else
-		  return true;
-      }
-
-      assert(data_type_ == IVL_VT_NO_TYPE);
-      data_type_ = dt;
-
-      return true;
-}
-
-ivl_variable_type_t PWire::get_data_type() const
-{
-      return data_type_;
-}
-
 void PWire::set_signed(bool flag)
 {
      signed_ = flag;
@@ -141,144 +120,59 @@ bool PWire::get_signed() const

 bool PWire::get_isint() const
 {
-      if (isint_)
-	    return true;
-
-      if (vector_type_t*tmp = dynamic_cast<vector_type_t*>(set_data_type_)) {
-	    return tmp->integer_flag;
-      }
-
-      return false;
+      return isint_;
 }

-bool PWire::get_scalar() const
+void PWire::set_range(PExpr*m, PExpr*l)
 {
-      return is_scalar_;
+      msb_ = svector<PExpr*>(msb_,m);
+      lsb_ = svector<PExpr*>(lsb_,l);
 }

-void PWire::set_range_scalar(PWSRType type)
+void PWire::set_memory_idx(PExpr*ldx, PExpr*rdx)
 {
-      is_scalar_ = true;
-      switch (type) {
-	  case SR_PORT:
-	    if (port_set_) {
-		  cerr << get_fileline() << ": error: Port ``" << name_
-		       << "'' has already been declared a port." << endl;
-		  error_cnt_ += 1;
-	    } else {
-		  port_set_ = true;
-	    }
-	    return;
-
-	  case SR_NET:
-	    if (net_set_) {
-		  cerr << get_fileline() << ": error: Net ``" << name_
-		       << "'' has already been declared." << endl;
-		  error_cnt_ += 1;
-	    } else {
-		  net_set_ = true;
-	    }
-	    return;
-
-	  case SR_BOTH:
-	    if (port_set_ || net_set_) {
-		  if (port_set_) {
-		        cerr << get_fileline() << ": error: Port ``" << name_
-		             << "'' has already been declared a port." << endl;
-		        error_cnt_ += 1;
-		  }
-		  if (net_set_) {
-		        cerr << get_fileline() << ": error: Net ``" << name_
-		             << "'' has already been declared." << endl;
-		        error_cnt_ += 1;
-		  }
-	    } else {
-		  port_set_ = true;
-		  net_set_ = true;
-	    }
-	    return;
-      }
+      assert(lidx_ == 0);
+      assert(ridx_ == 0);
+      assert(type_ == NetNet::REG);
+      lidx_ = ldx;
+      ridx_ = rdx;
 }

-void PWire::set_range(const list<pform_range_t>&rlist, PWSRType type)
-{
-      switch (type) {
-	  case SR_PORT:
-	    if (port_set_) {
-		  cerr << get_fileline() << ": error: Port ``" << name_
-		       << "'' has already been declared a port." << endl;
-		  error_cnt_ += 1;
-	    } else {
-		  port_ = rlist;
-		  port_set_ = true;
-		  is_scalar_ = false;
-	    }
-	    return;
+/*
+ * $Log: PWire.cc,v $
+ * Revision 1.10  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.9  2002/06/21 04:59:35  steve
+ *  Carry integerness throughout the compilation.
+ *
+ * Revision 1.8  2002/01/26 05:28:28  steve
+ *  Detect scalar/vector declarion mismatch.
+ *
+ * Revision 1.7  2001/12/03 04:47:14  steve
+ *  Parser and pform use hierarchical names as hname_t
+ *  objects instead of encoded strings.
+ *
+ * Revision 1.6  2001/07/25 03:10:48  steve
+ *  Create a config.h.in file to hold all the config
+ *  junk, and support gcc 3.0. (Stephan Boettcher)
+ *
+ * Revision 1.5  2001/01/06 02:29:35  steve
+ *  Support arrays of integers.
+ *
+ * Revision 1.4  2000/12/11 00:31:43  steve
+ *  Add support for signed reg variables,
+ *  simulate in t-vvm signed comparisons.
+ *
+ * Revision 1.3  2000/02/23 02:56:54  steve
+ *  Macintosh compilers do not support ident.
+ *
+ * Revision 1.2  1999/09/10 05:02:09  steve
+ *  Handle integers at task parameters.
+ *
+ * Revision 1.1  1999/06/17 05:34:42  steve
+ *  Clean up interface of the PWire class,
+ *  Properly match wire ranges.
+ *
+ */

-	  case SR_NET:
-	    if (net_set_) {
-		  cerr << get_fileline() << ": error: Net ``" << name_
-		       << "'' has already been declared." << endl;
-		  error_cnt_ += 1;
-	    } else {
-		  net_ = rlist;
-		  net_set_ = true;
-		  is_scalar_ = false;
-	    }
-	    return;
-
-	  case SR_BOTH:
-	    if (port_set_ || net_set_) {
-		  if (port_set_) {
-		        cerr << get_fileline() << ": error: Port ``" << name_
-		             << "'' has already been declared a port." << endl;
-		        error_cnt_ += 1;
-		  }
-		  if (net_set_) {
-		        cerr << get_fileline() << ": error: Net ``" << name_
-		             << "'' has already been declared." << endl;
-		        error_cnt_ += 1;
-		  }
-	    } else {
-		  port_ = rlist;
-		  port_set_ = true;
-		  net_ = rlist;
-		  net_set_ = true;
-		  is_scalar_ = false;
-	    }
-	    return;
-      }
-}
-
-void PWire::set_unpacked_idx(const list<pform_range_t>&ranges)
-{
-      if (! unpacked_.empty()) {
-	    cerr << get_fileline() << ": error: Array ``" << name_
-	         << "'' has already been declared." << endl;
-	    error_cnt_ += 1;
-      } else {
-	    unpacked_ = ranges;
-      }
-}
-
-void PWire::set_data_type(data_type_t*type)
-{
-      assert(set_data_type_ == 0);
-      set_data_type_ = type;
-
-      if (vector_type_t*tmp = dynamic_cast<vector_type_t*>(type)) {
-	    if (tmp->integer_flag)
-		  isint_ = true;
-      }
-}
-
-void PWire::set_discipline(ivl_discipline_t d)
-{
-      assert(discipline_ == 0);
-      discipline_ = d;
-}
-
-ivl_discipline_t PWire::get_discipline(void) const
-{
-      return discipline_;
-}
@@ -1,7 +1,7 @@
-#ifndef IVL_PWire_H
-#define IVL_PWire_H
+#ifndef __PWire_H
+#define __PWire_H
 /*
- * Copyright (c) 1998-2014 Stephen Williams ([email protected])
+ * Copyright (c) 1998-2000 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,14 +16,16 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: PWire.h,v 1.17 2004/02/20 18:53:33 steve Exp $"
+#endif

 # include  "netlist.h"
 # include  "LineInfo.h"
-# include  <list>
 # include  <map>
-# include  "StringHeap.h"
+# include  "svector.h"

 #ifdef HAVE_IOSFWD
 # include  <iosfwd>
@@ -33,12 +35,6 @@ class ostream;

 class PExpr;
 class Design;
-class netdarray_t;
-
-/*
- * The different type of PWire::set_range() calls.
- */
-enum PWSRType {SR_PORT, SR_NET, SR_BOTH};

 /*
 * Wires include nets, registers and ports. A net or register becomes
@@ -46,21 +42,18 @@ enum PWSRType {SR_PORT, SR_NET, SR_BOTH};
 * identifies a port by keeping it in its port list.
 *
 * The hname parameter to the constructor is a hierarchical name. It
- * is the name of the wire within a module, so does not include the
- * current scope or any instances. Modules contain all the wires, so
- * from that perspective, sub-scopes within the module are a part of
- * the wire name.
+ * is an array of strings starting with the root, running towards
+ * the base name, and terminated by a null pointer. The environment
+ * allocates the memory for me.
 */
 class PWire : public LineInfo {

    public:
-      PWire(perm_string name,
-	    NetNet::Type t,
-	    NetNet::PortType pt,
-	    ivl_variable_type_t dt);
+      PWire(const hname_t&hname, NetNet::Type t, NetNet::PortType pt);
+      PWire(char*name, NetNet::Type t, NetNet::PortType pt);

 	// Return a hierarchical name.
-      perm_string basename() const;
+      const hname_t&path() const;

      NetNet::Type get_wire_type() const;
      bool set_wire_type(NetNet::Type);
@@ -71,62 +64,106 @@ class PWire : public LineInfo {
      void set_signed(bool flag);
      bool get_signed() const;
      bool get_isint() const;
-      bool get_scalar() const;

-      bool set_data_type(ivl_variable_type_t dt);
-      ivl_variable_type_t get_data_type() const;
+      void set_range(PExpr*msb, PExpr*lsb);

-      void set_range_scalar(PWSRType type);
-      void set_range(const std::list<pform_range_t>&ranges, PWSRType type);
-
-      void set_unpacked_idx(const std::list<pform_range_t>&ranges);
-
-      void set_data_type(data_type_t*type);
-
-      void set_discipline(ivl_discipline_t);
-      ivl_discipline_t get_discipline(void) const;
+      void set_memory_idx(PExpr*ldx, PExpr*rdx);

      map<perm_string,PExpr*> attributes;

 	// Write myself to the specified stream.
-      void dump(ostream&out, unsigned ind=4) const;
+      void dump(ostream&out) const;

-      NetNet* elaborate_sig(Design*, NetScope*scope) const;
+      void elaborate_sig(Design*, NetScope*scope) const;

    private:
-      perm_string name_;
+      hname_t hname_;
      NetNet::Type type_;
      NetNet::PortType port_type_;
-      ivl_variable_type_t data_type_;
      bool signed_;
      bool isint_;		// original type of integer

 	// These members hold expressions for the bit width of the
-	// wire. If they do not exist, the wire is 1 bit wide. If they
-	// do exist, they represent the packed dimensions of the
-	// bit. The first item in the list is the first range, and so
-	// on. For example "reg [3:0][7:0] ..." will contains the
-	// range_t object for [3:0] first and [7:0] last.
-      std::list<pform_range_t>port_;
-      bool port_set_;
-      std::list<pform_range_t>net_;
-      bool net_set_;
-      bool is_scalar_;
-      unsigned error_cnt_;
+	// wire. If they do not exist, the wire is 1 bit wide.
+      svector<PExpr*>msb_;
+      svector<PExpr*>lsb_;

 	// If this wire is actually a memory, these indices will give
-	// me the size and address ranges of the memory.
-      std::list<pform_range_t>unpacked_;
-
-	// This is the complex type of the wire. the data_type_ may
-	// modify how this is interpreted.
-      data_type_t*set_data_type_;
-
-      ivl_discipline_t discipline_;
+	// me the size and address range of the memory.
+      PExpr*lidx_;
+      PExpr*ridx_;

    private: // not implemented
      PWire(const PWire&);
      PWire& operator= (const PWire&);
 };

-#endif /* IVL_PWire_H */
+/*
+ * $Log: PWire.h,v $
+ * Revision 1.17  2004/02/20 18:53:33  steve
+ *  Addtrbute keys are perm_strings.
+ *
+ * Revision 1.16  2003/01/30 16:23:07  steve
+ *  Spelling fixes.
+ *
+ * Revision 1.15  2003/01/26 21:15:58  steve
+ *  Rework expression parsing and elaboration to
+ *  accommodate real/realtime values and expressions.
+ *
+ * Revision 1.14  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.13  2002/06/21 04:59:35  steve
+ *  Carry integerness throughout the compilation.
+ *
+ * Revision 1.12  2002/05/23 03:08:51  steve
+ *  Add language support for Verilog-2001 attribute
+ *  syntax. Hook this support into existing $attribute
+ *  handling, and add number and void value types.
+ *
+ *  Add to the ivl_target API new functions for access
+ *  of complex attributes attached to gates.
+ *
+ * Revision 1.11  2001/12/03 04:47:14  steve
+ *  Parser and pform use hierarchical names as hname_t
+ *  objects instead of encoded strings.
+ *
+ * Revision 1.10  2001/01/16 02:44:18  steve
+ *  Use the iosfwd header if available.
+ *
+ * Revision 1.9  2000/12/11 00:31:43  steve
+ *  Add support for signed reg variables,
+ *  simulate in t-vvm signed comparisons.
+ *
+ * Revision 1.8  2000/05/02 16:27:38  steve
+ *  Move signal elaboration to a seperate pass.
+ *
+ * Revision 1.7  2000/02/23 02:56:54  steve
+ *  Macintosh compilers do not support ident.
+ *
+ * Revision 1.6  1999/11/27 19:07:57  steve
+ *  Support the creation of scopes.
+ *
+ * Revision 1.5  1999/06/17 05:34:42  steve
+ *  Clean up interface of the PWire class,
+ *  Properly match wire ranges.
+ *
+ * Revision 1.4  1999/06/02 15:38:46  steve
+ *  Line information with nets.
+ *
+ * Revision 1.3  1999/04/19 01:59:36  steve
+ *  Add memories to the parse and elaboration phases.
+ *
+ * Revision 1.2  1998/11/23 00:20:22  steve
+ *  NetAssign handles lvalues as pin links
+ *  instead of a signal pointer,
+ *  Wire attributes added,
+ *  Ability to parse UDP descriptions added,
+ *  XNF generates EXT records for signals with
+ *  the PAD attribute.
+ *
+ * Revision 1.1  1998/11/03 23:28:55  steve
+ *  Introduce verilog to CVS.
+ *
+ */
+#endif
@@ -8,11 +8,14 @@ Icarus Verilog is intended to compile ALL of the Verilog HDL as
 described in the IEEE-1364 standard. Of course, it's not quite there
 yet. It does currently handle a mix of structural and behavioral
 constructs. For a view of the current state of Icarus Verilog, see its
-home page at <http://iverilog.icarus.com/>.
+home page at <http://www.icarus.com/eda/verilog>.

 Icarus Verilog is not aimed at being a simulator in the traditional
 sense, but a compiler that generates code employed by back-end
-tools.
+tools. These back-end tools currently include a simulator engine
+called VVP, an XNF (Xilinx Netlist Format) generator and an EDIF FPGA
+netlist generator. In the future, backends are expected for EDIF/LPM,
+structural Verilog, VHDL, etc.

    For instructions on how to run Icarus Verilog,
    see the ``iverilog'' man page.
@@ -64,7 +67,7 @@ on a UNIX-like system:
 	- termcap
 	  The readline library in turn uses termcap.

-If you are building from git, you will also need software to generate
+If you are building from CVS, you will also need software to generate
 the configure scripts.

 	- autoconf 2.53
@@ -85,6 +88,10 @@ Normally, this command automatically figures out everything it needs
 to know. It generally works pretty well. There are a few flags to the
 configure script that modify its behavior:

+	--without-ipal
+	    This turns off support for Icarus PAL, whether ipal
+	    libraries are installed or not.
+
 	--prefix=<root>
 	    The default is /usr/local, which causes the tool suite to
 	    be compiled for install in /usr/local/bin,
@@ -95,16 +102,27 @@ configure script that modify its behavior:
 	    common to use --prefix=/opt.  You can configure for a non-root
 	    install with --prefix=$HOME.

-	--enable-suffix
-	--enable-suffix=<your-suffix>
-	--disable-suffix
-	    Enable/disable changing the names of install files to use
-	    a suffix string so that this version or install can co-
-	    exist with other versions. This renames the installed
-	    commands (iverilog, iverilog-vpi, vvp) and the installed
-	    library files and include directory so that installations
-	    with the same prefix but different suffix are guaranteed
-	    to not interfere with each other.
+	--enable-vvp32 (experimental)
+	    If compiling on AMD64 systems, this enables the
+	    compilation of 32bit compatible vvp (vvp32) and the vpi
+	    modules that match.
+
+2.2.1 Special AMD64 Instructions
+
+(The Icarus Verilog RPM for x86_64 is build using these instructions.)
+
+If you are building for Linux/AMD64 (a.k.a x86_64) then to get the
+most out of your install, first make sure you have both 64bit and
+32bit development libraries installed. Then configure with this
+somewhat more complex command:
+
+  ./configure libdir64='$(prefix)/lib64' vpidir1=vpi64 vpidir2=. --enable-vvp32
+
+This reflects the convention on AMD64 systems that 64bit libraries go
+into lib64 directories. The "--enable-vvp32" also turns on 32bit
+compatibility files. A 32bit version of vvp (vvp32) will be created,
+as well as 32bit versions of the development libraries and bundled VPI
+libraries.

 2.3 (Optional) Testing

@@ -156,9 +174,8 @@ step. There may be dangling references, and it is not yet clear which
 module is the root.

 One can see a human readable version of the final pform by using the
-``-P <path>'' flag to the ``ivl'' subcommand. This will cause ivl
-to dump the pform into the file named <path>. (Note that this is not
-normally done, unless debugging the ``ivl'' subcommand.)
+``-P <path>'' flag to the compiler. This will cause iverilog to dump
+the pform into the file named <path>.

 3.3 Elaboration

@@ -184,7 +201,8 @@ first, followed by the structural and behavioral elaboration.
 This pass scans through the pform looking for scopes and parameters. A
 tree of NetScope objects is built up and placed in the Design object,
 with the root module represented by the root NetScope object. The
-elab_scope.cc file contains most of the code for handling this phase.
+elab_scope.cc and elab_pexpr.cc files contain most of the code for
+handling this phase.

 The tail of the elaborate_scope behavior (after the pform is
 traversed) includes a scan of the NetScope tree to locate defparam
@@ -237,7 +255,7 @@ item. The syntax of the $attribute item is:
 	$attribute (<identifier>, <key>, <value>);

 The $attribute keyword looks like a system task invocation. The
-difference here is that the parameters are more restricted than those
+difference here is that the parameters are more restricted then those
 of a system task. The <identifier> must be an identifier. This will be
 the item to get an attribute. The <key> and <value> are strings, not
 expressions, that give the key and the value of the attribute to be
@@ -341,8 +359,7 @@ constructs.
 Icarus Verilog includes some features that are not part of the
 IEEE1364 standard, but have well defined meaning, and also sometimes
 gives nonstandard (but extended) meanings to some features of the
-language that are defined. See the "extensions.txt" documentation for
-more details.
+language that are defined.

    $is_signed(<expr>)
 	This system function returns 1 if the expression contained is
@@ -453,20 +470,6 @@ more details.
 	combinational always blocks to be triggered when the values in
 	the sensitivity list are initialized by initial threads.

-    Nets with Types
-
-	Icarus Verilog support an extension syntax that allows nets
-	and regs to be explicitly typed. The currently supported types
-	are logic, bool and real. This implies that "logic" and "bool"
-	are new keywords. Typical syntax is:
-
-	wire real foo = 1.0;
-	reg logic bar, bat;
-
-	... and so forth. The syntax can be turned off by using the
-	-g2 flag to iverilog, and turned on explicitly with the -g2x
-	flag to iverilog.
-
 6.0 CREDITS

 Except where otherwise noted, Icarus Verilog, ivl and ivlpp are
@@ -475,3 +478,53 @@ file. However, I have early on received aid in the form of fixes,
 Verilog guidance, and especially testing from many people. Testers in
 particular include a larger community of people interested in a GPL
 Verilog for Linux.
+
+
+6.1 PORT MAINTAINERS
+
+This is a list of people who have created ports and precompiled
+packages for various operating systems. These folks have graciously
+taken on the task of building Icarus Verilog on their systems and
+bundled it into neat packages.(+) If you want to be added to the list (or
+removed from the list) send e-mail to me.
+
+      FreeBSD/{Intel,alpha}
+	Ying-Chieh Liao <[email protected]>
+
+      Linux/{alpha,AMD64,Intel} (RPMS)
+	Stephen Williams <[email protected]>
+
+      Linux/* (.debs)
+	Hamish Moffatt <[email protected]>
+
+      Macintosh -- MacO/S
+	Yasuhisa Kato <[email protected]>
+
+      Mac O/S X
+        Timothy J. Wood <[email protected]>
+
+      NetBSD/*
+	Dan McMahill <[email protected]>
+
+      Solaris/SPARC packages (.pkg)
+	Dan McMahill <[email protected]>
+
+      Cygwin32/*
+        Venkat Iyer <[email protected]>
+
+      Mingw32
+        Venkat Iyer <[email protected]>
+
+(+) These are not the only systems where Icarus Verilog has been run,
+just the systems where precompiled binaries are publicly available.
+
+
+6.2 TEST SUITE MANAGER
+
+Steve Wilson <[email protected]> has taken on the large task of managing
+the test suite. He has maintained the regression test scripts, the
+driver list, received submissions from myself and others, and has
+written a great many tests on his own. Any compiler writer, for any
+language, will tell you that the test suite is at least as important
+as the compiler code itself.
+
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2013 Stephen Williams ([email protected])
+ * Copyright (c) 1998-1999 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -14,33 +14,35 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: Statement.cc,v 1.29 2004/02/18 17:11:54 steve Exp $"
+#endif

 # include "config.h"

 # include  "Statement.h"
 # include  "PExpr.h"
-# include  "ivl_assert.h"

 Statement::~Statement()
 {
 }

-PAssign_::PAssign_(PExpr*lval__, PExpr*ex, bool is_constant)
-: event_(0), count_(0), lval_(lval__), rval_(ex), is_constant_(is_constant)
+PAssign_::PAssign_(PExpr*lval, PExpr*ex)
+: event_(0), lval_(lval), rval_(ex)
 {
      delay_ = 0;
 }

-PAssign_::PAssign_(PExpr*lval__, PExpr*de, PExpr*ex)
-: event_(0), count_(0), lval_(lval__), rval_(ex), is_constant_(false)
+PAssign_::PAssign_(PExpr*lval, PExpr*de, PExpr*ex)
+: event_(0), lval_(lval), rval_(ex)
 {
      delay_ = de;
 }

-PAssign_::PAssign_(PExpr*lval__, PExpr*cnt, PEventStatement*ev, PExpr*ex)
-: event_(ev), count_(cnt), lval_(lval__), rval_(ex), is_constant_(false)
+PAssign_::PAssign_(PExpr*lval, PEventStatement*ev, PExpr*ex)
+: event_(ev), lval_(lval), rval_(ex)
 {
      delay_ = 0;
 }
@@ -51,28 +53,18 @@ PAssign_::~PAssign_()
      delete rval_;
 }

-PAssign::PAssign(PExpr*lval__, PExpr*ex)
-: PAssign_(lval__, ex, false), op_(0)
+PAssign::PAssign(PExpr*lval, PExpr*ex)
+: PAssign_(lval, ex)
 {
 }

-PAssign::PAssign(PExpr*lval__, char op, PExpr*ex)
-: PAssign_(lval__, ex, false), op_(op)
+PAssign::PAssign(PExpr*lval, PExpr*d, PExpr*ex)
+: PAssign_(lval, d, ex)
 {
 }

-PAssign::PAssign(PExpr*lval__, PExpr*d, PExpr*ex)
-: PAssign_(lval__, d, ex), op_(0)
-{
-}
-
-PAssign::PAssign(PExpr*lval__, PExpr*cnt, PEventStatement*d, PExpr*ex)
-: PAssign_(lval__, cnt, d, ex), op_(0)
-{
-}
-
-PAssign::PAssign(PExpr*lval__, PExpr*ex, bool is_constant)
-: PAssign_(lval__, ex, is_constant), op_(0)
+PAssign::PAssign(PExpr*lval, PEventStatement*d, PExpr*ex)
+: PAssign_(lval, d, ex)
 {
 }

@@ -80,18 +72,13 @@ PAssign::~PAssign()
 {
 }

-PAssignNB::PAssignNB(PExpr*lval__, PExpr*ex)
-: PAssign_(lval__, ex, false)
+PAssignNB::PAssignNB(PExpr*lval, PExpr*ex)
+: PAssign_(lval, ex)
 {
 }

-PAssignNB::PAssignNB(PExpr*lval__, PExpr*d, PExpr*ex)
-: PAssign_(lval__, d, ex)
-{
-}
-
-PAssignNB::PAssignNB(PExpr*lval__, PExpr*cnt, PEventStatement*d, PExpr*ex)
-: PAssign_(lval__, cnt, d, ex)
+PAssignNB::PAssignNB(PExpr*lval, PExpr*d, PExpr*ex)
+: PAssign_(lval, d, ex)
 {
 }

@@ -99,99 +86,37 @@ PAssignNB::~PAssignNB()
 {
 }

-PBlock::PBlock(perm_string n, LexicalScope*parent, BL_TYPE t)
-: PScope(n, parent), bl_type_(t)
+PBlock::PBlock(perm_string n, BL_TYPE t, const svector<Statement*>&st)
+: name_(n), bl_type_(t), list_(st)
+{
+}
+
+PBlock::PBlock(BL_TYPE t, const svector<Statement*>&st)
+: bl_type_(t), list_(st)
 {
 }

 PBlock::PBlock(BL_TYPE t)
-: PScope(perm_string()), bl_type_(t)
+: bl_type_(t)
 {
 }

 PBlock::~PBlock()
 {
-      for (unsigned idx = 0 ;  idx < list_.size() ;  idx += 1)
+      for (unsigned idx = 0 ;  idx < list_.count() ;  idx += 1)
 	    delete list_[idx];
 }

-PChainConstructor* PBlock::extract_chain_constructor()
+PCallTask::PCallTask(const hname_t&n, const svector<PExpr*>&p)
+: path_(n), parms_(p)
 {
-      if (list_.empty())
-	    return 0;
-
-      if (PChainConstructor*res = dynamic_cast<PChainConstructor*> (list_[0])) {
-	    for (size_t idx = 0 ; idx < list_.size()-1 ; idx += 1)
-		  list_[idx] = list_[idx+1];
-	    list_.resize(list_.size()-1);
-	    return res;
-      }
-
-      return 0;
-}
-
-void PBlock::set_join_type(PBlock::BL_TYPE type)
-{
-      assert(bl_type_ == BL_PAR);
-      assert(type==BL_PAR || type==BL_JOIN_NONE || type==BL_JOIN_ANY);
-      bl_type_ = type;
-}
-
-void PBlock::set_statement(const vector<Statement*>&st)
-{
-      list_ = st;
-}
-
-void PBlock::push_statement_front(Statement*that)
-{
-      ivl_assert(*this, bl_type_==BL_SEQ);
-
-      list_.resize(list_.size()+1);
-      for (size_t idx = list_.size()-1 ; idx > 0 ; idx -= 1)
-	    list_[idx] = list_[idx-1];
-
-      list_[0] = that;
-}
-
-PCallTask::PCallTask(const pform_name_t&n, const list<PExpr*>&p)
-: package_(0), path_(n), parms_(p.size())
-{
-      list<PExpr*>::const_iterator cur = p.begin();
-      for (size_t idx = 0 ; idx < parms_.size() ; idx += 1) {
-	    parms_[idx] = *cur;
-	    ++cur;
-      }
-      assert(cur == p.end());
-}
-
-PCallTask::PCallTask(PPackage*pkg, const pform_name_t&n, const list<PExpr*>&p)
-: package_(pkg), path_(n), parms_(p.size())
-{
-      list<PExpr*>::const_iterator cur = p.begin();
-      for (size_t idx = 0 ; idx < parms_.size() ; idx += 1) {
-	    parms_[idx] = *cur;
-	    ++cur;
-      }
-      assert(cur == p.end());
-}
-
-PCallTask::PCallTask(perm_string n, const list<PExpr*>&p)
-: package_(0), parms_(p.size())
-{
-      list<PExpr*>::const_iterator cur = p.begin();
-      for (size_t idx = 0 ; idx < parms_.size() ; idx += 1) {
-	    parms_[idx] = *cur;
-	    ++cur;
-      }
-      assert(cur == p.end());
-      path_.push_back(name_component_t(n));
 }

 PCallTask::~PCallTask()
 {
 }

-const pform_name_t& PCallTask::path() const
+const hname_t& PCallTask::path() const
 {
      return path_;
 }
@@ -221,21 +146,6 @@ PCAssign::~PCAssign()
      delete expr_;
 }

-PChainConstructor::PChainConstructor(const list<PExpr*>&parms)
-: parms_(parms.size())
-{
-      list<PExpr*>::const_iterator cur = parms.begin();
-      for (size_t idx = 0 ; idx < parms_.size() ; idx += 1) {
-	    parms_[idx] = *cur;
-	    ++cur;
-      }
-      assert(cur == parms.end());
-}
-
-PChainConstructor::~PChainConstructor()
-{
-}
-
 PCondit::PCondit(PExpr*ex, Statement*i, Statement*e)
 : expr_(ex), if_(i), else_(e)
 {
@@ -268,7 +178,7 @@ PDelayStatement::~PDelayStatement()
 {
 }

-PDisable::PDisable(const pform_name_t&sc)
+PDisable::PDisable(const hname_t&sc)
 : scope_(sc)
 {
 }
@@ -277,17 +187,6 @@ PDisable::~PDisable()
 {
 }

-PDoWhile::PDoWhile(PExpr*ex, Statement*st)
-: cond_(ex), statement_(st)
-{
-}
-
-PDoWhile::~PDoWhile()
-{
-      delete cond_;
-      delete statement_;
-}
-
 PEventStatement::PEventStatement(const svector<PEEvent*>&ee)
 : expr_(ee), statement_(0)
 {
@@ -316,15 +215,6 @@ void PEventStatement::set_statement(Statement*st)
      statement_ = st;
 }

-bool PEventStatement::has_aa_term(Design*des, NetScope*scope)
-{
-      bool flag = false;
-      for (unsigned idx = 0 ; idx < expr_.count() ; idx += 1) {
-	    flag = expr_[idx]->has_aa_term(des, scope) || flag;
-      }
-      return flag;
-}
-
 PForce::PForce(PExpr*l, PExpr*r)
 : lval_(l), expr_(r)
 {
@@ -336,20 +226,6 @@ PForce::~PForce()
      delete expr_;
 }

-PForeach::PForeach(perm_string av, const list<perm_string>&ix, Statement*s)
-: array_var_(av), index_vars_(ix.size()), statement_(s)
-{
-      size_t idx = 0;
-      for (list<perm_string>::const_iterator cur = ix.begin()
-		 ; cur != ix.end() ; ++cur)
-	    index_vars_[idx++] = *cur;
-}
-
-PForeach::~PForeach()
-{
-      delete statement_;
-}
-
 PForever::PForever(Statement*s)
 : statement_(s)
 {
@@ -361,8 +237,9 @@ PForever::~PForever()
 }

 PForStatement::PForStatement(PExpr*n1, PExpr*e1, PExpr*cond,
-			     Statement*step, Statement*st)
-: name1_(n1), expr1_(e1), cond_(cond), step_(step), statement_(st)
+			     PExpr*n2, PExpr*e2, Statement*st)
+: name1_(n1), expr1_(e1), cond_(cond), name2_(n2), expr2_(e2),
+  statement_(st)
 {
 }

@@ -396,17 +273,7 @@ PRepeat::~PRepeat()
      delete statement_;
 }

-PReturn::PReturn(PExpr*e)
-: expr_(e)
-{
-}
-
-PReturn::~PReturn()
-{
-      delete expr_;
-}
-
-PTrigger::PTrigger(const pform_name_t&e)
+PTrigger::PTrigger(const hname_t&e)
 : event_(e)
 {
 }
@@ -415,8 +282,8 @@ PTrigger::~PTrigger()
 {
 }

-PWhile::PWhile(PExpr*ex, Statement*st)
-: cond_(ex), statement_(st)
+PWhile::PWhile(PExpr*e1, Statement*st)
+: cond_(e1), statement_(st)
 {
 }

@@ -425,3 +292,34 @@ PWhile::~PWhile()
      delete cond_;
      delete statement_;
 }
+
+/*
+ * $Log: Statement.cc,v $
+ * Revision 1.29  2004/02/18 17:11:54  steve
+ *  Use perm_strings for named langiage items.
+ *
+ * Revision 1.28  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.27  2002/04/21 22:31:02  steve
+ *  Redo handling of assignment internal delays.
+ *  Leave it possible for them to be calculated
+ *  at run time.
+ *
+ * Revision 1.26  2002/04/21 04:59:07  steve
+ *  Add support for conbinational events by finding
+ *  the inputs to expressions and some statements.
+ *  Get case and assignment statements working.
+ *
+ * Revision 1.25  2001/12/03 04:47:14  steve
+ *  Parser and pform use hierarchical names as hname_t
+ *  objects instead of encoded strings.
+ *
+ * Revision 1.24  2001/11/22 06:20:59  steve
+ *  Use NetScope instead of string for scope path.
+ *
+ * Revision 1.23  2001/07/25 03:10:48  steve
+ *  Create a config.h.in file to hold all the config
+ *  junk, and support gcc 3.0. (Stephan Boettcher)
+ */
+
@@ -1,7 +1,7 @@
-#ifndef IVL_Statement_H
-#define IVL_Statement_H
+#ifndef __Statement_H
+#define __Statement_H
 /*
- * Copyright (c) 1998-2014 Stephen Williams ([email protected])
+ * Copyright (c) 1998-2000 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,49 +16,45 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: Statement.h,v 1.40.2.1 2006/07/10 00:21:49 steve Exp $"
+#endif

 # include  <string>
-# include  <vector>
-# include  <list>
-# include  "ivl_target.h"
 # include  "svector.h"
 # include  "StringHeap.h"
 # include  "PDelays.h"
 # include  "PExpr.h"
-# include  "PScope.h"
 # include  "HName.h"
 # include  "LineInfo.h"
 class PExpr;
-class PChainConstructor;
-class PPackage;
 class Statement;
 class PEventStatement;
 class Design;
 class NetAssign_;
 class NetCAssign;
 class NetDeassign;
-class NetForce;
 class NetScope;

 /*
 * The PProcess is the root of a behavioral process. Each process gets
- * one of these, which contains its type (initial, always, or final)
- * and a pointer to the single statement that is the process. A module
- * may have several concurrent processes.
+ * one of these, which contains its type (initial or always) and a
+ * pointer to the single statement that is the process. A module may
+ * have several concurrent processes.
 */
 class PProcess : public LineInfo {

    public:
-      PProcess(ivl_process_type_t t, Statement*st)
+      enum Type { PR_INITIAL, PR_ALWAYS };
+
+      PProcess(Type t, Statement*st)
      : type_(t), statement_(st) { }

      virtual ~PProcess();

-      bool elaborate(Design*des, NetScope*scope) const;
-
-      ivl_process_type_t type() const { return type_; }
+      Type type() const { return type_; }
      Statement*statement() { return statement_; }

      map<perm_string,PExpr*> attributes;
@@ -66,7 +62,7 @@ class PProcess : public LineInfo {
      virtual void dump(ostream&out, unsigned ind) const;

    private:
-      ivl_process_type_t type_;
+      Type type_;
      Statement*statement_;
 };

@@ -75,18 +71,18 @@ class PProcess : public LineInfo {
 * fact, the Statement class is abstract and represents all the
 * possible kinds of statements that exist in Verilog.
 */
-class Statement : public LineInfo {
+class Statement : public LineInfo, public Attrib {

    public:
      Statement() { }
      virtual ~Statement() =0;

+      map<perm_string,PExpr*> attributes;
+
+      void dump_attributes(ostream&out, unsigned ind) const;
      virtual void dump(ostream&out, unsigned ind) const;
      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
      virtual void elaborate_scope(Design*des, NetScope*scope) const;
-      virtual void elaborate_sig(Design*des, NetScope*scope) const;
-
-      map<perm_string,PExpr*> attributes;
 };

 /*
@@ -96,54 +92,37 @@ class Statement : public LineInfo {
 */
 class PAssign_  : public Statement {
    public:
-      explicit PAssign_(PExpr*lval, PExpr*ex, bool is_constant);
+      explicit PAssign_(PExpr*lval, PExpr*ex);
      explicit PAssign_(PExpr*lval, PExpr*de, PExpr*ex);
-      explicit PAssign_(PExpr*lval, PExpr*cnt, PEventStatement*de, PExpr*ex);
+      explicit PAssign_(PExpr*lval, PEventStatement*de, PExpr*ex);
      virtual ~PAssign_() =0;

      const PExpr* lval() const  { return lval_; }
-      PExpr* rval() const  { return rval_; }
+      const PExpr* rval() const  { return rval_; }

    protected:
      NetAssign_* elaborate_lval(Design*, NetScope*scope) const;
-      NetExpr* elaborate_rval_(Design*, NetScope*, ivl_type_t lv_net_type,
-			       ivl_variable_type_t lv_type,
-			       unsigned lv_width) const;
-      NetExpr* elaborate_rval_(Design*, NetScope*, ivl_type_t ntype) const;
-
-      NetExpr* elaborate_rval_obj_(Design*, NetScope*,
-				   ivl_variable_type_t type) const;

      PExpr* delay_;
      PEventStatement*event_;
-      PExpr* count_;

    private:
      PExpr* lval_;
      PExpr* rval_;
-      bool is_constant_;
 };

 class PAssign  : public PAssign_ {

    public:
-	// lval  - assignment l-value
-	// ex    - assignment r-value
-	// op    - compressed assignment operator (i.e. '+', '-', ...)
-	// de    - delayed assignment delay expression
      explicit PAssign(PExpr*lval, PExpr*ex);
-      explicit PAssign(PExpr*lval, char op, PExpr*ex);
      explicit PAssign(PExpr*lval, PExpr*de, PExpr*ex);
-      explicit PAssign(PExpr*lval, PExpr*cnt, PEventStatement*de, PExpr*ex);
-      explicit PAssign(PExpr*lval, PExpr*ex, bool is_constant);
+      explicit PAssign(PExpr*lval, PEventStatement*de, PExpr*ex);
      ~PAssign();

      virtual void dump(ostream&out, unsigned ind) const;
      virtual NetProc* elaborate(Design*des, NetScope*scope) const;

    private:
-      NetProc* elaborate_compressed_(Design*des, NetScope*scope) const;
-      char op_;
 };

 class PAssignNB  : public PAssign_ {
@@ -151,7 +130,6 @@ class PAssignNB  : public PAssign_ {
    public:
      explicit PAssignNB(PExpr*lval, PExpr*ex);
      explicit PAssignNB(PExpr*lval, PExpr*de, PExpr*ex);
-      explicit PAssignNB(PExpr*lval, PExpr*cnt, PEventStatement*de, PExpr*ex);
      ~PAssignNB();

      virtual void dump(ostream&out, unsigned ind) const;
@@ -169,53 +147,48 @@ class PAssignNB  : public PAssign_ {
 * statements before constructing this object, so it knows a priori
 * what is contained.
 */
-class PBlock  : public PScope, public Statement {
+class PBlock  : public Statement {

    public:
-      enum BL_TYPE { BL_SEQ, BL_PAR, BL_JOIN_NONE, BL_JOIN_ANY };
+      enum BL_TYPE { BL_SEQ, BL_PAR };

-	// If the block has a name, it is a scope and also has a parent.
-      explicit PBlock(perm_string n, LexicalScope*parent, BL_TYPE t);
-	// If it doesn't have a name, it's not a scope
+      explicit PBlock(perm_string n, BL_TYPE t, const svector<Statement*>&st);
+      explicit PBlock(BL_TYPE t, const svector<Statement*>&st);
      explicit PBlock(BL_TYPE t);
      ~PBlock();

      BL_TYPE bl_type() const { return bl_type_; }

-	// This is only used if this block is the statement list for a
-	// constructor. We look for a PChainConstructor as the first
-	// statement, and if it is there, extract it.
-      PChainConstructor*extract_chain_constructor();
-
-	// If the bl_type() is BL_PAR, it is possible to replace it
-	// with JOIN_NONE or JOIN_ANY. This is to help the parser.
-      void set_join_type(BL_TYPE);
-
-      void set_statement(const std::vector<Statement*>&st);
-
-	// Copy the statement from that block to the front of this
-	// block.
-      void push_statement_front(Statement*that);

      virtual void dump(ostream&out, unsigned ind) const;
      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
      virtual void elaborate_scope(Design*des, NetScope*scope) const;
-      virtual void elaborate_sig(Design*des, NetScope*scope) const;

    private:
-      BL_TYPE bl_type_;
-      std::vector<Statement*>list_;
+      perm_string name_;
+      const BL_TYPE bl_type_;
+      svector<Statement*>list_;
 };

 class PCallTask  : public Statement {

    public:
-      explicit PCallTask(PPackage*pkg, const pform_name_t&n, const list<PExpr*>&parms);
-      explicit PCallTask(const pform_name_t&n, const list<PExpr*>&parms);
-      explicit PCallTask(perm_string n, const list<PExpr*>&parms);
+      explicit PCallTask(const hname_t&n, const svector<PExpr*>&parms);
      ~PCallTask();

-      const pform_name_t& path() const;
+      const hname_t& path() const;
+
+      unsigned nparms() const { return parms_.count(); }
+
+      PExpr*&parm(unsigned idx)
+	    { assert(idx < parms_.count());
+	      return parms_[idx];
+	    }
+
+      PExpr* parm(unsigned idx) const
+	    { assert(idx < parms_.count());
+	      return parms_[idx];
+	    }

      virtual void dump(ostream&out, unsigned ind) const;
      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
@@ -224,28 +197,15 @@ class PCallTask  : public Statement {
      NetProc* elaborate_sys(Design*des, NetScope*scope) const;
      NetProc* elaborate_usr(Design*des, NetScope*scope) const;

-      NetProc*elaborate_method_(Design*des, NetScope*scope,
-                                bool add_this_flag = false) const;
-      NetProc*elaborate_function_(Design*des, NetScope*scope) const;
-
-      NetProc*elaborate_build_call_(Design*des, NetScope*scope,
-				    NetScope*task, NetExpr*use_this) const;
-      NetProc*elaborate_sys_task_method_(Design*des, NetScope*scope,
-					 NetNet*net,
-					 perm_string method_name,
-					 const char*sys_task_name) const;
-      bool test_task_calls_ok_(Design*des, NetScope*scope) const;
-
-      PPackage*package_;
-      pform_name_t path_;
-      vector<PExpr*> parms_;
+      hname_t path_;
+      svector<PExpr*> parms_;
 };

 class PCase  : public Statement {

    public:
      struct Item {
-	    list<PExpr*>expr;
+	    svector<PExpr*>expr;
 	    Statement*stat;
      };

@@ -254,7 +214,6 @@ class PCase  : public Statement {

      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
      virtual void elaborate_scope(Design*des, NetScope*scope) const;
-      virtual void elaborate_sig(Design*des, NetScope*scope) const;
      virtual void dump(ostream&out, unsigned ind) const;

    private:
@@ -282,26 +241,6 @@ class PCAssign  : public Statement {
      PExpr*expr_;
 };

-/*
- * This represents the syntax "super.new(...)". This is not really an
- * executable statement, but the elaborator will handle these
- * specially and will remove them from the statement stream. If any
- */
-class PChainConstructor : public Statement {
-    public:
-      PChainConstructor(const list<PExpr*>&parms);
-      ~PChainConstructor();
-
-      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
-      virtual void dump(ostream&out, unsigned ind) const;
-
-      inline const std::vector<PExpr*>& chain_args(void) const
-      { return parms_; }
-
-    private:
-      std::vector<PExpr*> parms_;
-};
-
 class PCondit  : public Statement {

    public:
@@ -310,7 +249,6 @@ class PCondit  : public Statement {

      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
      virtual void elaborate_scope(Design*des, NetScope*scope) const;
-      virtual void elaborate_sig(Design*des, NetScope*scope) const;
      virtual void dump(ostream&out, unsigned ind) const;

    private:
@@ -345,7 +283,6 @@ class PDelayStatement  : public Statement {
      virtual void dump(ostream&out, unsigned ind) const;
      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
      virtual void elaborate_scope(Design*des, NetScope*scope) const;
-      virtual void elaborate_sig(Design*des, NetScope*scope) const;

    private:
      PExpr*delay_;
@@ -359,30 +296,14 @@ class PDelayStatement  : public Statement {
 class PDisable  : public Statement {

    public:
-      explicit PDisable(const pform_name_t&sc);
+      explicit PDisable(const hname_t&sc);
      ~PDisable();

      virtual void dump(ostream&out, unsigned ind) const;
      virtual NetProc* elaborate(Design*des, NetScope*scope) const;

    private:
-      pform_name_t scope_;
-};
-
-class PDoWhile  : public Statement {
-
-    public:
-      PDoWhile(PExpr*ex, Statement*st);
-      ~PDoWhile();
-
-      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
-      virtual void elaborate_scope(Design*des, NetScope*scope) const;
-      virtual void elaborate_sig(Design*des, NetScope*scope) const;
-      virtual void dump(ostream&out, unsigned ind) const;
-
-    private:
-      PExpr*cond_;
-      Statement*statement_;
+      hname_t scope_;
 };

 /*
@@ -407,36 +328,27 @@ class PEventStatement  : public Statement {
      void set_statement(Statement*st);

      virtual void dump(ostream&out, unsigned ind) const;
-	// Call this with a NULL statement only. It is used to print
-	// the event expression for inter-assignment event controls.
-      virtual void dump_inline(ostream&out) const;
      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
      virtual void elaborate_scope(Design*des, NetScope*scope) const;
-      virtual void elaborate_sig(Design*des, NetScope*scope) const;
-
-      bool has_aa_term(Design*des, NetScope*scope);

 	// This method is used to elaborate, but attach a previously
 	// elaborated statement to the event.
      NetProc* elaborate_st(Design*des, NetScope*scope, NetProc*st) const;

      NetProc* elaborate_wait(Design*des, NetScope*scope, NetProc*st) const;
-      NetProc* elaborate_wait_fork(Design*des, NetScope*scope) const;

    private:
      svector<PEEvent*>expr_;
      Statement*statement_;
 };

-ostream& operator << (ostream&o, const PEventStatement&obj);
-
 class PForce  : public Statement {

    public:
      explicit PForce(PExpr*l, PExpr*r);
      ~PForce();

-      virtual NetForce* elaborate(Design*des, NetScope*scope) const;
+      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
      virtual void dump(ostream&out, unsigned ind) const;

    private:
@@ -444,26 +356,6 @@ class PForce  : public Statement {
      PExpr*expr_;
 };

-class PForeach : public Statement {
-    public:
-      explicit PForeach(perm_string var, const std::list<perm_string>&ix, Statement*stmt);
-      ~PForeach();
-
-      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
-      virtual void elaborate_scope(Design*des, NetScope*scope) const;
-      virtual void elaborate_sig(Design*des, NetScope*scope) const;
-      virtual void dump(ostream&out, unsigned ind) const;
-
-    private:
-      NetProc* elaborate_static_array_(Design*des, NetScope*scope,
-				       const std::vector<netrange_t>&dims) const;
-
-    private:
-      perm_string array_var_;
-      std::vector<perm_string> index_vars_;
-      Statement*statement_;
-};
-
 class PForever : public Statement {
    public:
      explicit PForever(Statement*s);
@@ -471,7 +363,6 @@ class PForever : public Statement {

      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
      virtual void elaborate_scope(Design*des, NetScope*scope) const;
-      virtual void elaborate_sig(Design*des, NetScope*scope) const;
      virtual void dump(ostream&out, unsigned ind) const;

    private:
@@ -482,12 +373,11 @@ class PForStatement  : public Statement {

    public:
      PForStatement(PExpr*n1, PExpr*e1, PExpr*cond,
-		    Statement*step, Statement*body);
+		    PExpr*n2, PExpr*e2, Statement*st);
      ~PForStatement();

      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
      virtual void elaborate_scope(Design*des, NetScope*scope) const;
-      virtual void elaborate_sig(Design*des, NetScope*scope) const;
      virtual void dump(ostream&out, unsigned ind) const;

    private:
@@ -496,7 +386,8 @@ class PForStatement  : public Statement {

      PExpr*cond_;

-      Statement*step_;
+      PExpr* name2_;
+      PExpr* expr2_;

      Statement*statement_;
 };
@@ -505,7 +396,6 @@ class PNoop  : public Statement {

    public:
      PNoop() { }
-      ~PNoop() { }
 };

 class PRepeat : public Statement {
@@ -515,7 +405,6 @@ class PRepeat : public Statement {

      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
      virtual void elaborate_scope(Design*des, NetScope*scope) const;
-      virtual void elaborate_sig(Design*des, NetScope*scope) const;
      virtual void dump(ostream&out, unsigned ind) const;

    private:
@@ -536,19 +425,6 @@ class PRelease  : public Statement {
      PExpr*lval_;
 };

-class PReturn  : public Statement {
-
-    public:
-      explicit PReturn(PExpr*e);
-      ~PReturn();
-
-      NetProc* elaborate(Design*des, NetScope*scope) const;
-      virtual void dump(std::ostream&out, unsigned ind) const;
-
-    private:
-      PExpr*expr_;
-};
-
 /*
 * The PTrigger statement sends a trigger to a named event. Take the
 * name here.
@@ -556,25 +432,24 @@ class PReturn  : public Statement {
 class PTrigger  : public Statement {

    public:
-      explicit PTrigger(const pform_name_t&ev);
+      explicit PTrigger(const hname_t&ev);
      ~PTrigger();

      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
      virtual void dump(ostream&out, unsigned ind) const;

    private:
-      pform_name_t event_;
+      hname_t event_;
 };

 class PWhile  : public Statement {

    public:
-      PWhile(PExpr*ex, Statement*st);
+      PWhile(PExpr*e1, Statement*st);
      ~PWhile();

      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
      virtual void elaborate_scope(Design*des, NetScope*scope) const;
-      virtual void elaborate_sig(Design*des, NetScope*scope) const;
      virtual void dump(ostream&out, unsigned ind) const;

    private:
@@ -582,4 +457,81 @@ class PWhile  : public Statement {
      Statement*statement_;
 };

-#endif /* IVL_Statement_H */
+/*
+ * $Log: Statement.h,v $
+ * Revision 1.40.2.1  2006/07/10 00:21:49  steve
+ *  Add support for full_case attribute.
+ *
+ * Revision 1.40  2004/02/20 18:53:33  steve
+ *  Addtrbute keys are perm_strings.
+ *
+ * Revision 1.39  2004/02/18 17:11:54  steve
+ *  Use perm_strings for named langiage items.
+ *
+ * Revision 1.38  2003/05/19 02:50:58  steve
+ *  Implement the wait statement behaviorally instead of as nets.
+ *
+ * Revision 1.37  2003/01/30 16:23:07  steve
+ *  Spelling fixes.
+ *
+ * Revision 1.36  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.35  2002/06/04 05:38:44  steve
+ *  Add support for memory words in l-value of
+ *  blocking assignments, and remove the special
+ *  NetAssignMem class.
+ *
+ * Revision 1.34  2002/05/26 01:39:02  steve
+ *  Carry Verilog 2001 attributes with processes,
+ *  all the way through to the ivl_target API.
+ *
+ *  Divide signal reference counts between rval
+ *  and lval references.
+ *
+ * Revision 1.33  2002/04/21 22:31:02  steve
+ *  Redo handling of assignment internal delays.
+ *  Leave it possible for them to be calculated
+ *  at run time.
+ *
+ * Revision 1.32  2002/04/21 04:59:07  steve
+ *  Add support for conbinational events by finding
+ *  the inputs to expressions and some statements.
+ *  Get case and assignment statements working.
+ *
+ * Revision 1.31  2001/12/03 04:47:14  steve
+ *  Parser and pform use hierarchical names as hname_t
+ *  objects instead of encoded strings.
+ *
+ * Revision 1.30  2001/11/22 06:20:59  steve
+ *  Use NetScope instead of string for scope path.
+ *
+ * Revision 1.29  2000/09/09 15:21:26  steve
+ *  move lval elaboration to PExpr virtual methods.
+ *
+ * Revision 1.28  2000/09/03 17:58:35  steve
+ *  Change elaborate_lval to return NetAssign_ objects.
+ *
+ * Revision 1.27  2000/07/26 05:08:07  steve
+ *  Parse disable statements to pform.
+ *
+ * Revision 1.26  2000/05/11 23:37:26  steve
+ *  Add support for procedural continuous assignment.
+ *
+ * Revision 1.25  2000/04/22 04:20:19  steve
+ *  Add support for force assignment.
+ *
+ * Revision 1.24  2000/04/12 04:23:57  steve
+ *  Named events really should be expressed with PEIdent
+ *  objects in the pform,
+ *
+ *  Handle named events within the mix of net events
+ *  and edges. As a unified lot they get caught together.
+ *  wait statements are broken into more complex statements
+ *  that include a conditional.
+ *
+ *  Do not generate NetPEvent or NetNEvent objects in
+ *  elaboration. NetEvent, NetEvWait and NetEvProbe
+ *  take over those functions in the netlist.
+ */
+#endif
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2010 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2002-2004 Stephen Williams (steve@icarus.com)
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -14,20 +14,19 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: StringHeap.cc,v 1.6.2.1 2005/08/13 00:45:53 steve Exp $"
+#endif

 # include  "StringHeap.h"
-# include  <iostream>
-# include  <cstdlib>
-# include  <cstring>
-# include  <cassert>
-
-#ifdef CHECK_WITH_VALGRIND
-# include  "ivl_alloc.h"
-static char **string_pool = NULL;
-static unsigned string_pool_count = 0;
+#ifdef HAVE_MALLOC_H
+# include  <malloc.h>
 #endif
+# include  <stdlib.h>
+# include  <string.h>
+# include  <assert.h>

 StringHeap::StringHeap()
 {
@@ -50,12 +49,6 @@ const char* StringHeap::add(const char*text)
      unsigned rem = HEAPCELL - cell_ptr_;
      if (rem < (len+1)) {
 	    cell_base_ = (char*)malloc(HEAPCELL);
-#ifdef CHECK_WITH_VALGRIND
-	    string_pool_count += 1;
-	    string_pool = (char **) realloc(string_pool,
-	                                    string_pool_count*sizeof(char **));
-	    string_pool[string_pool_count-1] = cell_base_;
-#endif
 	    cell_ptr_ = 0;
 	    cell_count_ += 1;
 	    assert(cell_base_ != 0);
@@ -90,22 +83,6 @@ StringHeapLex::~StringHeapLex()
 {
 }

-void StringHeapLex::cleanup()
-{
-#ifdef CHECK_WITH_VALGRIND
-      for (unsigned idx = 0 ;  idx < string_pool_count ;  idx += 1) {
-	    free(string_pool[idx]);
-      }
-      free(string_pool);
-      string_pool = NULL;
-      string_pool_count = 0;
-
-      for (unsigned idx = 0 ;  idx < HASH_SIZE ;  idx += 1) {
-	    hash_table_[idx] = 0;
-      }
-#endif
-}
-
 unsigned StringHeapLex::add_hit_count() const
 {
      return hit_count_;
@@ -154,7 +131,7 @@ perm_string StringHeapLex::make(const char*text)
      return perm_string(add(text));
 }

-perm_string StringHeapLex::make(const string&text)
+perm_string StringHeapLex::make(const std::string&text)
 {
      return perm_string(add(text.c_str()));
 }
@@ -202,13 +179,31 @@ bool operator < (perm_string a, perm_string b)
      return false;
 }

-ostream& operator << (ostream&out, perm_string that)
-{
-      if (that.nil())
-	    out << "<nil>";
-      else
-	    out << that.str();
-      return out;
-}
+/*
+ * $Log: StringHeap.cc,v $
+ * Revision 1.6.2.1  2005/08/13 00:45:53  steve
+ *  Fix compilation warnings/errors with newer compilers.
+ *
+ * Revision 1.6  2004/02/18 17:11:54  steve
+ *  Use perm_strings for named langiage items.
+ *
+ * Revision 1.5  2003/03/01 06:25:30  steve
+ *  Add the lex_strings string handler, and put
+ *  scope names and system task/function names
+ *  into this table. Also, permallocate event
+ *  names from the beginning.
+ *
+ * Revision 1.4  2003/01/27 05:09:17  steve
+ *  Spelling fixes.
+ *
+ * Revision 1.3  2003/01/16 21:44:46  steve
+ *  Keep some debugging status.
+ *
+ * Revision 1.2  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.1  2002/08/04 19:13:16  steve
+ *  dll uses StringHeap for named items.
+ *
+ */

-const perm_string empty_perm_string = perm_string::literal("");
@@ -1,7 +1,7 @@
-#ifndef IVL_StringHeap_H
-#define IVL_StringHeap_H
+#ifndef __StringHeap_H
+#define __StringHeap_H
 /*
- * Copyright (c) 2002-2014 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2002-2004 Stephen Williams (steve@icarus.com)
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,9 +16,13 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: StringHeap.h,v 1.5.2.2 2005/08/13 00:45:53 steve Exp $"
+#endif

+# include  "config.h"
 # include  <string>

 using namespace std;
@@ -30,8 +34,6 @@ class perm_string {
      perm_string(const perm_string&that) : text_(that.text_) { }
      ~perm_string() { }

-      inline bool nil() const { return text_ == 0; }
-
      perm_string& operator = (const perm_string&that)
      { text_ = that.text_; return *this; }

@@ -39,7 +41,7 @@ class perm_string {
      operator const char* () const { return str(); }

 	// This is an escape for making perm_string objects out of
-	// literals. For example, perm_string::literal("Label"); Please
+	// literals. For example, per_string::literal("Label"); Please
 	// do *not* cheat and pass arbitrary const char* items here.
      static perm_string literal(const char*t) { return perm_string(t); }

@@ -52,7 +54,6 @@ class perm_string {
      const char*text_;
 };

-extern const perm_string empty_perm_string;
 extern bool operator == (perm_string a, perm_string b);
 extern bool operator == (perm_string a, const char* b);
 extern bool operator != (perm_string a, perm_string b);
@@ -61,7 +62,6 @@ extern bool operator >  (perm_string a, perm_string b);
 extern bool operator <  (perm_string a, perm_string b);
 extern bool operator >= (perm_string a, perm_string b);
 extern bool operator <= (perm_string a, perm_string b);
-extern ostream& operator << (ostream&out, perm_string that);

 /*
 * The string heap is a way to permanently allocate strings
@@ -103,11 +103,10 @@ class StringHeapLex  : private StringHeap {

      const char*add(const char*);
      perm_string make(const char*);
-      perm_string make(const string&);
+      perm_string make(const std::string&);

      unsigned add_count() const;
      unsigned add_hit_count() const;
-      void cleanup();

    private:
      enum { HASH_SIZE = 4096 };
@@ -121,4 +120,31 @@ class StringHeapLex  : private StringHeap {
      StringHeapLex& operator= (const StringHeapLex&);
 };

-#endif /* IVL_StringHeap_H */
+/*
+ * $Log: StringHeap.h,v $
+ * Revision 1.5.2.2  2005/08/13 00:45:53  steve
+ *  Fix compilation warnings/errors with newer compilers.
+ *
+ * Revision 1.5.2.1  2005/06/14 15:33:54  steve
+ *  Fix gcc4 build issues.
+ *
+ * Revision 1.5  2004/02/18 17:11:54  steve
+ *  Use perm_strings for named langiage items.
+ *
+ * Revision 1.4  2003/03/01 06:25:30  steve
+ *  Add the lex_strings string handler, and put
+ *  scope names and system task/function names
+ *  into this table. Also, permallocate event
+ *  names from the beginning.
+ *
+ * Revision 1.3  2003/01/16 21:44:46  steve
+ *  Keep some debugging status.
+ *
+ * Revision 1.2  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.1  2002/08/04 19:13:16  steve
+ *  dll uses StringHeap for named items.
+ *
+ */
+#endif
@@ -1,7 +1,7 @@
-#ifndef PLI_TYPES_H
-#define PLI_TYPES_H
+#ifndef PLI_TYPES
+#define PLI_TYPES
 /*
- * Copyright (c) 2003-2014 Stephen Williams ([email protected])
+ * Copyright (c) 2003 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,8 +16,11 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: _pli_types.h.in,v 1.7 2003/11/12 02:38:44 steve Exp $"
+#endif

 # undef HAVE_INTTYPES_H

@@ -39,7 +42,7 @@ typedef int32_t  PLI_INT32;

 typedef signed short   PLI_INT16;
 typedef unsigned short PLI_UINT16;
-typedef char           PLI_BYTE8;
+typedef signed char    PLI_BYTE8;
 typedef unsigned char  PLI_UBYTE8;

 # define PLI_UINT64_FMT PRIu64
@@ -81,8 +84,43 @@ typedef signed int     PLI_INT32;
 typedef unsigned int   PLI_UINT32;
 typedef signed short   PLI_INT16;
 typedef unsigned short PLI_UINT16;
-typedef char           PLI_BYTE8;
+typedef signed char    PLI_BYTE8;
 typedef unsigned char  PLI_UBYTE8;
 #endif

-#endif /* PLI_TYPES_H */
+/*
+ * $Log: _pli_types.h.in,v $
+ * Revision 1.7  2003/11/12 02:38:44  steve
+ *  Clean up manual definitions of PLI_UINT64_FMT.
+ *
+ * Revision 1.6  2003/11/08 20:06:21  steve
+ *  Spelling fixes in comments.
+ *
+ * Revision 1.5  2003/10/29 03:28:27  steve
+ *  Add the PLU_UINT64_FMT string for formatting output.
+ *
+ * Revision 1.4  2003/10/29 03:23:12  steve
+ *  Portably handle time format of VCD prints.
+ *
+ * Revision 1.3  2003/10/02 21:30:06  steve
+ *  Use configured TIME_FMT in vcd dump printf.
+ *
+ * Revision 1.2  2003/10/02 19:33:44  steve
+ *  Put libraries in libdir64.
+ *
+ * Revision 1.1  2003/09/30 01:33:13  steve
+ *  Add PLI_UINT64 to _pli_types.h.
+ *
+ * Revision 1.2  2003/05/26 04:39:16  steve
+ *  Typo type name.
+ *
+ * Revision 1.1  2003/02/17 06:39:47  steve
+ *  Add at least minimal implementations for several
+ *  acc_ functions. Add support for standard ACC
+ *  string handling.
+ *
+ *  Add the _pli_types.h header file to carry the
+ *  IEEE1364-2001 standard PLI type declarations.
+ *
+ */
+#endif
@@ -1,7 +1,7 @@
-#ifndef ACC_USER_H
-#define ACC_USER_H
+#ifndef __acc_user_H
+#define __acc_user_H
 /*
- * Copyright (c) 2002-2014 Stephen Williams ([email protected])
+ * Copyright (c) 2002 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,8 +16,11 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: acc_user.h,v 1.20 2003/12/17 15:45:07 steve Exp $"
+#endif

 /*
 * This header file contains the definitions and declarations needed
@@ -228,9 +231,8 @@ extern PLI_INT32 acc_fetch_size(handle obj);

 extern PLI_INT32 acc_fetch_type(handle obj);
 extern PLI_INT32 acc_fetch_fulltype(handle obj);
-extern PLI_INT32 acc_fetch_paramtype(handle obj);
 extern PLI_INT32 acc_fetch_range(handle object, int *msb, int *lsb);
-extern const char* acc_fetch_type_str(PLI_INT32 type);
+extern char*     acc_fetch_type_str(PLI_INT32 type);

 extern char* acc_fetch_value(handle obj, const char*fmt, s_acc_value*value);

@@ -271,4 +273,82 @@ extern char* acc_version(void);

 EXTERN_C_END

-#endif /* ACC_USER_H */
+/*
+ * $Log: acc_user.h,v $
+ * Revision 1.20  2003/12/17 15:45:07  steve
+ *  Add acc_set_scope function.
+ *
+ * Revision 1.19  2003/10/10 02:57:45  steve
+ *  Some PLI1 stubs.
+ *
+ * Revision 1.18  2003/06/13 19:23:41  steve
+ *  Add a bunch more PLI1 routines.
+ *
+ * Revision 1.17  2003/06/04 01:56:20  steve
+ * 1) Adds configure logic to clean up compiler warnings
+ * 2) adds acc_compare_handle, acc_fetch_range, acc_next_scope and
+ *    tf_isetrealdelay, acc_handle_scope
+ * 3) makes acc_next reentrant
+ * 4) adds basic vpiWire type support
+ * 5) fills in some acc_object_of_type() and acc_fetch_{full}type()
+ * 6) add vpiLeftRange/RigthRange to signals
+ *
+ * Revision 1.16  2003/05/30 04:18:31  steve
+ *  Add acc_next function.
+ *
+ * Revision 1.15  2003/05/29 02:35:41  steve
+ *  acc_fetch_type supports module.
+ *
+ * Revision 1.14  2003/05/29 02:21:45  steve
+ *  Implement acc_fetch_defname and its infrastructure in vvp.
+ *
+ * Revision 1.13  2003/05/24 03:02:04  steve
+ *  Add implementation of acc_handle_by_name.
+ *
+ * Revision 1.12  2003/05/18 00:16:35  steve
+ *  Add PLI_TRACE tracing of PLI1 modules.
+ *
+ *  Add tf_isetdelay and friends, and add
+ *  callback return values for acc_vcl support.
+ *
+ * Revision 1.11  2003/04/24 18:57:05  steve
+ *  Add acc_fetch_fulltype function.
+ *
+ * Revision 1.10  2003/04/20 02:48:39  steve
+ *  Support value change callbacks.
+ *
+ * Revision 1.9  2003/04/12 18:57:13  steve
+ *  More acc_ function stubs.
+ *
+ * Revision 1.8  2003/03/13 04:35:09  steve
+ *  Add a bunch of new acc_ and tf_ functions.
+ *
+ * Revision 1.7  2003/02/17 06:39:47  steve
+ *  Add at least minimal implementations for several
+ *  acc_ functions. Add support for standard ACC
+ *  string handling.
+ *
+ *  Add the _pli_types.h header file to carry the
+ *  IEEE1364-2001 standard PLI type declarations.
+ *
+ * Revision 1.6  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.5  2002/06/11 15:19:12  steve
+ *  Add acc_fetch_argc/argv/version (mruff)
+ *
+ * Revision 1.4  2002/06/07 02:58:58  steve
+ *  Add a bunch of acc/tf functions. (mruff)
+ *
+ * Revision 1.3  2002/06/02 19:03:29  steve
+ *  Add acc_handle_tfarg and acc_next_topmode
+ *
+ * Revision 1.2  2002/05/30 02:06:05  steve
+ *  Implement acc_product_version.
+ *
+ * Revision 1.1  2002/05/23 03:46:42  steve
+ *  Add the acc_user.h header file.
+ *
+ */
+
+#endif
@@ -1,23 +1,29 @@
-
-# AX_ENABLE_SUFFIX
-# ----------------
-#  Create the configure option --enable-suffix[=suffix] to generate suffix
-# strings for the installed commands. This allows for shared installs of
-# different builds. Remember to change the default suffix string to some
-# value appropriate for the current version.
-AC_DEFUN([AX_ENABLE_SUFFIX],
-[AC_ARG_ENABLE([suffix],[AC_HELP_STRING([--enable-suffix],
-                                        [Use/set the installation command suffix])],
-               [true],[enable_suffix=no])
-if test X$enable_suffix = Xyes; then
-  install_suffix='-0.10'
-elif test X$enable_suffix = Xno; then
-  install_suffix=''
-else
-  install_suffix="$enable_suffix"
+# AX_CPP_IDENT
+# ------------
+# Check if the C compiler supports #ident
+# Define and substitute ident_support if so.
+#
+# It would be simpler and more consistent with the rest of the autoconf
+# structure to AC_DEFINE(HAVE_CPP_IDENT) instead of
+# ident_support='-DHAVE_CVS_IDENT=1' and AC_SUBST(ident_support), but that
+# change would require all C files in the icarus top level directory to
+# put #include <config.h> before the #ifdef HAVE_CVS_IDENT (and change
+# HAVE_CVS_IDENT to HAVE_CPP_IDENT).   That would also remove all special
+# ident_support handling from the Makefile.  Manyana.
+#
+AC_DEFUN([AX_CPP_IDENT],
+[AC_CACHE_CHECK([for ident support in C compiler], ax_cv_cpp_ident,
+[AC_TRY_COMPILE([
+#ident "$Id: aclocal.m4,v 1.6.2.1 2005/08/27 22:19:37 steve Exp $"
+],[while (0) {}],
+[AS_VAR_SET(ax_cv_cpp_ident, yes)],
+[AS_VAR_SET(ax_cv_cpp_ident, no)])])
+if test $ax_cv_cpp_ident = yes; then
+  ident_support='-DHAVE_CVS_IDENT=1'
 fi
-AC_SUBST(install_suffix)
-])# AX_ENABLE_SUFFIX
+AC_SUBST(ident_support)
+])# AC_CPP_IDENT
+

 # _AX_C_UNDERSCORES_MATCH_IFELSE(PATTERN, ACTION-IF-MATCH, ACTION-IF-NOMATCH)
 # ------------------------------
@@ -26,7 +32,7 @@ AC_SUBST(install_suffix)
 #   - the object file produced by AC_COMPILE_IFELSE is called "conftest.$ac_objext"
 #   - the nm(1) utility is available, and its name is "nm".
 AC_DEFUN([_AX_C_UNDERSCORES_MATCH_IF],
-[AC_COMPILE_IFELSE([AC_LANG_SOURCE([void underscore(void){}])],
+[AC_COMPILE_IFELSE([void underscore(void){}],
 [AS_IF([nm conftest.$ac_objext|grep $1 >/dev/null 2>/dev/null],[$2],[$3])],
 [AC_MSG_ERROR([underscore test crashed])]
 )])
@@ -42,7 +48,7 @@ AC_DEFUN([AX_C_UNDERSCORES_LEADING],
 [AS_VAR_SET(ax_cv_c_underscores_leading, yes)],
 [AS_VAR_SET(ax_cv_c_underscores_leading, no)])])
 if test $ax_cv_c_underscores_leading = yes -a "$CYGWIN" != "yes" -a "$MINGW32" != "yes"; then
- AC_DEFINE([NEED_LU], [1], [Symbol names in object files produced by C compiler have leading underscores.])
+ AC_DEFINE(NEED_LU)
 fi
 ])# AX_C_UNDERSCORES_LEADING

@@ -57,31 +63,26 @@ AC_DEFUN([AX_C_UNDERSCORES_TRAILING],
 [AS_VAR_SET(ax_cv_c_underscores_trailing, yes)],
 [AS_VAR_SET(ax_cv_c_underscores_trailing, no)])])
 if test $ax_cv_c_underscores_trailing = yes; then
- AC_DEFINE([NEED_TU], [1], [Symbol names in object files produced by C compiler have trailing underscores.])
+ AC_DEFINE(NEED_TU)
 fi
 ])# AX_C_UNDERSCORES_TRAILING

 # AX_WIN32
 # --------
 # Combined check for several flavors of Microsoft Windows so
- # their "issues" can be dealt with
+# their "issues" can be dealt with
 AC_DEFUN([AX_WIN32],
-[AC_MSG_CHECKING([for Microsoft Windows])
-AC_REQUIRE([AC_CANONICAL_HOST]) []dnl
-case $host_os in
-     *cygwin*) MINGW32=no;  WIN32=yes;;
-
-      *mingw*) MINGW32=yes; WIN32=yes;;
-
-            *) MINGW32=no;  WIN32=no;;
-esac
+[AC_CYGWIN
+AC_MINGW32
+WIN32=no
+AC_MSG_CHECKING([for Microsoft Windows])
+if test "$CYGWIN" = "yes" -o "$MINGW32" = "yes"
+then
+    WIN32=yes
+fi
 AC_SUBST(MINGW32)
 AC_SUBST(WIN32)
 AC_MSG_RESULT($WIN32)
-if test $WIN32 = yes; then
-AC_MSG_CHECKING([for MinGW])
-AC_MSG_RESULT($MINGW32)
-fi
 ])# AX_WIN32

 # AX_LD_EXTRALIBS
@@ -90,13 +91,9 @@ fi
 AC_DEFUN([AX_LD_EXTRALIBS],
 [AC_MSG_CHECKING([for extra libs needed])
 EXTRALIBS=
-case "${host}" in
-     *-*-cygwin* )
-        if test "$MINGW32" = "yes"; then
-            EXTRALIBS="-liberty"
-        fi
-        ;;
-esac
+if test "$MINGW32" = "yes"; then
+   EXTRALIBS="-liberty"
+fi
 AC_SUBST(EXTRALIBS)
 AC_MSG_RESULT($EXTRALIBS)
 ])# AX_LD_EXTRALIBS
@@ -108,11 +105,7 @@ AC_DEFUN([AX_LD_SHAREDLIB_OPTS],
 [AC_MSG_CHECKING([for shared library link flag])
 shared=-shared
 case "${host}" in
-     *-*-cygwin*)
-        shared="-shared -Wl,--enable-auto-image-base"
-        ;;
-
-     *-*-mingw*)
+     *-*-cygwin* | *-*-mingw32*)
        shared="-shared -Wl,--enable-auto-image-base"
        ;;

@@ -127,13 +120,6 @@ case "${host}" in
     *-*-darwin*)
        shared="-bundle -undefined suppress -flat_namespace"
        ;;
-
-     *-*-solaris*)
-        if test ${using_sunpro_c} = 1
-        then
-           shared="-G"
-        fi
-        ;;
 esac
 AC_SUBST(shared)
 AC_MSG_RESULT($shared)
@@ -148,11 +134,7 @@ AC_DEFUN([AX_C_PICFLAG],
 PICFLAG=-fPIC
 case "${host}" in

-     *-*-cygwin*)
-        PICFLAG=
-        ;;
-
-     *-*-mingw*)
+     *-*-cygwin* | *-*-mingw32*)
        PICFLAG=
        ;;

@@ -160,12 +142,6 @@ case "${host}" in
        PICFLAG=+z
        ;;

-     *-*-solaris*)
-        if test ${using_sunpro_c} = 1
-        then
-           PICFLAG=-G
-        fi
-        ;;
 esac
 AC_SUBST(PICFLAG)
 AC_MSG_RESULT($PICFLAG)
@@ -193,11 +169,7 @@ case "${host}" in
        rdynamic=""
        ;;

-    *-*-cygwin*)
-        rdynamic=""
-        ;;
-
-    *-*-mingw*)
+    *-*-cygwin* | *-*-mingw32*)
        rdynamic=""
        ;;

@@ -218,28 +190,14 @@ AC_SUBST(strip_dynamic)
 # AC_MSG_RESULT($strip_dynamic)
 ])# AX_LD_RDYNAMIC

-
-# AX_C99_STRTOD
-# -------------
-AC_DEFUN([AX_C99_STRTOD],
-[# On MinGW we need to jump through hoops to get a C99 compliant strtod().
+# AX_CPP_PRECOMP
+# --------------
+AC_DEFUN([AX_CPP_PRECOMP],
+[# Darwin requires -no-cpp-precomp
 case "${host}" in
-    *-*-mingw*)
-        LDFLAGS+=" -Wl,--undefined=___strtod,--wrap,strtod,--defsym,___wrap_strtod=___strtod"
+    *-*-darwin*)
+        CPPFLAGS="-no-cpp-precomp $CPPFLAGS"
+        CFLAGS="-no-cpp-precomp $CFLAGS"
        ;;
 esac
-])# AX_C99_STRTOD
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp file name are based on the header name.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[
-_config_header=$1
-_stamp_name=stamp-`expr //$_config_header : '.*/\([[^./]]*\)\.[[^./]]*$'`-h
-echo "timestamp for $_config_header" > `AS_DIRNAME(["$_config_header"])`/[]$_stamp_name
-]) #_AC_AM_CONFIG_HEADER_HOOK
+])# AX_CPP_PRECOMP
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2010 Stephen Williams ([email protected])
+ * Copyright (c) 2002 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -14,14 +14,17 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: async.cc,v 1.7.2.1 2006/05/21 21:58:46 steve Exp $"
+#endif

 # include "config.h"

 # include  "functor.h"
 # include  "netlist.h"
-# include  <cassert>
+# include  <assert.h>

 bool NetAssign::is_asynchronous()
 {
@@ -50,8 +53,8 @@ bool NetEvWait::is_asynchronous()
 	   level sensitive, but the nex_async_ method takes care of
 	   that test. */
      NexusSet*sense = new NexusSet;
-      for (unsigned idx = 0 ;  idx < events_.size() ;  idx += 1) {
-	    NexusSet*tmp = events_[idx]->nex_async_();
+      for (unsigned idx = 0 ;  idx < nevents_ ;  idx += 1) {
+	    NexusSet*tmp = event(idx)->nex_async_();
 	    if (tmp == 0) {
 		  delete sense;
 		  return false;
@@ -63,6 +66,10 @@ bool NetEvWait::is_asynchronous()

      NexusSet*inputs = statement_->nex_input();

+	/* All the inputs of the statement must be accounted for in
+	   the sensitivity list. Otherwise, there are inputs that can
+	   change without the event being triggered, and that implies
+	   a latch, not a combinational circuit. */
      if (! sense->contains(*inputs)) {
 	    delete sense;
 	    delete inputs;
@@ -82,10 +89,39 @@ bool NetProc::is_asynchronous()
      return false;
 }

-bool NetProcTop::is_asynchronous() const
+bool NetProcTop::is_asynchronous()
 {
-      if (type_ == IVL_PR_INITIAL)
+      if (type_ == NetProcTop::KINITIAL)
 	    return false;

      return statement_->is_asynchronous();
 }
+
+/*
+ * $Log: async.cc,v $
+ * Revision 1.7.2.1  2006/05/21 21:58:46  steve
+ *  NetESignal input is only selected bits.
+ *
+ * Revision 1.7  2004/01/18 23:26:54  steve
+ *  The is_combinational function really need not recurse.
+ *
+ * Revision 1.6  2003/12/20 00:33:39  steve
+ *  More thorough check that NetEvWait is asynchronous.
+ *
+ * Revision 1.5  2003/09/04 20:28:05  steve
+ *  Support time0 resolution of combinational threads.
+ *
+ * Revision 1.4  2002/08/18 22:07:16  steve
+ *  Detect temporaries in sequential block synthesis.
+ *
+ * Revision 1.3  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.2  2002/07/04 00:24:16  steve
+ *  initial statements are not asynchronous.
+ *
+ * Revision 1.1  2002/06/30 02:21:31  steve
+ *  Add structure for asynchronous logic synthesis.
+ *
+ */
+
@@ -70,6 +70,14 @@ warning.)

 * Other Attributes

+(* ivl_full_case *)
+
+    This attribute only has meaning when attached to case statements,
+    and only when doing synthesis. The statement means to ignore the
+    possibility that some cases are not defined. Presume that the
+    device really is fully specified and do not emit any warnings
+    about missing guards.
+
 [ none defined yet ]


@@ -2,15 +2,18 @@

 #
 # This shell script exists to run autoconf on source distributions
-# that are pulled from git The configure script is not included
-# in git, so it is easiest to just run this script whenever needed
-# to generate the configure script.
+# that are pulled from CVS. The configure scripts are not included
+# in CVS, and there are several configure.in files, so it is easiest
+# to just run this script to autoconf wherever needed.
 #
 echo "Autoconf in root..."
-autoconf -f
+autoconf
+
+for dir in vpip vpi vvp tgt-vvp tgt-edif tgt-fpga libveriuser cadpli
+do
+    echo "Autoconf in $dir..."
+    ( cd ./$dir ; autoconf -f --include=.. )
+done

 echo "Precompiling lexor_keyword.gperf"
-gperf -o -i 7 -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc
-
-echo "Precompiling vhdlpp/lexor_keyword.gperf"
-(cd vhdlpp ; gperf -o -i 7 --ignore-case -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc )
+gperf -o -i 7 -C -k 1-3,\$ -L ANSI-C -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc
@@ -0,0 +1,7 @@
+Makefile
+cadpli.vpl
+dep
+configure
+config.log
+config.status
+autom4te.cache
@@ -12,12 +12,16 @@
 #
 #    You should have received a copy of the GNU Library General Public
 #    License along with this program; if not, write to the Free
-#    Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#    Boston, MA 02110-1301, USA.
+#    Software Foundation, Inc.,
+#    59 Temple Place - Suite 330
+#    Boston, MA 02111-1307, USA
+#
+#ident "$Id: Makefile.in,v 1.11.2.1 2005/02/23 18:40:23 steve Exp $"
+#
 #
 SHELL = /bin/sh

-suffix = @install_suffix@
+VERSION = 0.0

 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -29,67 +33,74 @@ bindir = @bindir@
 libdir = @libdir@
 includedir = $(prefix)/include

-vpidir = @libdir@/ivl$(suffix)
+vpidir = @libdir@/ivl/@vpidir1@
+
+strip_dynamic=@strip_dynamic@

 CC = @CC@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@

-ifeq (@srcdir@,.)
-INCLUDE_PATH = -I. -I..
-else
-INCLUDE_PATH = -I. -I.. -I$(srcdir) -I$(srcdir)/..
-endif
-
-CPPFLAGS = $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@ @PICFLAG@
-CFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ @CFLAGS@
+CPPFLAGS = @ident_support@ -I$(srcdir) -I$(srcdir)/.. -I.. @CPPFLAGS@ @DEFS@ @PICFLAG@
+CFLAGS = -Wall @CFLAGS@
 LDFLAGS = @LDFLAGS@
+STRIP = @STRIP@

-O = cadpli.o
+SHARED = @shared@
+
+all:
+
+ifeq (@enable_vvp32@,yes)
+vpidir32 = $(libdir)/ivl/@vpidir2@
+ALL32 = all32
+INSTALL32 = install32
+UNINSTALL32 = uninistall32
+include $(srcdir)/enable_vvp32.mk
+endif

 all: dep cadpli.vpl $(ALL32)

+# No specific check operations.
 check: all

-clean:
-	rm -rf *.o dep cadpli.vpl
-
-distclean: clean
-	rm -f Makefile config.log
-
-cppcheck: $(O:.o=.c)
-	cppcheck --enable=all -f $(INCLUDE_PATH) $^
-
-Makefile: $(srcdir)/Makefile.in ../config.status
-	cd ..; ./config.status --file=cadpli/$@
-
 dep:
 	mkdir dep

 %.o: %.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $<
+	$(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $<
 	mv $*.d dep

+O = cadpli.o
+
 SYSTEM_VPI_LDFLAGS = -L../vvp -lvpi
-ifeq (@MINGW32@,yes)
+ifeq (@WIN32@,yes)
    SYSTEM_VPI_LDFLAGS += @EXTRALIBS@
 endif

 cadpli.vpl: $O ../vvp/libvpi.a ../libveriuser/libveriuser.o
-	$(CC) @shared@ $(LDFLAGS) -o $@ $O ../libveriuser/libveriuser.o $(SYSTEM_VPI_LDFLAGS)
+	$(CC) @shared@ -o $@ $O ../libveriuser/libveriuser.o $(SYSTEM_VPI_LDFLAGS)

-install: all installdirs $(vpidir)/cadpli.vpl
+clean:
+	rm -rf *.o dep cadpli.vpl bin32
+
+distclean: clean
+	rm -f Makefile config.status config.log config.cache
+	rm -rf autom4te.cache
+
+install: all installdirs $(vpidir)/cadpli.vpl $(INSTALL32)

 $(vpidir)/cadpli.vpl: ./cadpli.vpl
-	$(INSTALL_PROGRAM) ./cadpli.vpl "$(DESTDIR)$(vpidir)/cadpli.vpl"
+	$(INSTALL_PROGRAM) ./cadpli.vpl $(vpidir)/cadpli.vpl

-installdirs: $(srcdir)/../mkinstalldirs
-	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(vpidir)"
+installdirs: ../mkinstalldirs
+	$(srcdir)/../mkinstalldirs $(vpidir)

 uninstall: $(UNINSTALL32)
-	rm -f "$(DESTDIR)$(vpidir)/cadpli.vpl"
+	rm -f $(vpidir)/cadpli.vpl

-uninstall32:
+ifeq (@enable_vvp32@,yes)
+include $(srcdir)/enable_vvp32.mk
+endif

 -include $(patsubst %.o, dep/%.d, $O)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2010 Stephen Williams ([email protected])
+ * Copyright (c) 2003 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -14,17 +14,21 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: cadpli.c,v 1.7 2004/09/10 00:15:45 steve Exp $"
+#endif

 # include  <vpi_user.h>
 # include  <veriuser.h>
 # include  <stdlib.h>
+#ifdef HAVE_MALLOC_H
+# include  <malloc.h>
+#endif
 # include  <string.h>
 # include  <assert.h>
-# include  "config.h"
 # include  "ivl_dlfcn.h"
-# include  "ivl_alloc.h"

 typedef void* (*funcvp)(void);

@@ -79,7 +83,38 @@ static void thunker_register(void)
      }
 }

-void (*vlog_startup_routines[])(void) = {
+void (*vlog_startup_routines[])() = {
      thunker_register,
      0
 };
+
+
+/*
+ * $Log: cadpli.c,v $
+ * Revision 1.7  2004/09/10 00:15:45  steve
+ *  Remove bad casts.
+ *
+ * Revision 1.6  2004/09/05 21:19:51  steve
+ *  Better type safety.
+ *
+ * Revision 1.5  2003/08/26 16:26:02  steve
+ *  ifdef idents correctly.
+ *
+ * Revision 1.4  2003/04/30 01:28:06  steve
+ *  Remove veriusertfs stuf.
+ *
+ * Revision 1.3  2003/02/22 04:04:38  steve
+ *  Only include malloc.h if it is present.
+ *
+ * Revision 1.2  2003/02/17 00:01:25  steve
+ *  Use a variant of ivl_dlfcn to do dynamic loading
+ *  from within the cadpli module.
+ *
+ *  Change the +cadpli flag to -cadpli, to keep the
+ *  plusargs namespace clear.
+ *
+ * Revision 1.1  2003/02/16 02:23:54  steve
+ *  Add the cadpli interface module.
+ *
+ */
+
@@ -2,6 +2,7 @@
 CADENCE PLI1 MODULES

   Copyright 2003 Stephen Williams
+   $Id: cadpli.txt,v 1.2 2003/02/17 00:01:25 steve Exp $

 With the cadpli module, Icarus Verilog is able to load PLI1
 applications that were compiled and linked to be dynamic loaded by
@@ -33,3 +34,15 @@ the +loadpli1= argument to Verilog-XL.
 The integration from this point is seamless. The PLI application
 hardly knows that it is being invoked by Icarus Verilog instead of
 Verilog-XL, so operates as it would otherwise.
+
+$Log: cadpli.txt,v $
+Revision 1.2  2003/02/17 00:01:25  steve
+ Use a variant of ivl_dlfcn to do dynamic loading
+ from within the cadpli module.
+
+ Change the +cadpli flag to -cadpli, to keep the
+ plusargs namespace clear.
+
+Revision 1.1  2003/02/16 02:44:47  steve
+ Add the cadpli HOWTO.
+
@@ -0,0 +1,76 @@
+AC_INIT(Makefile.in)
+
+AC_PROG_CC
+AC_PROG_CXX
+AC_CHECK_TOOL(STRIP, strip, true)
+
+AC_EXEEXT
+AC_SUBST(EXEEXT)
+
+# Combined check for Microsoft-related bogosities; sets WIN32 if found
+AX_WIN32
+
+AC_PROG_INSTALL
+
+# vvp32 is by default disabled
+#enable_vvp32=no
+AC_SUBST(enable_vvp32)
+
+AC_CHECK_HEADERS(malloc.h)
+
+AC_CHECK_SIZEOF(unsigned long long)
+AC_CHECK_SIZEOF(unsigned long)
+AC_CHECK_SIZEOF(unsigned)
+
+# --
+# Look for a dl library to use. First look for the standard dlopen
+# functions, and failing that look for the HP specific shl_load function.
+
+AC_CHECK_HEADERS(dlfcn.h dl.h, break)
+
+DLLIB=''
+AC_CHECK_LIB(dl,dlopen,[DLLIB=-ldl])
+if test -z "$DLLIB" ; then
+AC_CHECK_LIB(dld,shl_load,[DLLIB=-ldld])
+fi
+AC_SUBST(DLLIB)
+
+AX_CPP_PRECOMP
+
+# Compiler option for position independent code, needed whan making shared objects.
+AX_C_PICFLAG
+
+# Linker option used when compiling the target
+AX_LD_RDYNAMIC
+
+# linker options when building a shared library
+AX_LD_SHAREDLIB_OPTS
+
+AX_LD_EXTRALIBS
+
+#######################
+## test for underscores. The vpi module loader in vvm needs to know this
+## in order to know the name of the start symbol for the .vpi module.
+#######################
+
+AX_C_UNDERSCORES_LEADING
+AX_C_UNDERSCORES_TRAILING
+
+#######################
+## end of test for underscores
+#######################
+
+AX_CPP_IDENT
+
+# where to put vpi subdirectories
+AC_MSG_CHECKING(for VPI subdirectories)
+if test x${vpidir1} = x
+then
+	vpidir1="."
+fi
+
+AC_SUBST(vpidir1)
+AC_SUBST(vpidir2)
+AC_MSG_RESULT(${vpidir1} ${vpidir2})
+
+AC_OUTPUT(Makefile)
@@ -0,0 +1,39 @@
+#
+#    This source code is free software; you can redistribute it
+#    and/or modify it in source code form under the terms of the GNU
+#    Library General Public License as published by the Free Software
+#    Foundation; either version 2 of the License, or (at your option)
+#    any later version.
+#
+#    This program 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 Library General Public License for more details.
+#
+#    You should have received a copy of the GNU Library General Public
+#    License along with this program; if not, write to the Free
+#    Software Foundation, Inc.,
+#    59 Temple Place - Suite 330
+#    Boston, MA 02111-1307, USA
+#
+#ident "$Id: enable_vvp32.mk,v 1.1 2003/10/09 01:07:20 steve Exp $"
+#
+
+all32: bin32 bin32/cadpli.vpl
+
+bin32:
+	mkdir bin32
+
+bin32/%.o: %.c
+	$(CC) -m32 -Wall -I$(srcdir) -I$(srcdir)/.. $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $@
+
+bin32/cadpli.vpl: $(addprefix bin32/,$O) ../vvp/bin32/libvpi.a ../libveriuser/bin32/libveriuser.o
+	$(CC) $(SHARED) -m32 -o $@ $(addprefix bin32/,$O) ../libveriuser/bin32/libveriuser.o ../vvp/bin32/libvpi.a
+
+install32: all32 $(vpidir32)/cadpli.vpl
+
+$(vpidir32)/cadpli.vpl: bin32/cadpli.vpl
+	$(INSTALL_PROGRAM) bin32/cadpli.vpl $(vpidir32)/cadpli.vpl
+
+uninstall32:
+	rm -f $(vpidir32)/cadpli.vpl
@@ -1,7 +1,7 @@
-#ifndef IVL_ivl_dlfcn_H
-#define IVL_ivl_dlfcn_H
+#ifndef __ivl_dlfcn_H
+#define __ivl_dlfcn_H
 /*
- * Copyright (c) 2001-2014 Stephen Williams ([email protected])
+ * Copyright (c) 2001 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,8 +16,11 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: ivl_dlfcn.h,v 1.3 2004/10/04 01:10:56 steve Exp $"
+#endif

 #if defined(__MINGW32__)
 # include <windows.h>
@@ -32,16 +35,16 @@ typedef shl_t ivl_dll_t;
 #endif

 #if defined(__MINGW32__)
-static __inline__ ivl_dll_t ivl_dlopen(const char *name)
+inline ivl_dll_t ivl_dlopen(const char *name)
 { return (void *)LoadLibrary(name); }

-static __inline__ void *ivl_dlsym(ivl_dll_t dll, const char *nm)
+inline void *ivl_dlsym(ivl_dll_t dll, const char *nm)
 { return (void *)GetProcAddress((HINSTANCE)dll,nm);}

-static __inline__ void ivl_dlclose(ivl_dll_t dll)
+inline void ivl_dlclose(ivl_dll_t dll)
 { (void)FreeLibrary((HINSTANCE)dll);}

-static __inline__ const char *dlerror(void)
+inline const char *dlerror(void)
 {
  static char msg[256];
  unsigned long err = GetLastError();
@@ -58,10 +61,10 @@ static __inline__ const char *dlerror(void)
 }

 #elif defined(HAVE_DLFCN_H)
-static __inline__ ivl_dll_t ivl_dlopen(const char*name)
+inline ivl_dll_t ivl_dlopen(const char*name)
 { return dlopen(name,RTLD_LAZY); }

-static __inline__ void* ivl_dlsym(ivl_dll_t dll, const char*nm)
+inline void* ivl_dlsym(ivl_dll_t dll, const char*nm)
 {
      void*sym = dlsym(dll, nm);
 	/* Not found? try without the leading _ */
@@ -70,25 +73,41 @@ static __inline__ void* ivl_dlsym(ivl_dll_t dll, const char*nm)
      return sym;
 }

-static __inline__ void ivl_dlclose(ivl_dll_t dll)
+inline void ivl_dlclose(ivl_dll_t dll)
 { dlclose(dll); }

 #elif defined(HAVE_DL_H)
-static __inline__ ivl_dll_t ivl_dlopen(const char*name)
+inline ivl_dll_t ivl_dlopen(const char*name)
 { return shl_load(name, BIND_IMMEDIATE, 0); }

-static __inline__ void* ivl_dlsym(ivl_dll_t dll, const char*nm)
+inline void* ivl_dlsym(ivl_dll_t dll, const char*nm)
 {
      void*sym;
      int rc = shl_findsym(&dll, nm, TYPE_PROCEDURE, &sym);
      return (rc == 0) ? sym : 0;
 }

-static __inline__ void ivl_dlclose(ivl_dll_t dll)
+inline void ivl_dlclose(ivl_dll_t dll)
 { shl_unload(dll); }

-static __inline__ const char*dlerror(void)
+inline const char*dlerror(void)
 { return strerror( errno ); }
 #endif

-#endif /* IVL_ivl_dlfcn_H */
+/*
+ * $Log: ivl_dlfcn.h,v $
+ * Revision 1.3  2004/10/04 01:10:56  steve
+ *  Clean up spurious trailing white space.
+ *
+ * Revision 1.2  2003/12/12 05:43:08  steve
+ *  Some systems dlsym requires leading _ or not on whim.
+ *
+ * Revision 1.1  2003/02/17 00:01:25  steve
+ *  Use a variant of ivl_dlfcn to do dynamic loading
+ *  from within the cadpli module.
+ *
+ *  Change the +cadpli flag to -cadpli, to keep the
+ *  plusargs namespace clear.
+ *
+ */
+#endif
@@ -1,7 +1,7 @@
-#ifndef IVL_compiler_H
-#define IVL_compiler_H
+#ifndef __compiler_H
+#define __compiler_H
 /*
- * Copyright (c) 1999-2014 Stephen Williams ([email protected])
+ * Copyright (c) 1999-2004 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,8 +16,11 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: compiler.h,v 1.26.2.3 2006/06/12 00:16:50 steve Exp $"
+#endif

 # include  <list>
 # include  <map>
@@ -29,23 +32,11 @@
 */


-/*
- * The integer_width is the width of integer variables. This is also
- * the minimum width of unsized integers when they are found in
- * self-determined contexts.
- */
-extern unsigned integer_width;
-
-/*
- * The width_cap is the width limit for unsized expressions.
- */
-extern unsigned width_cap;
-
-/*
- * This is the maximum number of recursive module loops allowed within
- * a generate block.
- */
-extern unsigned recursive_mod_limit;
+/* The INTEGER_WIDTH is the default width of integer variables, and
+   the presumed width of unsigned literal numbers. */
+#ifndef INTEGER_WIDTH
+# define INTEGER_WIDTH 32
+#endif

 /* The TIME_WIDTH is the width of time variables. */
 #ifndef TIME_WIDTH
@@ -79,6 +70,7 @@ extern unsigned recursive_mod_limit;

 /* Implicit definitions of wires. */
 extern bool warn_implicit;
+extern bool error_implicit;

 /* inherit timescales across files. */
 extern bool warn_timescale;
@@ -86,19 +78,8 @@ extern bool warn_timescale;
 /* Warn about legal but questionable module port bindings. */
 extern bool warn_portbinding;

-/* Warn about constant out of bound selects. */
-extern bool warn_ob_select;
-
-/* Warn about structures that may have infinite loops. */
-extern bool warn_inf_loop;
-
-/* Warn about always @* statements where a part or word select causes
-   sensitivity to an entire vector or array. */
-extern bool warn_sens_entire_vec;
-extern bool warn_sens_entire_arr;
-
-/* Warn about level-appropriate anachronisms. */
-extern bool warn_anachronisms;
+/* Warn about unused or unassigned variables. */
+extern bool warn_unused;

 /* This is true if verbose output is requested. */
 extern bool verbose_flag;
@@ -106,28 +87,8 @@ extern bool verbose_flag;
 extern bool debug_scopes;
 extern bool debug_eval_tree;
 extern bool debug_elaborate;
-extern bool debug_emit;
-extern bool debug_synth2;
-extern bool debug_optimizer;
-
-/* Control evaluation of functions at compile time:
- *   0 = only for functions in constant expressions
- *   1 = only for automatic functions
- *   2 = for all functions
- * Level 2 should only be used if the user can guarantee that a
- * function's local variables are never accessed from outside the
- * function. */
-extern unsigned opt_const_func;
-
-/* Possibly temporary flag to control virtualization of pin arrays */
-extern bool disable_virtual_pins;
-
-/* The vlog95 code generator does not want the compiler to generate concat-Z
- * LPM objects so this flag is used to block them from being generated. */
-extern bool disable_concatz_generation;
-
-/* Limit to size of devirtualized arrays */
-extern unsigned long array_size_limit;
+extern bool debug_synth;
+extern bool debug_cprop;

 /* Path to a directory useful for finding subcomponents. */
 extern const char*basedir;
@@ -137,105 +98,21 @@ extern list<const char*>library_suff;
 extern int build_library_index(const char*path, bool key_case_sensitive);

 /* This is the generation of Verilog that the compiler is asked to
-   support. Then there are also more detailed controls for more
-   specific language features. */
+   support. */
 enum generation_t {
      GN_VER1995  = 1,
-      GN_VER2001_NOCONFIG  = 2,
-      GN_VER2001  = 3,
-      GN_VER2005  = 4,
-      GN_VER2005_SV  = 5,
-      GN_VER2009  = 6,
-      GN_VER2012  = 7,
-      GN_DEFAULT  = 4
+      GN_VER2001  = 2,
+      GN_SYSVER30 = 3,
+      GN_DEFAULT  = 3
 };

 extern generation_t generation_flag;

-/* If this flag is true, enable extended types support. */
-extern bool gn_cadence_types_flag;
-
-/* If this flag is true, enable miscellaneous extensions. */
-extern bool gn_icarus_misc_flag;
-
-/* If this flag is true, then elaborate specify blocks. If this flag
-   is false, then skip elaboration of specify behavior. */
-extern bool gn_specify_blocks_flag;
-
-/* If this flag is true, then elaborate assertions. If this flag is
-   false, then stub out assertion statements. */
-extern bool gn_assertions_flag;
-
-/* If this flag is true, then support/elaborate Verilog-AMS. */
-extern bool gn_verilog_ams_flag;
-
-/* If this flag is false a warning is printed when the port declaration
-   is scalar and the net/register definition is vectored. */
-extern bool gn_io_range_error_flag;
-
-/* If this flag is true, then force re-evaluation of user functions
-   in a continuous assignment when any part of the expression is
-   re-evaluated. */
-extern bool gn_strict_ca_eval_flag;
-
-/* If this flag is true, then force strict conformance to the IEEE
-   standard expression width rules. */
-extern bool gn_strict_expr_width_flag;
-
-/* If variables can be converted to uwires by a continuous assignment
-   (assuming no procedural assign, then return true. This will be true
-   for SystemVerilog */
-static inline bool gn_var_can_be_uwire(void)
-{
-      if (generation_flag == GN_VER2005_SV ||
-          generation_flag == GN_VER2009  ||
-          generation_flag == GN_VER2012)
-	    return true;
-      return false;
-}
-
-static inline bool gn_system_verilog(void)
-{
-      if (generation_flag == GN_VER2005_SV ||
-          generation_flag == GN_VER2009  ||
-          generation_flag == GN_VER2012)
-	    return true;
-      return false;
-}
-
-static inline bool gn_modules_nest(void)
-{
-      return gn_system_verilog();
-}
-
-/* The bits of these GN_KEYWORDS_* constants define non-intersecting
-   sets of keywords. The compiler enables groups of keywords by setting
-   lexor_keyword_mask with the OR of the bits for the keywords to be
-   enabled. */
-enum { GN_KEYWORDS_1364_1995        = 0x0001,
-       GN_KEYWORDS_1364_2001        = 0x0002,
-       GN_KEYWORDS_1364_2001_CONFIG = 0x0004,
-       GN_KEYWORDS_1364_2005        = 0x0008,
-       GN_KEYWORDS_VAMS_2_3         = 0x0010,
-       GN_KEYWORDS_1800_2005        = 0x0020,
-       GN_KEYWORDS_1800_2009        = 0x0040,
-       GN_KEYWORDS_1800_2012        = 0x0080,
-       GN_KEYWORDS_ICARUS           = 0x8000
-};
-extern int lexor_keyword_mask;
-
  /* This is the string to use to invoke the preprocessor. */
 extern char*ivlpp_string;

 extern map<perm_string,unsigned> missing_modules;

-  /* Files that are library files are in this map. The lexor compares
-     file names as it processes `line directives, and if the file name
-     matches an entry in this table, it will turn on the
-     library_active_flag so that modules know that they are in a
-     library. */
-extern map<perm_string,bool> library_file_map;
-
 /*
 * the lex_strings are perm_strings made up of tokens from the source
 * file. Identifiers are so likely to be used many times that it makes
@@ -243,19 +120,6 @@ extern map<perm_string,bool> library_file_map;
 */
 extern StringHeapLex lex_strings;

-/*
- * The ivl_target.h API in a variety of places keeps strings of
- * bits. Manage these as perm_string in a StringHeap.
- */
-extern StringHeapLex bits_strings;
-
-/*
- * The filename_strings are perm_strings for file names. They are put
- * into their own StringHeapLex because these paths are used a *lot*
- * and this makes them more sure to hash together.
- */
-extern StringHeapLex filename_strings;
-

 /*
 * system task/function listings.
@@ -267,20 +131,62 @@ extern StringHeapLex filename_strings;
 */
 struct sfunc_return_type {
      const char*   name;
-      ivl_variable_type_t type;
+      NetExpr::TYPE type;
      unsigned      wid;
      int           signed_flag;
 };

 extern const struct sfunc_return_type* lookup_sys_func(const char*name);
 extern int load_sys_func_table(const char*path);
-extern void cleanup_sys_func_table();

 /*
- * In system Verilog it is allowed with a warning to call a function
- * as a task. You can even cast the return value away and have no
- * warning message.
+ * $Log: compiler.h,v $
+ * Revision 1.26.2.3  2006/06/12 00:16:50  steve
+ *  Add support for -Wunused warnings.
+ *
+ * Revision 1.26.2.2  2006/04/23 04:25:45  steve
+ *  Add cprop debugging.
+ *
+ * Revision 1.26.2.1  2006/04/01 01:37:24  steve
+ *  Add synth debug flag
+ *
+ * Revision 1.26  2004/10/04 01:10:52  steve
+ *  Clean up spurious trailing white space.
+ *
+ * Revision 1.25  2004/09/25 01:58:44  steve
+ *  Add a debug_elaborate flag
+ *
+ * Revision 1.24  2004/09/10 23:51:42  steve
+ *  Fix the evaluation of constant ternary expressions.
+ *
+ * Revision 1.23  2004/09/05 17:44:41  steve
+ *  Add support for module instance arrays.
+ *
+ * Revision 1.22  2004/03/10 04:51:24  steve
+ *  Add support for system function table files.
+ *
+ * Revision 1.21  2004/03/09 04:29:42  steve
+ *  Separate out the lookup_sys_func table, for eventual
+ *  support for function type tables.
+ *
+ *  Remove ipal compile flags.
+ *
+ * Revision 1.20  2004/02/18 17:11:54  steve
+ *  Use perm_strings for named langiage items.
+ *
+ * Revision 1.19  2003/11/13 05:55:33  steve
+ *  Move the DLL= flag to target config files.
+ *
+ * Revision 1.18  2003/11/08 20:06:21  steve
+ *  Spelling fixes in comments.
+ *
+ * Revision 1.17  2003/09/25 00:25:14  steve
+ *  Summary list of missing modules.
+ *
+ * Revision 1.16  2003/03/01 06:25:30  steve
+ *  Add the lex_strings string handler, and put
+ *  scope names and system task/function names
+ *  into this table. Also, permallocate event
+ *  names from the beginning.
 */
-extern ivl_sfunc_as_task_t def_sfunc_as_task;
-
-#endif /* IVL_compiler_H */
+#endif
@@ -1,7 +1,7 @@
-#ifndef IVL_config_H                                           /* -*- c++ -*- */
-#define IVL_config_H
+#ifndef __config_H                                           /* -*- c++ -*- */
+#define __config_H
 /*
- * Copyright (c) 2001-2014 Stephen Williams ([email protected])
+ * Copyright (c) 2001 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,8 +16,11 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: config.h.in,v 1.11 2004/10/04 01:10:52 steve Exp $"
+#endif

 #if defined(__cplusplus)
 #  if !defined(__GNUC__)
@@ -34,32 +37,52 @@
 # undef HAVE_TIMES
 # undef HAVE_IOSFWD
 # undef HAVE_GETOPT_H
-# undef HAVE_INTTYPES_H
 # undef HAVE_LIBIBERTY_H
+# undef HAVE_MALLOC_H
 # undef HAVE_DLFCN_H
 # undef HAVE_DL_H
 # undef HAVE_FCHMOD
 # undef HAVE_LIBREADLINE
 # undef HAVE_LIBZ
 # undef HAVE_LIBBZ2
-# undef HAVE_LROUND
 # undef HAVE_SYS_WAIT_H
 # undef WORDS_BIGENDIAN

-#ifdef HAVE_INTTYPES_H
-# include  <inttypes.h>
-#endif
-
-/* These two are needed by the lxt and lxt2 files (copied from GTKWave). */
-# undef HAVE_ALLOCA_H
-# undef HAVE_FSEEKO
-/* And this is needed by the fst files (copied from GTKWave). */
-# undef HAVE_LIBPTHREAD
-
 /*
- * Define this if you want to compile vvp with memory freeing and
- * special valgrind hooks for the memory pools.
+ * $Log: config.h.in,v $
+ * Revision 1.11  2004/10/04 01:10:52  steve
+ *  Clean up spurious trailing white space.
+ *
+ * Revision 1.10  2003/08/26 16:26:01  steve
+ *  ifdef idents correctly.
+ *
+ * Revision 1.9  2003/07/03 16:29:55  steve
+ *  spemm WORDS_BIGENDIAN correctly.
+ *
+ * Revision 1.8  2003/03/07 02:44:33  steve
+ *  Implement $realtobits.
+ *
+ * Revision 1.7  2003/02/20 00:49:24  steve
+ *  detect -lz and -lbz2 libraries.
+ *
+ * Revision 1.6  2003/01/10 19:01:04  steve
+ *  Only use libiberty.h if available.
+ *
+ * Revision 1.5  2002/08/11 23:39:33  steve
+ *  Remove VVM option.
+ *
+ * Revision 1.4  2002/02/16 03:18:53  steve
+ *  Make vvm optional, normally off.
+ *
+ * Revision 1.3  2001/10/18 16:16:23  steve
+ *  Include HAVE_SYS_WAIT in config.h (PR#306)
+ *
+ * Revision 1.2  2001/09/15 18:27:04  steve
+ *  Make configure detect malloc.h
+ *
+ * Revision 1.1  2001/07/25 03:10:48  steve
+ *  Create a config.h.in file to hold all the config
+ *  junk, and support gcc 3.0. (Stephan Boettcher)
+ *
 */
-# undef CHECK_WITH_VALGRIND
-
-#endif /* IVL_config_H */
+#endif // __config_H
@@ -1,10 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002 Free Software Foundation, Inc.

-timestamp='2009-04-17'
+timestamp='2002-07-03'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -22,15 +21,14 @@ timestamp='2009-04-17'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.

-
 # Please send patches to <[email protected]>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -72,8 +70,8 @@ Report bugs and patches to <[email protected]>."
 version="\
 GNU config.sub ($timestamp)

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -85,11 +83,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
  case $1 in
    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit 0 ;;
    --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit 0 ;;
    --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit 0 ;;
    -- )     # Stop option processing
       shift; break ;;
    - )	# Use stdin as input.
@@ -101,7 +99,7 @@ while test $# -gt 0 ; do
    *local*)
       # First pass through any local machine types.
       echo $1
-       exit ;;
+       exit 0;;

    * )
       break ;;
@@ -120,10 +118,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
@@ -149,7 +144,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis)
 		os=
 		basic_machine=$1
 		;;
@@ -174,10 +169,6 @@ case $os in
 	-hiux*)
 		os=-hiuxwe2
 		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -194,10 +185,6 @@ case $os in
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -241,57 +228,40 @@ case $basic_machine in
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-	| bfin \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fido | fr30 | frv \
+	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
+	| ip2k \
+	| m32r | m68000 | m68k | m88k | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
 	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nios | nios2 \
 	| ns16k | ns32k \
-	| or32 \
+	| openrisc | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| strongarm \
+	| tahoe | thumb | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k | z80)
+	| x86 | xscale | xstormy16 | xtensa \
+	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -301,9 +271,6 @@ case $basic_machine in
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;

 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -323,67 +290,48 @@ case $basic_machine in
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| avr-* \
+	| bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c54x-* \
+	| clipper-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
+	| ip2k-* \
+	| m32r-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| m88110-* | m88k-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
 	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nios-* | nios2-* \
+	| mipstx39 | mipstx39el \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
-	| tron-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa*-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+	| xtensa-* \
 	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
+	| z8k-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -401,9 +349,6 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -418,12 +363,6 @@ case $basic_machine in
 		basic_machine=a29k-none
 		os=-bsd
 		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -447,10 +386,6 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -459,22 +394,10 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-        cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -499,27 +422,12 @@ case $basic_machine in
 		basic_machine=j90-cray
 		os=-unicos
 		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -542,14 +450,6 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -700,14 +600,6 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -723,10 +615,6 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -740,6 +628,10 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
+	mmix*)
+		basic_machine=mmix-knuth
+		os=-mmixware
+		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -752,9 +644,6 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -830,12 +719,9 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	openrisc | openrisc-*)
+	or32 | or32-*)
 		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
+		os=-coff
 		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
@@ -853,75 +739,55 @@ case $basic_machine in
 		basic_machine=i860-intel
 		os=-osf
 		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
 	pbb)
 		basic_machine=m68k-tti
 		;;
-	pc532 | pc532-*)
+        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+	pentiumpro | p6 | 6x86 | athlon)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
+	pentiumii | pentium2)
 		basic_machine=i686-pc
 		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+	pentiumii-* | pentium2-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	pn)
 		basic_machine=pn-gould
 		;;
 	power)	basic_machine=power-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
-		;;
+	        ;;
 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
-		;;
+	        ;;
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
-		;;
+	        ;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 		basic_machine=powerpc64le-unknown
-		;;
+	        ;;
 	ppc64le-* | powerpc64little-*)
 		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
@@ -932,10 +798,6 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -956,20 +818,6 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -977,12 +825,6 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
 	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
@@ -1041,7 +883,7 @@ case $basic_machine in
 	sun386 | sun386i | roadrunner)
 		basic_machine=i386-sun
 		;;
-	sv1)
+        sv1)
 		basic_machine=sv1-cray
 		os=-unicos
 		;;
@@ -1049,6 +891,10 @@ case $basic_machine in
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
+	t3d)
+		basic_machine=alpha-cray
+		os=-unicos
+		;;
 	t3e)
 		basic_machine=alphaev5-cray
 		os=-unicos
@@ -1061,18 +907,6 @@ case $basic_machine in
 		basic_machine=tic54x-unknown
 		os=-coff
 		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tile*)
-		basic_machine=tile-unknown
-		os=-linux-gnu
-		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -1086,10 +920,6 @@ case $basic_machine in
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -1111,8 +941,8 @@ case $basic_machine in
 		os=-vms
 		;;
 	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
+               basic_machine=f301-fujitsu
+               ;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -1133,11 +963,11 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
+	windows32)
+		basic_machine=i386-pc
+		os=-windows32-msvcrt
 		;;
-	xps | xps100)
+        xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
 	ymp)
@@ -1148,10 +978,6 @@ case $basic_machine in
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
-		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1171,9 +997,6 @@ case $basic_machine in
 	romp)
 		basic_machine=romp-ibm
 		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
 	rs6000)
 		basic_machine=rs6000-ibm
 		;;
@@ -1190,13 +1013,16 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
-	cydra)
+        cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
@@ -1211,6 +1037,10 @@ case $basic_machine in
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
+	c4x*)
+		basic_machine=c4x-none
+		os=-coff
+		;;
 	*-unknown)
 		# Make sure to match an already-canonicalized machine name.
 		;;
@@ -1262,28 +1092,22 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
+	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -mingw32* | -linux* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1295,24 +1119,16 @@ case $os in
 			;;
 		esac
 		;;
-	-nto-qnx*)
-		;;
 	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		os=-nto-qnx
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
 	-sunos5*)
 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
 		;;
@@ -1322,9 +1138,6 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
-		os=-os400
-		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1346,9 +1159,6 @@ case $os in
 	-atheos*)
 		os=-atheos
 		;;
-	-syllable*)
-		os=-syllable
-		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1359,7 +1169,7 @@ case $os in
 		os=-rtmk-nova
 		;;
 	-ns2 )
-		os=-nextstep2
+	        os=-nextstep2
 		;;
 	-nsk*)
 		os=-nsk
@@ -1371,9 +1181,6 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
-		os=-tpf
-		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1401,20 +1208,8 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-dicos*)
-		os=-dicos
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+	        os=-mint
 		;;
 	-none)
 		;;
@@ -1438,12 +1233,6 @@ else
 # system, and we'll never get to this point.

 case $basic_machine in
-        score-*)
-		os=-elf
-		;;
-        spu-*)
-		os=-elf
-		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1453,14 +1242,11 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
-		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
 		;;
-	pdp11-*)
+        pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
@@ -1481,9 +1267,6 @@ case $basic_machine in
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
-		os=-elf
-		;;
 	mips*-cisco)
 		os=-elf
 		;;
@@ -1502,15 +1285,9 @@ case $basic_machine in
 	*-be)
 		os=-beos
 		;;
-	*-haiku)
-		os=-haiku
-		;;
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
-		os=-mmixware
-		;;
 	*-wec)
 		os=-proelf
 		;;
@@ -1562,19 +1339,19 @@ case $basic_machine in
 	*-next)
 		os=-nextstep3
 		;;
-	*-gould)
+        *-gould)
 		os=-sysv
 		;;
-	*-highlevel)
+        *-highlevel)
 		os=-bsd
 		;;
 	*-encore)
 		os=-bsd
 		;;
-	*-sgi)
+        *-sgi)
 		os=-irix
 		;;
-	*-siemens)
+        *-siemens)
 		os=-sysv4
 		;;
 	*-masscomp)
@@ -1643,15 +1420,9 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
-			-os400*)
-				vendor=ibm
-				;;
 			-ptx*)
 				vendor=sequent
 				;;
-			-tpf*)
-				vendor=ibm
-				;;
 			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
@@ -1676,7 +1447,7 @@ case $basic_machine in
 esac

 echo $basic_machine$os
-exit
+exit 0

 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
@@ -2,37 +2,22 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(netlist.h)
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_HEADER(_pli_types.h)
-AC_CONFIG_HEADER(vhdlpp/vhdlpp_config.h)
-AC_CONFIG_HEADER(vvp/config.h)
-AC_CONFIG_HEADER(vpi/vpi_config.h)
-AC_CONFIG_HEADER(libveriuser/config.h)
-AC_CONFIG_HEADER(tgt-vvp/vvp_config.h)
-AC_CONFIG_HEADER(tgt-vhdl/vhdl_config.h)
-AC_CONFIG_HEADER(tgt-pcb/pcb_config.h)

 AC_CANONICAL_HOST
 dnl Checks for programs.
 AC_PROG_CC
-# AC_PROG_CC_C99 is only available in autoconf version 2.60 and later.
-AC_PREREQ([2.60])
-AC_PROG_CC_C99
 AC_PROG_CXX
-AC_PROG_RANLIB
-AC_CHECK_TOOL(LD, ld, false)
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(DLLTOOL, dlltool, false)
 AC_CHECK_TOOL(STRIP, strip, true)
-AC_CHECK_TOOL(WINDRES,windres,false)
 AC_CHECK_PROGS(XGPERF,gperf,none)
 AC_CHECK_PROGS(MAN,man,none)
 AC_CHECK_PROGS(PS2PDF,ps2pdf,none)
-AC_CHECK_PROGS(GIT,git,none)
+
 if test "$XGPERF" = "none"
 then
 	echo ""
        echo "*** Warning: No suitable gperf found. ***"
 	echo "    The gperf package is essential for building ivl from"
-	echo "    git sources, or modifying the parse engine of ivl itself."
+	echo "    CVS sources, or modifying the parse engine of ivl itself."
 	echo "    You can get away without it when simply building from"
 	echo "    snapshots or major releases."
 	echo ""
@@ -60,115 +45,23 @@ AC_SUBST(EXEEXT)
 # Combined check for Microsoft-related bogosities; sets WIN32 if found
 AX_WIN32

-# Check to see if we are using the Sun compiler. If so then configure
-# some of the flags to match the Sun compiler syntax. This is also used
-# in the aclocal.m4 file to configure the flags used to build and link
-# dynamic libraries
-AC_CHECK_DECL(__SUNPRO_C, using_sunpro_c=1, using_sunpro_c=0)
-if test ${using_sunpro_c} = 1
-then
-AC_SUBST(DEPENDENCY_FLAG, [-xMMD])
-AC_SUBST(WARNING_FLAGS, [""])
-AC_SUBST(WARNING_FLAGS_CXX, [""])
-else
-# Check to see if -Wextra is supported.
-iverilog_temp_cflags="$CFLAGS"
-CFLAGS="-Wextra $CFLAGS"
-AC_MSG_CHECKING(if gcc supports -Wextra)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-   [[iverilog_wextra_flag="-Wextra";] AC_MSG_RESULT(yes)],
-   [[iverilog_wextra_flag="-W";] AC_MSG_RESULT(no)])
-CFLAGS="$iverilog_temp_cflags"
+# vvp32 is by default disabled
+#enable_vvp32=no
+AC_SUBST(enable_vvp32)

-AC_SUBST(DEPENDENCY_FLAG, [-MD])
-AC_SUBST(WARNING_FLAGS, ["-Wall $iverilog_wextra_flag -Wshadow"])
-AC_SUBST(WARNING_FLAGS_CC, [""])
-AC_SUBST(WARNING_FLAGS_CXX, [""])
-fi

-AC_LANG(C++)
+AC_LANG_CPLUSPLUS

-AC_ARG_WITH([m32], [AC_HELP_STRING([--with-m32], [Compile 32-bit on x86_64])],
-            [ with_m32=yes ],[ with_m32=no ])
+AC_CHECK_HEADERS(getopt.h malloc.h inttypes.h libiberty.h iosfwd sys/wait.h)

-AS_IF( [test "x$with_m32" = xyes],
-    [ AC_MSG_NOTICE([Compiling for 32-bit environment - needs gcc on x86_64])
-      LDTARGETFLAGS="-m elf_i386"
-      CTARGETFLAGS="-m32"
-    ],
-    [])
-
-CFLAGS="$CTARGETFLAGS $CFLAGS"
-CXXFLAGS="$CTARGETFLAGS $CXXFLAGS"
-LDFLAGS="$CTARGETFLAGS $LDFLAGS"
-
-# Check that we are using either the GNU compilers or the Sun compilers
-# but not a mixture of the two (not currently supported).
-AC_CHECK_DECL(__SUNPRO_CC, using_sunpro_cc=1, using_sunpro_cc=0)
-if test ${using_sunpro_c} = 1
-then
-  if test ${using_sunpro_cc} = 0
-  then
-    echo "*** Error: No support for mixing GNU and Sun compilers. ***"
-    echo "           Using Sun C compiler and GNU C++ compiler.."
-    exit 1
-  fi
-else
-  if test ${using_sunpro_cc} = 1
-  then
-    echo "*** Error: No support for mixing GNU and Sun compilers. ***"
-    echo "           Using GNU C compiler and Sun C++ compiler.."
-    exit 1
-  fi
-fi
-
-iverilog_temp_cxxflags="$CXXFLAGS"
-CXXFLAGS="-DHAVE_DECL_BASENAME $CXXFLAGS"
-
-AC_CHECK_HEADERS(getopt.h inttypes.h libiberty.h iosfwd sys/wait.h)
-CXXFLAGS="$iverilog_temp_cxxflags"
-
-AC_CHECK_SIZEOF(unsigned long long)
-AC_CHECK_SIZEOF(unsigned long)
-AC_CHECK_SIZEOF(unsigned)
-
-# vvp uses these...
-AC_CHECK_LIB(termcap, tputs)
-AC_CHECK_LIB(readline, readline)
-AC_CHECK_LIB(history, add_history)
-AC_CHECK_HEADERS(readline/readline.h readline/history.h sys/resource.h)
-case "${host}" in *linux*) AC_DEFINE([LINUX], [1], [Host operating system is Linux.]) ;; esac
-
-# vpi uses these
-AC_CHECK_LIB(pthread, pthread_create)
 AC_CHECK_LIB(z, gzwrite)
 AC_CHECK_LIB(z, gzwrite, HAVE_LIBZ=yes, HAVE_LIBZ=no)
 AC_SUBST(HAVE_LIBZ)
 if test "$WIN32" = "yes"; then
 AC_CHECK_LIB(bz2, main)
-AC_CHECK_LIB(bz2, main, HAVE_LIBBZ2=yes, HAVE_LIBBZ2=no)
 else
 AC_CHECK_LIB(bz2, BZ2_bzdopen)
-AC_CHECK_LIB(bz2, BZ2_bzdopen, HAVE_LIBBZ2=yes, HAVE_LIBBZ2=no)
 fi
-AC_SUBST(HAVE_LIBBZ2)
-
-# The lxt/lxt2 files from GTKWave use these...
-
-AC_FUNC_ALLOCA
-AC_FUNC_FSEEKO
-
-# valgrind checks
-AC_ARG_WITH([valgrind], [AC_HELP_STRING([--with-valgrind],
-                                        [Add valgrind hooks])],
-            [], [check_valgrind=yes])
-
-AS_IF([test "x$check_valgrind" = xyes],
-      [AC_MSG_NOTICE([Not using valgrind hooks])],
-      [AC_CHECK_HEADER([valgrind/memcheck.h],
-                       [AC_DEFINE([CHECK_WITH_VALGRIND], [1],
-                                  [Define to one to use the valgrind hooks])],
-                       [AC_MSG_ERROR([Could not find <valgrind/memcheck.h>])])])

 AC_MSG_CHECKING(for sys/times)
 AC_TRY_LINK(
@@ -176,7 +69,7 @@ AC_TRY_LINK(
 #include <sys/times.h>
 ,{clock_t a = times(0)/sysconf(_SC_CLK_TCK);},
 do_times=yes
-AC_DEFINE([HAVE_TIMES], [1], [The times system call is available in the host operating system.]),
+AC_DEFINE(HAVE_TIMES,1),
 do_times=no
 )
 AC_MSG_RESULT($do_times)
@@ -193,88 +86,22 @@ if test -z "$DLLIB" ; then
 AC_CHECK_LIB(dld,shl_load,[DLLIB=-ldld])
 fi
 AC_SUBST(DLLIB)
-AC_SUBST(LDRELOCFLAGS)
-
-AC_SUBST(CTARGETFLAGS)
-AC_SUBST(LDTARGETFLAGS)
-

 AC_PROG_INSTALL

-AC_LANG(C)
+AC_LANG_C
 AC_C_BIGENDIAN

 # $host

-AX_ENABLE_SUFFIX
-
 AX_LD_EXTRALIBS

-# Compiler option for position independent code, needed when making shared objects.
+# Compiler option for position independent code, needed whan making shared objects.
 # CFLAGS inherited by cadpli/Makefile?
 AX_C_PICFLAG

-# may modify LDFLAGS
-AX_C99_STRTOD
-
-# Processor specific compile flags
-case "${host}" in
-    alpha*-*-linux*)
-	CPPFLAGS="-mieee $CPPFLAGS"
-	CFLAGS="-mieee $CFLAGS"
-	;;
-esac
-
-# Do some more operating system specific setup. We put the file64_support
-# define in a substitution instead of simply a define because there
-# are source files (namely lxt support files) that don't include any
-# config.h header file.
-file64_support=''
-case "${host}" in
-    *-*-linux*)
-	AC_DEFINE([_LARGEFILE_SOURCE], [1], [Indicates LFS (i.e. the ability to create files larger than 2 GiB on 32-bit operating systems).])
-	file64_support='-D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64'
-	;;
-esac
-AC_SUBST(file64_support)
-
-# Check that these functions exist. They are mostly C99
-# functions that older compilers may not yet support.
-AC_CHECK_FUNCS(fopen64)
-# The following math functions may be defined in the math library so look
-# in the default libraries first and then look in -lm for them. On some
-# systems we may need to use the compiler in C99 mode to get a definition.
-# We requested C99 mode earlier with AC_PROG_CC_C99.
-AC_SEARCH_LIBS([lround], [m], [AC_DEFINE([HAVE_LROUND], [1])])
-AC_SEARCH_LIBS([llround], [m], [AC_DEFINE([HAVE_LLROUND], [1])])
-AC_SEARCH_LIBS([nan], [m], [AC_DEFINE([HAVE_NAN], [1])])
-AC_SEARCH_LIBS([fmin], [m], [AC_DEFINE([HAVE_FMIN], [1])])
-AC_SEARCH_LIBS([fmax], [m], [AC_DEFINE([HAVE_FMAX], [1])])
-
-# Check to see if an unsigned long and uint64_t are the same from
-# a compiler perspective. We can not just check that they are the
-# same size since unsigned long and unsigned long long are not the
-# same from an overloading perspective even though they could be
-# the same size on some 64 bit machines. The result from this test
-# is only used if inttypes.h is available, so if the test fails for
-# that reason we don't care.
-AC_LANG(C++)
-AC_MSG_CHECKING(if uint64_t and unsigned long are identical)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "inttypes.h"
-static bool check(unsigned long val)
-{
-  return val != 0;
-}
-static bool check(uint64_t val)
-{
-  return val != 0;
-}]], [[unsigned long ulval = 1;
-bool result = check(ulval);
-uint64_t uival = 1;
-result &= check(uival);
-return !result;]])],
-   [AC_MSG_RESULT(no)],
-   [AC_DEFINE([UINT64_T_AND_ULONG_SAME], [1]) AC_MSG_RESULT(yes)])
+# may modify CPPFLAGS and CFLAGS
+AX_CPP_PRECOMP

 # Linker option used when compiling the target
 AX_LD_RDYNAMIC
@@ -294,29 +121,29 @@ AX_C_UNDERSCORES_TRAILING
 ## end of test for underscores
 #######################

-#######################
-# Sanity check the configured results
-#######################
+AX_CPP_IDENT

-AC_MSG_CHECKING(for sanity of prefix)
-if test `echo "$prefix" | wc -w` != 1
+# If not otherwise specified, set the libdir64 variable
+# to the same as libdir.
+AC_MSG_CHECKING(for libdir64 path)
+if test x${libdir64} = x
 then
-AC_MSG_ERROR(cannot configure white space in prefix: $prefix)
+	libdir64="${libdir}"
 fi
-AC_MSG_RESULT(ok)
+AC_SUBST(libdir64)
+AC_MSG_RESULT(${libdir64})

-AC_MSG_CHECKING(for sanity of exec_prefix)
-if test `echo "$exec_prefix" | wc -w` != 1
+# where to put vpi subdirectories
+AC_MSG_CHECKING(for VPI subdirectories)
+if test x${vpidir1} = x
 then
-AC_MSG_ERROR(cannot configure white space in exec_prefix: $exec_prefix)
+	vpidir1="."
 fi
-AC_MSG_RESULT(ok)

-AC_MSG_CHECKING(for sanity of libdir)
-if test `echo "$libdir" | wc -w` != 1
-then
-AC_MSG_ERROR(cannot configure white space in libdir: $libdir)
-fi
-AC_MSG_RESULT(ok)
+AC_SUBST(vpidir1)
+AC_SUBST(vpidir2)
+AC_MSG_RESULT(${vpidir1} ${vpidir2})

-AC_OUTPUT(Makefile ivlpp/Makefile vhdlpp/Makefile vvp/Makefile vpi/Makefile driver/Makefile driver-vpi/Makefile cadpli/Makefile libveriuser/Makefile tgt-null/Makefile tgt-stub/Makefile tgt-vvp/Makefile tgt-vhdl/Makefile tgt-fpga/Makefile tgt-verilog/Makefile tgt-pal/Makefile tgt-vlog95/Makefile tgt-pcb/Makefile tgt-blif/Makefile tgt-sizer/Makefile)
+AC_CONFIG_SUBDIRS(vvp vpi tgt-vvp tgt-edif tgt-fpga libveriuser cadpli)
+
+AC_OUTPUT(Makefile ivlpp/Makefile driver/Makefile driver-vpi/Makefile tgt-null/Makefile tgt-stub/Makefile tgt-verilog/Makefile tgt-pal/Makefile)
@@ -1,43 +0,0 @@
-// Mathematical and physical constants
-
-`ifdef CONSTANTS_VAMS
-`else
-`define CONSTANTS_VAMS 1
-
-// M_ is a mathematical constant
-`define M_E        2.7182818284590452354
-`define M_LOG2E    1.4426950408889634074
-`define M_LOG10E   0.43429448190325182765
-`define M_LN2      0.69314718055994530942
-`define M_LN10     2.30258509299404568402
-`define M_PI       3.14159265358979323846
-`define M_TWO_PI   6.28318530717958647693
-`define M_PI_2     1.57079632679489661923
-`define M_PI_4     0.78539816339744830962
-`define M_1_PI     0.31830988618379067154
-`define M_2_PI     0.63661977236758134308
-`define M_2_SQRTPI 1.12837916709551257390
-`define M_SQRT2    1.41421356237309504880
-`define M_SQRT1_2  0.70710678118654752440
-
-/*
- * Do we need these? For now they are not available.
- *
-// The following constants have been taken from http://physics.nist.gov
-// P_ is a physical constant
-// charge of electron in coulombs
-`define P_Q        1.602176462e-19
-// speed of light in vacuum in meters/sec
-`define P_C        2.99792458e8
-// Boltzmann's constant in joules/kelvin
-`define P_K        1.3806503e-23
-// Planck's constant in joules*sec
-`define P_H        6.62606876e-34
-// permittivity of vacuum in farads/meter
-`define P_EPS0     8.854187817e-12
-// permeability of vacuum in henrys/meter
-`define P_U0       (4.0e-7 * `M_PI)
-// zero celsius in kelvin
-`define P_CELSIUS0 273.15
-*/
-`endif
@@ -1,3 +0,0 @@
-// These are correct and are used to find the base (zero) pin.
-thisSubtraction:netlist.h:4938
-thisSubtraction:netlist.h:4947
@@ -1,149 +0,0 @@
-
-Developer Quick Start for Icarus Verilog
-
-The documentation for getting, building and installing Icarus Verilog
-is kept and maintained at the iverilog documentation wiki at
-<http://iverilog.wikia.com>. See the Installation Guide for getting
-the current source from the git repository (and how to use the git
-repository) and see the Developer Guide for instructions on
-participating in the Icarus Verilog development process. That
-information will not be repeated here.
-
-What this documentation *will* cover is the gross structure of the
-Icarus Verilog compiler source. This will help orient you to the
-source code itself, so that you can find the global parts where you
-can look for even better detail.
-
-
-* Compiler Components
-
- The compiler driver (driver/)
-
-This is the binary that is installed as "iverilog". This program takes
-the command line arguments and assembles invocations of all the other
-subcommands to perform the steps of compilation.
-
- The preprocessor (ivlpp/)
-
-This implements the Verilog pre-processor. In Icarus Verilog, the
-compiler directives `define, `include, `ifdef and etc. are implemented
-in an external program. The ivlpp/ directory contains the source for
-this program.
-
- The core compiler (this directory)
-
-The "ivl" program is the core that does all the Verilog compiler
-processing that is not handled elsewhere. This is the main core of the
-Icarus Verilog compiler, not the runtime. See below for more details
-on the core itself.
-
- The loadable code generators (tgt-*/)
-
-This core compiler, after it is finished with parsing and semantic
-analysis, uses loadable code generators to emit code for supported
-targets. The tgt-*/ directories contains the source for the target
-code generators that are bundled with Icarus Verilog. The tgt-vvp/
-directory in particular contains the code generator for the vvp
-runtime.
-
-
-* Runtime Components
-
- The vvp runtime (vvp/)
-
-This program implements the runtime environment for Icarus
-Verilog. It implements the "vvp" command described in the user
-documentation. See the vvp/ subdirectory for further developer
-documentation.
-
- The system tasks implementations (vpi/)
-
-The standard Verilog system tasks are implemented using VPI (PLI-2)
-and the source is in this subdirectory.
-
- The PLI-1 compatibility library (libveriuser/)
-
-The Icarus Verilog support for the deprecated PLI-1 is in this
-subdirectory. The vvp runtime does not directly support the
-PLI-1. Instead, the libveriuser library emulates it using the builtin
-PLI-2 support.
-
- The Cadence PLI module compatibility module (cadpli/)
-
-It is possible in some specialized situations to load and execute
-PLI-1 code written for Verilog-XL. This directory contains the source
-for the module that provides the Cadence PLI interface.
-
-
-* The Core Compiler
-
-The "ivl" binary is the core compiler that does the heavy lifting of
-compiling the Verilog source (including libraries) and generating the
-output. This is the most complex component of the Icarus Verilog
-compilation system.
-
-The process in the abstract starts with the Verilog lexical analysis
-and parsing to generate an internal "pform". The pform is then
-translated by elaboration into the "netlist" form. The netlist is
-processed by some functors (which include some optimizations and
-optional synthesis) then is translated into the ivl_target internal
-form. And finally, the ivl_target form is passed via the ivl_target.h
-API to the code generators.
-
- Lexical Analysis
-
-Lexical analysis and parsing use the tools "flex", "gperf", and
-"bison". The "flex" input file "lexor.lex" recognizes the tokens in
-the input stream. This is called "lexical analysis". The lexical
-analyzer also does some processing of compiler directives that are not
-otherwise taken care of by the external preprocessor. The lexical
-analyzer uses a table of keywords that is generated using the "gperf"
-program and the input file "lexor_keywords.gperf". This table allows
-the lexical analyzer to efficiently check input words with the rather
-large set of potential keywords.
-
- Parsing
-
-The parser input file "parse.y" is passed to the "bison" program to
-generate the parser. The parser uses the functions in parse*.h,
-parse*.cc, pform.h, and pform*.cc to generate the pform from the
-stream of input tokens. The pform is what compiler writers call a
-"decorated parse tree".
-
-The pform itself is described by the classes in the header files
-"PScope.h", "Module.h", "PGenerate.h", "Statement.h", and
-"PExpr.h". The implementations of the classes in those header files
-are in the similarly named C++ files.
-
- Elaboration
-
-Elaboration transforms the pform to the netlist form. Elaboration is
-conceptually divided into several major steps: Scope elaboration,
-parameter overrides and defparam propagation, signal elaboration, and
-statement and expression elaboration.
-
-The elaboration of scopes and parameter overrides and defparam
-propagation are conceptually separate, but are in practice
-intermingled. The elaboration of scopes scans the pform to find and
-instantiate all the scopes of the design. New scopes are created by
-instantiation of modules (starting with the root instances) by user
-defined tasks and functions, named blocks, and generate schemes. The
-elaborate_scope methods implement scope elaboration, and the
-elab_scope.cc source file has the implementations of those
-methods.
-
-The elaborate.cc source file contains the initial calls to the
-elaborate_scope for the root scopes to get the process started. In
-particular, see the "elaborate" function near the bottom of the
-elaborate.cc source file. The calls to Design::make_root_scope create
-the initial root scopes, and the creation and enqueue of the
-elaborate_root_scope_t work items primes the scope elaboration work
-list.
-
-Intermingled in the work list are defparms work items that call the
-Design::run_defparams and Design::evaluate_parameters methods that
-override and evaluate parameters. The override and evaluation of
-parameters must be intermingled with the elaboration of scopes because
-the exact values of parameters may impact the scopes created (imagine
-generate schemes and instance arrays) and the created scopes in turn
-create new parameters that need override and evaluation.
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2008 Stephen Williams ([email protected])
- *
- *    This source code is free software; you can redistribute it
- *    and/or modify it in source code form under the terms of the GNU
- *    General Public License as published by the Free Software
- *    Foundation; either version 2 of the License, or (at your option)
- *    any later version.
- *
- *    This program 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.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include  "discipline.h"
-
-ivl_nature_s::ivl_nature_s(perm_string name__, perm_string access__)
-: name_(name__), access_(access__)
-{
-}
-
-ivl_nature_s::~ivl_nature_s()
-{
-}
-
-ivl_discipline_s::ivl_discipline_s(perm_string name__, ivl_dis_domain_t domain__,
-				   ivl_nature_t pot, ivl_nature_t flow__)
-: name_(name__), domain_(domain__), potential_(pot), flow_(flow__)
-{
-}
-
-ivl_discipline_s::~ivl_discipline_s()
-{
-}
@@ -1,77 +0,0 @@
-#ifndef IVL_discipline_H
-#define IVL_discipline_H
-/*
- * Copyright (c) 2008-2014 Stephen Williams ([email protected])
- *
- *    This source code is free software; you can redistribute it
- *    and/or modify it in source code form under the terms of the GNU
- *    General Public License as published by the Free Software
- *    Foundation; either version 2 of the License, or (at your option)
- *    any later version.
- *
- *    This program 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.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-/*
- * The discipline types include the discipline, nature and other
- * related types for managing declared and used disciplines in a
- * Verilog-AMS program.
- */
-
-# include  "StringHeap.h"
-# include  <iostream>
-# include  <map>
-# include  "ivl_target.h"
-# include  "LineInfo.h"
-
-extern std::ostream& operator << (std::ostream&, ivl_dis_domain_t);
-
-class ivl_nature_s : public LineInfo {
-    public:
-      explicit ivl_nature_s(perm_string name, perm_string access);
-      ~ivl_nature_s();
-
-      perm_string name() const   { return name_; }
-	// Identifier for the access function for this nature
-      perm_string access() const { return access_; }
-
-    private:
-      perm_string name_;
-      perm_string access_;
-};
-
-class ivl_discipline_s : public LineInfo {
-    public:
-      explicit ivl_discipline_s (perm_string name, ivl_dis_domain_t dom,
-				 ivl_nature_t pot, ivl_nature_t flow);
-      ~ivl_discipline_s();
-
-      perm_string name() const         { return name_; }
-      ivl_dis_domain_t domain() const  { return domain_; }
-      ivl_nature_t potential() const { return potential_; }
-      ivl_nature_t flow() const      { return flow_; }
-
-    private:
-      perm_string name_;
-      ivl_dis_domain_t domain_;
-      ivl_nature_t potential_;
-      ivl_nature_t flow_;
-
-    private: // not implemented
-      ivl_discipline_s(const ivl_discipline_s&);
-      ivl_discipline_s& operator = (const ivl_discipline_s&);
-};
-
-extern map<perm_string,ivl_nature_t> natures;
-extern map<perm_string,ivl_discipline_t> disciplines;
-  // Map access function name to the nature that it accesses.
-extern map<perm_string,ivl_nature_t> access_function_nature;
-
-#endif /* IVL_discipline_H */
@@ -1,72 +0,0 @@
-
-// Standard definitions for Verilog-AMS
-`ifdef DISCIPLINES_VAMS
-`else
-`define DISCIPLINES_VAMS 1
-
-discipline \logic ;
-  domain discrete;
-enddiscipline
-
-discipline ddiscrete;
-  domain discrete;
-enddiscipline
-
-nature Current;
-  units      = "A";
-  access     = I;
-  idt_nature = Charge;
-`ifdef CURRENT_ABSTOL
-  abstol     = `CURRENT_ABSTOL
-`else
-  abstol     = 1e-12;
-`endif
-endnature
-
-nature Charge;
-  units      = "coul";
-  access     = Q;
-  ddt_nature = Current;
-`ifdef CHARGE_ABSTOL
-  abstol     = `CHARGE_ABSTOL;
-`else
-  abstol     = 1e-14;
-`endif
-endnature
-
-nature Voltage;
-  units      = "V";
-  access     = V;
-  idt_nature = Flux;
-`ifdef VOLTAGE_ABSTOL
-  abstol     = `VOLTAGE_ABSTOL;
-`else
-  abstol     = 1e-6;
-`endif
-endnature
-
-nature Flux;
-  units      = "Wb";
-  access     = Phi;
-  ddt_nature = Voltage;
-`ifdef FLUX_ABSTOL
-  abstol     = `flux_ABSTOL;
-`else
-  abstol     = 1e-9;
-`endif
-endnature
-
-discipline electrical;
-  potential Voltage;
-  flow Current;
-enddiscipline
-
-discipline voltage;
-  potential Voltage;
-enddiscipline
-
-discipline current;
-  flow Current;
-enddiscipline
-
-`endif // !`ifdef DISCIPLINES_VAMS
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2009 Stephen Williams ([email protected])
+ * Copyright (c) 2001 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -14,8 +14,11 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: dosify.c,v 1.5 2003/07/15 16:17:47 steve Exp $"
+#endif

 /*
 * This is a simple program to make a dosified copy of the
@@ -48,7 +51,6 @@ int main(int argc, char*argv[])
      ofile = fopen(argv[2], "wb");
      if (ofile == 0) {
 	    fprintf(stderr, "Unable to open %s for output.\n", argv[2]);
-	    fclose(ifile);
 	    return 2;
      }

@@ -62,7 +64,25 @@ int main(int argc, char*argv[])
 	    pr = ch;
      }

-      fclose(ifile);
-      fclose(ofile);
      return 0;
 }
+
+/*
+ * $Log: dosify.c,v $
+ * Revision 1.5  2003/07/15 16:17:47  steve
+ *  Fix spelling of ifdef.
+ *
+ * Revision 1.4  2003/07/15 03:49:22  steve
+ *  Spelling fixes.
+ *
+ * Revision 1.3  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.2  2002/08/11 23:47:04  steve
+ *  Add missing Log and Ident strings.
+ *
+ * Revision 1.1  2001/08/03 17:06:47  steve
+ *  Add install of examples for Windows.
+ *
+ */
+
@@ -0,0 +1,2 @@
+Makefile
+iverilog-vpi.exe
@@ -12,22 +12,23 @@
 #
 #    You should have received a copy of the GNU Library General Public
 #    License along with this program; if not, write to the Free
-#    Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#    Boston, MA 02110-1301, USA.
+#    Software Foundation, Inc.,
+#    59 Temple Place - Suite 330
+#    Boston, MA 02111-1307, USA
+#
+#ident "$Id: Makefile.in,v 1.7.2.1 2006/10/04 17:08:59 steve Exp $"
+#
 #
 SHELL = /bin/sh

-suffix = @install_suffix@
+VERSION = 0.8.3

 prefix = @prefix@
 exec_prefix = @exec_prefix@
 srcdir = @srcdir@
-datarootdir = @datarootdir@

 VPATH = $(srcdir)

-suffix = @install_suffix@
-
 bindir = $(exec_prefix)/bin
 libdir = $(exec_prefix)/lib
 includedir = $(prefix)/include
@@ -36,68 +37,44 @@ mandir = @mandir@
 dllib=@DLLIB@

 CC = @CC@
-WINDRES = @WINDRES@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@

-ifeq (@srcdir@,.)
-INCLUDE_PATH = -I. -I..
-else
-INCLUDE_PATH = -I. -I.. -I$(srcdir) -I$(srcdir)/..
-endif
-
-CPPFLAGS = $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@
-CFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ @CFLAGS@
+CPPFLAGS = @ident_support@ -I. -I$(srcdir)/.. -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@
+CFLAGS = -Wall @CFLAGS@
 LDFLAGS = @LDFLAGS@

-O = main.o res.o
-
 all: iverilog-vpi@EXEEXT@

-check: all
-
 clean:
-	rm -f *.o config.h iverilog-vpi@EXEEXT@ res.rc
+	rm -f *.o
+	rm -f iverilog-vpi@EXEEXT@

 distclean: clean
-	rm -f Makefile config.log
+	rm -f Makefile

-cppcheck: main.c
-	cppcheck --enable=all -f $(INCLUDE_PATH) $^
-
-Makefile: $(srcdir)/Makefile.in ../config.status
-	cd ..; ./config.status --file=driver-vpi/$@
+O = main.o res.o

 iverilog-vpi@EXEEXT@: $O
 	$(CC) $(LDFLAGS) $O -o iverilog-vpi@EXEEXT@ @EXTRALIBS@

-main.o: $(srcdir)/main.c config.h
+
+main.o: main.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/main.c

-
-config.h: $(srcdir)/config.h.in Makefile
-	sed -e 's;@IVLCC@;@CC@;' -e 's;@IVLCXX@;@CXX@;' \
-	    -e 's;@SUFFIX@;$(suffix);g' \
-	    -e 's;@IVLCFLAGS@;$(CFLAGS);' \
-	    -e 's;@SHARED@;@shared@;' $< > $@
-
 # Windows specific...
-res.rc: $(srcdir)/res.rc.in ../version.exe
-	sed -e 's;@PRODUCTVERSION@;'`../version.exe '%M,%m,%n,0'`';' \
-	$(srcdir)/res.rc.in > $@
-
 res.o: res.rc
-	$(WINDRES) -i res.rc -o res.o
+	windres -i res.rc -o res.o
 #

-install: all installdirs $(bindir)/iverilog-vpi$(suffix)@EXEEXT@
+install: all installdirs $(bindir)/iverilog-vpi@EXEEXT@

-$(bindir)/iverilog-vpi$(suffix)@EXEEXT@: ./iverilog-vpi@EXEEXT@
-	$(INSTALL_PROGRAM) ./iverilog-vpi@EXEEXT@ "$(bindir)/iverilog-vpi$(suffix)@EXEEXT@"
+$(bindir)/iverilog-vpi@EXEEXT@: ./iverilog-vpi@EXEEXT@
+	$(INSTALL_PROGRAM) ./iverilog-vpi@EXEEXT@ $(bindir)/iverilog-vpi@EXEEXT@

-installdirs: $(srcdir)/../mkinstalldirs
-	$(srcdir)/../mkinstalldirs "$(bindir)"
+installdirs: ../mkinstalldirs
+	$(srcdir)/../mkinstalldirs $(bindir)

 uninstall:
-	rm -f $(bindir)/iverilog-vpi$(suffix)@EXEEXT@
+	rm -f $(bindir)/iverilog-vpi@EXEEXT@
@@ -1,9 +0,0 @@
-/* For now do not put the Icarus Verilog include or library paths here.
- * They are generated from a registry entry the user must set (-ivl=).
- * This may change in the future once I have thought about it more. */
-#define IVERILOG_VPI_CC        "@IVLCC@"
-#define IVERILOG_VPI_CXX       "@IVLCXX@"
-#define IVERILOG_VPI_CFLAGS    " @IVLCFLAGS@"
-#define IVERILOG_VPI_LDFLAGS   "@SHARED@"
-#define IVERILOG_VPI_LDLIBS    "-lveriuser@SUFFIX@ -lvpi@SUFFIX@"
-#define IVERILOG_SUFFIX        "@SUFFIX@"
@@ -14,7 +14,7 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 /*
@@ -32,28 +32,28 @@

 #include <windows.h>

-static void setup_ivl_environment();
-static void assign(char **ptr, char *str);
+/* Macros used for compiling and linking */

-/* The compile options: compiler, flags, etc. are in here */
-#include "config.h"
+#define IVERILOG_VPI_CC        "gcc"				/* no .exe extension  */
+#define IVERILOG_VPI_CXX       "gcc"				/* no .exe extension  */
+#define IVERILOG_VPI_CFLAGS    "-O"					/* -I appended  later */
+#define IVERILOG_VPI_LD        "gcc"				/* no .exe extension  */
+#define IVERILOG_VPI_LDFLAGS   "-shared -Wl,--enable-auto-image-base"
+#define IVERILOG_VPI_LDLIBS    "-lveriuser -lvpi"	/* -L prepended later */

 /* pointers to global strings */

 static struct global_strings {
-	char *pCCSRC;		/* list of C source files (*.c) */
-	char *pCXSRC;		/* list of C++ source files (*.cc, *.cpp) */
+	char *pCCSRC;		/* list of C source files */
+	char *pCXSRC;		/* list of C++ source files */
 	char *pOBJ;			/* list of object files */
 	char *pLIB;			/* list of library files */
-	char *pINCS;			/* list of include directories */
-	char *pDEFS;			/* list of definitions */
 	char *pOUT;			/* output file name (.vpi extension), if 0 length then no source files specified */
 	char *pMINGW;		/* path to MinGW directory */
 	char *pIVL;			/* path to IVL directory */
 	char *pCFLAGS;		/* CFLAGS option */
 	char *pLDLIBS;		/* LDLIBS option */
 	char *pNewPath;		/* new PATH environment variable setting */
-	char *pLD;		/* what to use for a linker */
 } gstr;


@@ -70,15 +70,12 @@ static void myExit(int exitVal)
 	deInitDynString(gstr.pCXSRC);
 	deInitDynString(gstr.pOBJ);
 	deInitDynString(gstr.pLIB);
-	deInitDynString(gstr.pINCS);
-	deInitDynString(gstr.pDEFS);
 	deInitDynString(gstr.pOUT);
 	deInitDynString(gstr.pMINGW);
 	deInitDynString(gstr.pIVL);
 	deInitDynString(gstr.pCFLAGS);
 	deInitDynString(gstr.pLDLIBS);
 	deInitDynString(gstr.pNewPath);
-	free(gstr.pLD);

 	exit(exitVal);
 }
@@ -87,9 +84,9 @@ static void myExit(int exitVal)

 static void usage()
 {
-	fprintf(stderr,"usage: iverilog-vpi" IVERILOG_SUFFIX " [src and obj files]...\n");
-	fprintf(stderr,"   or  iverilog-vpi" IVERILOG_SUFFIX " -mingw=dir\n");
-	fprintf(stderr,"   or  iverilog-vpi" IVERILOG_SUFFIX " -ivl=dir\n");
+	fprintf(stderr,"usage: iverilog-vpi [--name=name] [-llibrary] [-mingw=dir] [-ivl=dir] sourcefile...\n");
+	fprintf(stderr,"   or  iverilog-vpi -mingw=dir\n");
+	fprintf(stderr,"   or  iverilog-vpi -ivl=dir\n");
 	myExit(1);
 }

@@ -113,16 +110,12 @@ static void init()
 	initDynString(&gstr.pCXSRC);
 	initDynString(&gstr.pOBJ);
 	initDynString(&gstr.pLIB);
-	initDynString(&gstr.pINCS);
-	initDynString(&gstr.pDEFS);
 	initDynString(&gstr.pOUT);
 	initDynString(&gstr.pMINGW);
 	initDynString(&gstr.pIVL);
 	initDynString(&gstr.pCFLAGS);
 	initDynString(&gstr.pLDLIBS);
 	initDynString(&gstr.pNewPath);
-	  /* By default use the C compiler to link the programs. */
-	assign(&gstr.pLD, IVERILOG_VPI_CC);
 }

 /* return true if "str" is terminated with with "end", case insensitive */
@@ -154,15 +147,12 @@ static int startsWith (char *prefix, char *str)

 static void appendn (char **ptr, char *app, int count)
 {
-	char *nptr = (char *) realloc(*ptr, strlen(*ptr) +
-                                            (count?count:strlen(app)) + 1);
+	*ptr = (char *) realloc(*ptr,strlen(*ptr)+(count?count:strlen(app))+1);

-	if (nptr == NULL) {
+	if (*ptr == NULL) {
 		fprintf(stderr,"error: out of memory\n");
-		free(*ptr);
 		myExit(4);
 	}
-	*ptr = nptr;

 	if (count)
 		strncat(*ptr,app,count);
@@ -190,14 +180,12 @@ static void appendBackSlash(char **str)

 static void assignn (char **ptr, char *str, int count)
 {
-	char *nptr = (char *) realloc(*ptr, (count?count:strlen(str)) + 1);
+	*ptr = (char *) realloc(*ptr,(count?count:strlen(str))+1);

-	if (nptr == NULL) {
+	if (*ptr == NULL) {
 		fprintf(stderr,"error: out of memory\n");
-		free(*ptr);
 		myExit(4);
 	}
-	*ptr = nptr;

 	if (count) {
 		strncpy(*ptr,str,count);
@@ -241,9 +229,7 @@ static int GetRegistryKey(char *key, char **value)
 	}
 	regKeyBuffer[regKeySize] = 0;		/* makes sure there is a trailing NULL */

-	/* This needs an unsigned char *, but for MinGW the char is signed. */
-	lrv = RegQueryValueEx(hkKey, key, NULL, &regKeyType,
-	                      (unsigned char *) regKeyBuffer, &regKeySize);
+	lrv = RegQueryValueEx(hkKey,key,NULL,&regKeyType,regKeyBuffer,&regKeySize);
 	if ((lrv != ERROR_SUCCESS) || (regKeyType != REG_SZ) || (!regKeySize)) {
 		lrv = RegCloseKey(hkKey);
 		free(regKeyBuffer);
@@ -276,9 +262,7 @@ static void SetRegistryKey(char *key, char *value)
 		&res) != ERROR_SUCCESS)
 			return;

-	/* This needs an unsigned char *, but for MinGW the char is signed. */
-	RegSetValueEx(hkKey, key, 0, REG_SZ, (unsigned char *) value,
-	              strlen(value)+1);
+	RegSetValueEx(hkKey,key,0,REG_SZ,value,strlen(value)+1);
 	RegCloseKey(hkKey);

 	printf("info:  storing %s in Windows' registry entry\n",value);
@@ -293,124 +277,63 @@ static int parse(int argc, char *argv[])

 	char dot_c_ext[]    = ".c";
 	char dot_cc_ext[]   = ".cc";
-	char dot_cpp_ext[]  = ".cpp";
 	char dot_o_ext[]    = ".o";
 	char name_option[]  = "--name=";
 	char lib_option[]   = "-l";
-	char inc_option[]   = "-I";
 	char mingw_option[] = "-mingw=";
 	char ivl_option[]   = "-ivl=";
-	char def_option[]   = "-D";

-	if (argc == 1) return 0;
+	if (argc == 1)
+		return 0;

 	for (idx=1; idx<argc; ++idx) {
-		  /* Check for C source files (*.c) */
-		if (endsIn(dot_c_ext, argv[idx])) {
+		if (endsIn(dot_c_ext,argv[idx])) {				/* check for C source files */
 			++srcFileCnt;
-			append(&gstr.pCCSRC, argv[idx]);
-			append(&gstr.pCCSRC, " ");
+			append(&gstr.pCCSRC,argv[idx]);
+			append(&gstr.pCCSRC," ");
 			if (!*gstr.pOUT)
-			   assignn(&gstr.pOUT, argv[idx],
-			           strlen(argv[idx])-strlen(dot_c_ext));
+			   assignn(&gstr.pOUT,argv[idx],strlen(argv[idx])-strlen(dot_c_ext));
 		}
-		  /* Check for C++ source files (*.cc) */
-		else if (endsIn(dot_cc_ext, argv[idx])) {
-			  /* We need to link with the C++ compiler. */
-			assign(&gstr.pLD, IVERILOG_VPI_CXX);
+		else if (endsIn(dot_cc_ext,argv[idx])) {		/* check for C++ source files */
 			++srcFileCnt;
-			append(&gstr.pCXSRC, argv[idx]);
-			append(&gstr.pCXSRC, " ");
+			append(&gstr.pCXSRC,argv[idx]);
+			append(&gstr.pCXSRC," ");
 			if (!*gstr.pOUT)
-			   assignn(&gstr.pOUT, argv[idx],
-			           strlen(argv[idx])-strlen(dot_cc_ext));
+			   assignn(&gstr.pOUT,argv[idx],strlen(argv[idx])-strlen(dot_cc_ext));
 		}
-		  /* Check for C++ source files (*.cpp) */
-		else if (endsIn(dot_cpp_ext, argv[idx])) {
-			  /* We need to link with the C++ compiler. */
-			assign(&gstr.pLD, IVERILOG_VPI_CXX);
-			++srcFileCnt;
-			append(&gstr.pCXSRC, argv[idx]);
-			append(&gstr.pCXSRC, " ");
-			if (!*gstr.pOUT)
-			   assignn(&gstr.pOUT, argv[idx],
-			           strlen(argv[idx])-strlen(dot_cpp_ext));
-		}
-		  /* Check for compiled object files */
-		else if (endsIn(dot_o_ext, argv[idx])) {
+		else if (endsIn(dot_o_ext,argv[idx])) {			/* check for compiled object files */
 			++srcFileCnt;
+			append(&gstr.pOBJ,argv[idx]);
 			append(&gstr.pOBJ," ");
-			append(&gstr.pOBJ, argv[idx]);
 			if (!*gstr.pOUT)
-			   assignn(&gstr.pOUT, argv[idx],
-			           strlen(argv[idx])-strlen(dot_o_ext));
+			   assignn(&gstr.pOUT,argv[idx],strlen(argv[idx])-strlen(dot_o_ext));
 		}
-		  /* Check for the -mingw option */
-		else if (startsWith(mingw_option, argv[idx]))
-			assignn(&gstr.pMINGW, argv[idx]+sizeof(mingw_option)-1,
-			        strlen(argv[idx])-(sizeof(mingw_option)-1));
-		  /* Check for the -ivl   option */
-		else if (startsWith(ivl_option, argv[idx]))
-			assignn(&gstr.pIVL, argv[idx]+sizeof(ivl_option)-1,
-			        strlen(argv[idx])-(sizeof(ivl_option)-1));
-		  /* Check for the --name option */
-		else if (startsWith(name_option, argv[idx])) {
-			assignn(&gstr.pOUT, argv[idx]+sizeof(name_option)-1,
-			        strlen(argv[idx])-(sizeof(name_option)-1));
+		else if (startsWith(name_option,argv[idx])) {	/* check for --name option */
+			assignn(&gstr.pOUT,argv[idx]+sizeof(name_option)-1,strlen(argv[idx])-(sizeof(name_option)-1));
 		}
-		  /* Check for the -l option */
-		else if (startsWith(lib_option, argv[idx])) {
-			append(&gstr.pLIB, " ");
-			append(&gstr.pLIB, argv[idx]);
+		else if (startsWith(lib_option,argv[idx])) {	/* check for -l option */
+			append(&gstr.pLIB,argv[idx]);
+			append(&gstr.pLIB," ");
 		}
-		  /* Check for the -I option */
-		else if (startsWith(inc_option, argv[idx])) {
-			append(&gstr.pINCS, " ");
-			append(&gstr.pINCS, argv[idx]);
-		}
-		  /* Check for the -D option */
-		else if (startsWith(def_option, argv[idx])) {
-			append(&gstr.pDEFS, " ");
-			append(&gstr.pDEFS, argv[idx]);
-		}
-		  /* Check for the --cflags option */
-		else if (stricmp("--cflags", argv[idx]) == 0) {
-			setup_ivl_environment();
-			printf("%s\n", gstr.pCFLAGS);
-			myExit(0);
-		}
-		  /* Check for the --ldflags option */
-		else if (stricmp("--ldflags", argv[idx]) == 0) {
-			printf("%s\n", IVERILOG_VPI_LDFLAGS);
-			myExit(0);
-		}
-		  /* Check for the --ldlibs option */
-		else if (stricmp("--ldlibs", argv[idx]) == 0) {
-			setup_ivl_environment();
-			printf("%s\n", gstr.pLDLIBS);
-			myExit(0);
-		}
-		  /* Check for the --install-dir option */
-		else if (stricmp("--install-dir", argv[idx]) == 0) {
-			setup_ivl_environment();
-			printf("%s\\\\lib\\\\ivl" IVERILOG_SUFFIX "\\\\.\n", gstr.pIVL);
-			myExit(0);
-		}
-		  /* This is different than iverilog-vpi.sh, we don't
-		   * ignore unknown arguments */
-		else return 0;
+		else if (startsWith(mingw_option,argv[idx]))	/* check for -mingw option */
+			assignn(&gstr.pMINGW,argv[idx]+sizeof(mingw_option)-1,strlen(argv[idx])-(sizeof(mingw_option)-1));
+		else if (startsWith(ivl_option,argv[idx]))		/* check for -ivl   option */
+			assignn(&gstr.pIVL,argv[idx]+sizeof(ivl_option)-1,strlen(argv[idx])-(sizeof(ivl_option)-1));
+		else
+			return 0;	/* different from iverilog-vpi.sh, we don't ignore accept arguments */
 	}

-	  /* In case there is a --name without source/object files */
-	if (0 == srcFileCnt) assign(&gstr.pOUT,"");
+	if (0 == srcFileCnt)
+		assign(&gstr.pOUT,"");				/* in case they used --name with no source files */

-	  /* Normally it's an error if there are no source or object files */
-	  /* Unless we are setting the IVL or MinGW registry entries */
-	if (!*gstr.pOUT) {
-		if (!*gstr.pMINGW && !*gstr.pIVL) return 0;
-	} else
-		  /* We have a valid result file so add the .vpi extension */
-		append(&gstr.pOUT, ".vpi");
+	if (!*gstr.pOUT) {						/* normally it's an error if there are no *.c,*.cc,*.o files */
+		if (!*gstr.pMINGW && !*gstr.pIVL)	/* unless they are just setting the IVL or MinGW registry entries */
+			usage();
+	}
+	else {
+		append(&gstr.pOUT,".vpi");			/* the result file should have a .vpi extension */
+		append(&gstr.pOUT," ");
+	}

 	return 1;
 }
@@ -422,18 +345,11 @@ static void checkMingwDir(char *root)
 	int irv;
 	struct _stat stat_buf;

-	char *path, *comp, *cp;
+	char *path;
 	initDynString(&path);
 	assign(&path,gstr.pMINGW);
 	appendBackSlash(&path);
-	append(&path,"bin\\");
-	/* Get just the compiler name (the first word) */
-	comp = strdup(IVERILOG_VPI_CC);
-	cp = strchr(comp, ' ');
-	if (cp != NULL) *cp = '\0';
-        append(&path, comp);
-	append(&path,".exe");
-        free(comp);
+	append(&path,"bin\\" IVERILOG_VPI_CC ".exe");

 	irv = _stat(path,&stat_buf);
 	deInitDynString(path);
@@ -460,14 +376,14 @@ static void checkIvlDir(char *root)
 	initDynString(&path);
 	assign(&path,gstr.pIVL);
 	appendBackSlash(&path);
-	append(&path,"bin\\vvp" IVERILOG_SUFFIX ".exe");
+	append(&path,"bin\\vvp.exe");

 	irv = _stat(path,&stat_buf);
 	deInitDynString(path);

 	if (irv) {
 		fprintf(stderr,"error: %s does not appear to be the valid root directory of\n",root);
-		fprintf(stderr,"       Icarus Verilog.  Use the -ivl option of iverilog-vpi" IVERILOG_SUFFIX " to\n");
+		fprintf(stderr,"       Icarus Verilog.  Use the -ivl option of iverilog-vpi.exe to\n");
 		fprintf(stderr,"       point to the Icarus Verilog root directory.  For a Windows\n");
 		fprintf(stderr,"       command shell the option would be something like -ivl=c:\\iverilog\n");
 		fprintf(stderr,"       For a Cygwin shell the option would be something like\n");
@@ -487,7 +403,9 @@ static void setup_mingw_environment()
 	if (*gstr.pMINGW) {
 		checkMingwDir(gstr.pMINGW);
 		SetRegistryKey(IVL_REGKEY_MINGW,gstr.pMINGW);
-	} else if (!GetRegistryKey(IVL_REGKEY_MINGW,&gstr.pMINGW)) {
+	}
+	else
+		if (!GetRegistryKey(IVL_REGKEY_MINGW,&gstr.pMINGW)) {
 			fprintf(stderr,"error: can not locate the MinGW root directory, use the -mingw option of\n");
 			fprintf(stderr,"       iverilog-vpi.exe to point to the MinGW root directory.  For\n");
 			fprintf(stderr,"       a Windows command shell the option would be something like\n");
@@ -496,16 +414,13 @@ static void setup_mingw_environment()
 			myExit(5);
 		}

-	  /* Create new path with MinGW in it */
-	assign(&gstr.pNewPath,"PATH=");
+	assign(&gstr.pNewPath,"PATH=");			/* create new path */
 	append(&gstr.pNewPath,gstr.pMINGW);
 	appendBackSlash(&gstr.pNewPath);
-	append(&gstr.pNewPath, "\\");
 	append(&gstr.pNewPath,"bin;");
 	append(&gstr.pNewPath,pOldPATH);

-	  /* Place new path in environment */
-	_putenv(gstr.pNewPath);
+	_putenv(gstr.pNewPath);					/* place new path in environment variable */
 }

 /* see if we can find iverilog root */
@@ -517,73 +432,67 @@ static void setup_ivl_environment()
 	if (*gstr.pIVL) {
 		checkIvlDir(gstr.pIVL);
 		SetRegistryKey(IVL_REGKEY_IVL,gstr.pIVL);
-	} else if (!GetRegistryKey(IVL_REGKEY_IVL,&gstr.pIVL)) {
+	}
+	else
+		if (!GetRegistryKey(IVL_REGKEY_IVL,&gstr.pIVL)) {
 			fprintf(stderr,"error: can not locate the Icarus Verilog root directory, use the -ivl option\n");
-			fprintf(stderr,"       of iverilog-vpi" IVERILOG_SUFFIX " to point to the Icarus Verilog root directory.\n");
+			fprintf(stderr,"       of iverilog-vpi.exe to point to the Icarus Verilog root directory.\n");
 			fprintf(stderr,"       For a Windows command shell the option would be something like\n");
 			fprintf(stderr,"       -ivl=c:\\iverilog  For a Cygwin shell the option would be something\n");
 			fprintf(stderr,"       like -ivl=c:\\\\iverilog\n");
 			myExit(6);
 		}

-	  /* Build up the CFLAGS option string */
-	assign(&gstr.pCFLAGS,IVERILOG_VPI_CFLAGS " -I\"");
+	/* build up the CFLAGS option string */
+
+	assign(&gstr.pCFLAGS,IVERILOG_VPI_CFLAGS);
+	append(&gstr.pCFLAGS," -I");
 	append(&gstr.pCFLAGS,gstr.pIVL);
 	appendBackSlash(&gstr.pCFLAGS);
-	append(&gstr.pCFLAGS,"\\include\\\\iverilog\"" IVERILOG_SUFFIX);
+	append(&gstr.pCFLAGS,"include");

-	  /* Build up the LDFLAGS option string */
-	assign(&gstr.pLDLIBS,"-L\"");
+	/* build up the LDFLAGS option string */
+
+	assign(&gstr.pLDLIBS,"-L");
 	append(&gstr.pLDLIBS,gstr.pIVL);
 	appendBackSlash(&gstr.pLDLIBS);
-	append(&gstr.pLDLIBS,"\\lib\" " IVERILOG_VPI_LDLIBS);
+	append(&gstr.pLDLIBS,"lib ");
+	append(&gstr.pLDLIBS,IVERILOG_VPI_LDLIBS);
 }

 /* compile source modules */

-static void compile(char *pSource, char **pObject, int *compile_errors, char *compiler)
+static void compile(char *pSource, char **pObject, char *ext, int *compile_errors, char *compiler)
 {
 	char *ptr1 = pSource;
-	char *ptr2 = strchr(ptr1, ' ');
-	char *buf=0, *src=0, *obj=0;
+	char *ptr2 = strchr(pSource,' ');
+	char *buf=0,*src=0,*obj=0;

 	while (ptr2) {
 		int len = ptr2 - ptr1;
-		char *ostart;
-		int olen;
-		assignn(&src, ptr1, len);
+		assignn(&src,ptr1,len);

-		  /* Build the object file name */
-		ostart = strrchr(ptr1, '/');
-		if (ostart == NULL) ostart = ptr1;
-		else ostart += 1;
-		olen = strrchr(ptr1, '.') - ostart;
-		assignn(&obj, ostart, olen);
-		append(&obj, ".o");
+		assignn(&obj,ptr1,len-strlen(ext));		/* strip off the extension */
+		append (&obj,".o");

-		  /* Build the compile line */
-		assign(&buf, compiler);
-		append(&buf, " -c -o ");
-		append(&buf, obj);
-		append(&buf, " ");
-		append(&buf, gstr.pDEFS);
-		append(&buf, " ");
-		append(&buf, gstr.pCFLAGS);
-		append(&buf, " ");
-		append(&buf, gstr.pINCS);
-		append(&buf, " ");
-		append(&buf, src);
+		assign (&buf,compiler);
+		append (&buf," -c -o ");
+		append (&buf,obj);
+		append (&buf," ");
+		append (&buf,gstr.pCFLAGS);
+		append (&buf," ");
+		append (&buf,src);

-		append (pObject, " ");
-		append (pObject, obj);
+		append (pObject,obj);
+		append (pObject," ");

-		printf("Compiling %s...\n", src);
+		printf("%s\n",buf);

-		if (system(buf)) ++*compile_errors;
+		if (system(buf))
+			++*compile_errors;

-		  /* advance to next token */
-		ptr1 = ptr2 + 1;
-		ptr2 = strchr(ptr1, ' ');
+		ptr1 = ptr2 + 1;					/* advance to next token */
+		ptr2 = strchr(ptr1,' ');
 	}

 	free(buf);
@@ -598,44 +507,43 @@ static void compile_and_link()
 	char *buf=0;
 	int iRet, compile_errors = 0;

-	  /* To make the output match iverilog-vpi.sh do not print out the
-	   * root directories */
+	/* print out the mingw and ivl directories to help the user debug problems */

-//	printf("MinGW root directory:  %s.\n", gstr.pMINGW);
+	printf("info:  %s will be used as the MinGW root directory.\n",gstr.pMINGW);
 	checkMingwDir(gstr.pMINGW);

-//	printf("Icarus Verilog root directory:  %s.\n", gstr.pIVL);
+	printf("info:  %s will be used as the Icarus Verilog root directory.\n",gstr.pIVL);
 	checkIvlDir(gstr.pIVL);

-	  /* compile the C source files (*.c) */
-	compile(gstr.pCCSRC, &gstr.pOBJ, &compile_errors, IVERILOG_VPI_CC );
-	  /* compile the C++ source files (*.cc, *.cpp) */
-	compile(gstr.pCXSRC, &gstr.pOBJ, &compile_errors, IVERILOG_VPI_CXX);
+	/* compile */
+
+	compile(gstr.pCCSRC,&gstr.pOBJ,".c" ,&compile_errors,IVERILOG_VPI_CC );		/* compile the C   source files */
+	compile(gstr.pCXSRC,&gstr.pOBJ,".cc",&compile_errors,IVERILOG_VPI_CXX);		/* compile the C++ source files */

 	if (compile_errors) {
-		fprintf(stderr,"iverilog-vpi: %d file(s) failed to compile.\n",
-		        compile_errors);
+		fprintf(stderr,"iverilog-vpi: Some %d files failed to compile.\n",compile_errors);
 		myExit(2);
 	}

-	  /* link */
-	assign(&buf, gstr.pLD);
-	append(&buf, " -o ");
-	append(&buf, gstr.pOUT);
-	append(&buf, " ");
-	append(&buf, IVERILOG_VPI_LDFLAGS);
-	append(&buf, " ");
-	append(&buf, gstr.pOBJ);
-	append(&buf, " ");
-	append(&buf, gstr.pLIB);
-	append(&buf, " ");
-	append(&buf, gstr.pLDLIBS);
+	/* link */

-	printf("Making %s from %s...\n", gstr.pOUT,gstr.pOBJ);
+	assign(&buf,IVERILOG_VPI_LD);
+	append(&buf," -o ");
+	append(&buf,gstr.pOUT);				/* has a trailing space */
+	append(&buf,IVERILOG_VPI_LDFLAGS);
+	append(&buf," ");
+	append(&buf,gstr.pOBJ)				/* has a trailing space */;
+	append(&buf,gstr.pLIB);				/* has a trailing space */
+	append(&buf,gstr.pLDLIBS);
+
+	printf("%s\n",buf);

 	iRet = system(buf);
+
 	free(buf);
-	if (iRet) myExit(3);
+
+	if (iRet)
+		myExit(3);
 }

 /* program execution starts here */
@@ -644,13 +552,14 @@ int main(int argc, char *argv[])
 {
 	init();

-	if (!parse(argc,argv)) usage();
+	if (!parse(argc,argv))
+		usage();

 	setup_mingw_environment();
 	setup_ivl_environment();

-	  /* are there any source or object files specified */
-	if (*gstr.pOUT) compile_and_link();
+	if (*gstr.pOUT)				/* are there any *.c,*.cc,*.o files specified */
+		compile_and_link();

 	myExit(0);
 	return 0; // eliminate warnings.
@@ -10,7 +10,7 @@ LANGUAGE 9, 4

 1 VERSIONINFO
 FILEVERSION 2002,11,13,0
- PRODUCTVERSION @PRODUCTVERSION@
+ PRODUCTVERSION 0,7,0,0
 FILEFLAGSMASK 0x3fL
 FILEFLAGS 0x2L
 FILEOS 0x40004L
@@ -28,7 +28,7 @@ BEGIN
            VALUE "LegalCopyright", "Copyright 2002 Gus Baldauf\0"
            VALUE "OriginalFilename", "iverilog-vpi.exe\0"
            VALUE "ProductName", "Icarus Verilog\0"
-            VALUE "ProductVersion", "@PRODUCTVERSION@\0"
+            VALUE "ProductVersion", "0, 7, 0, 0\0"
        END
    END
    BLOCK "VarFileInfo"
@@ -0,0 +1,15 @@
+a.out
+Makefile
+parse.c
+parse.h
+parse.output
+lexor.c
+cfparse.c
+cfparse.h
+cfparse.output
+cflexor.c
+foo.*
+iverilog
+iverilog.ps
+iverilog.pdf
+tmp.pdf
@@ -12,17 +12,20 @@
 #
 #    You should have received a copy of the GNU Library General Public
 #    License along with this program; if not, write to the Free
-#    Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#    Boston, MA 02110-1301, USA.
+#    Software Foundation, Inc.,
+#    59 Temple Place - Suite 330
+#    Boston, MA 02111-1307, USA
+#
+#ident "$Id: Makefile.in,v 1.24.2.2 2006/05/08 04:33:35 steve Exp $"
+#
 #
 SHELL = /bin/sh

-suffix = @install_suffix@
+VERSION = 0.8

 prefix = @prefix@
 exec_prefix = @exec_prefix@
 srcdir = @srcdir@
-datarootdir = @datarootdir@

 VPATH = $(srcdir)

@@ -37,112 +40,80 @@ CC = @CC@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
-LEX = @LEX@
-YACC = @YACC@
 MAN = @MAN@
 PS2PDF = @PS2PDF@

-ifeq (@srcdir@,.)
-INCLUDE_PATH = -I. -I..
-else
-INCLUDE_PATH = -I. -I.. -I$(srcdir) -I$(srcdir)/..
-endif
-
-CPPFLAGS = $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@
-CFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ @CFLAGS@
+CPPFLAGS = @ident_support@ -I. -I.. -I$(srcdir)/.. -I$(srcdir) -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@
+CFLAGS = -Wall @CFLAGS@
 LDFLAGS = @LDFLAGS@

-O = main.o substit.o cflexor.o cfparse.o
-
-all: dep iverilog@EXEEXT@ iverilog.man
-
-check: all
+all: iverilog@EXEEXT@

 clean:
-	rm -f *.o cflexor.c cfparse.c cfparse.h cfparse.output
-	rm -f iverilog@EXEEXT@ iverilog.man iverilog.pdf iverilog.ps
-	rm -rf dep
+	rm -f *.o lexor.c parse.c parse.h parse.output
+	rm -f cflexor.c cfparse.c cfparse.h cfparse.output
+	rm -f iverilog@EXEEXT@

 distclean: clean
-	rm -f Makefile config.log
+	rm -f Makefile
+	rm -rf autom4te.cache

-cppcheck: $(O:.o=.c)
-	cppcheck --enable=all -f \
-	         -UYY_USER_INIT \
-	         -UYYPARSE_PARAM -UYYPRINT -Ushort -Uyyoverflow \
-	         -UYYTYPE_INT8 -UYYTYPE_INT16 -UYYTYPE_UINT8 -UYYTYPE_UINT16 \
-	         $(INCLUDE_PATH) $^
-
-Makefile: $(srcdir)/Makefile.in ../config.status
-	cd ..; ./config.status --file=driver/$@
-
-dep:
-	mkdir dep
+O = main.o substit.o cflexor.o cfparse.o

 iverilog@EXEEXT@: $O
 	$(CC) $(LDFLAGS) $O -o iverilog@EXEEXT@ @EXTRALIBS@

-cflexor.c: $(srcdir)/cflexor.lex
-	$(LEX) -s -t $< > $@
+cflexor.c: cflexor.lex
+	flex -s -Pcf -ocflexor.c $(srcdir)/cflexor.lex

-# Build this in two steps to avoid parallel build issues (see pr3462585)
-cfparse.c: $(srcdir)/cfparse.y
-	$(YACC) --verbose -t -p cf -d -o $@ $<
-cfparse.h: cfparse.c
+cfparse.h cfparse.c: cfparse.y
+	bison --verbose -t -d -o cfparse.c --name-prefix=cf $(srcdir)/cfparse.y

-%.o: %.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
-	mv $*.d dep

-main.o: main.c globals.h $(srcdir)/../version_base.h ../version_tag.h Makefile
-	$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c -DIVL_ROOT='"@libdir@/ivl$(suffix)"' -DIVL_SUFFIX='"$(suffix)"' -DIVL_INC='"@includedir@"' -DIVL_LIB='"@libdir@"' -DDLLIB='"@DLLIB@"' $(srcdir)/main.c
-	mv $*.d dep
+main.o: main.c globals.h
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -DIVL_ROOT='"@libdir@/ivl"'  -DIVL_INC='"@includedir@"' -DIVL_LIB='"@libdir@"' -DDLLIB='"@DLLIB@"' $(srcdir)/main.c

-cflexor.o: cflexor.c cfparse.h
+build_string.o: build_string.c globals.h
+cflexor.o: cflexor.c cfparse.h cfparse_misc.h globals.h
+cfparse.o: cfparse.c globals.h cfparse_misc.h

-iverilog.man: $(srcdir)/iverilog.man.in ../version.exe
-	../version.exe `head -1 $(srcdir)/iverilog.man.in`'\n' > $@
-	tail -n +2 $(srcdir)/iverilog.man.in >> $@
-
-iverilog.ps: iverilog.man
-	$(MAN) -t ./iverilog.man > iverilog.ps
+iverilog.ps: $(srcdir)/iverilog.man
+	$(MAN) -t $(srcdir)/iverilog.man > iverilog.ps

 iverilog.pdf: iverilog.ps
 	$(PS2PDF) iverilog.ps iverilog.pdf

-ifeq (@MINGW32@,yes)
+ifeq (@WIN32@,yes)
 ifeq ($(MAN),none)
-INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1
+INSTALL_DOC = $(mandir)/man1/iverilog.1
 else
 ifeq ($(PS2PDF),none)
-INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1
+INSTALL_DOC = $(mandir)/man1/iverilog.1
 else
-INSTALL_DOC = $(prefix)/iverilog$(suffix).pdf $(mandir)/man1/iverilog$(suffix).1
+INSTALL_DOC = $(prefix)/iverilog.pdf $(mandir)/man1/iverilog.1
 all: iverilog.pdf
 endif
 endif
 INSTALL_DOCDIR = $(mandir)/man1
 else
-INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1
+INSTALL_DOC = $(mandir)/man1/iverilog.1
 INSTALL_DOCDIR = $(mandir)/man1
 endif

-install: all installdirs $(bindir)/iverilog$(suffix)@EXEEXT@ $(INSTALL_DOC)
+install: all installdirs $(bindir)/iverilog@EXEEXT@ $(INSTALL_DOC)

-$(bindir)/iverilog$(suffix)@EXEEXT@: ./iverilog@EXEEXT@
-	$(INSTALL_PROGRAM) ./iverilog@EXEEXT@ "$(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@"
+$(bindir)/iverilog@EXEEXT@: ./iverilog@EXEEXT@
+	$(INSTALL_PROGRAM) ./iverilog@EXEEXT@ $(bindir)/iverilog@EXEEXT@

-$(mandir)/man1/iverilog$(suffix).1: iverilog.man
-	$(INSTALL_DATA) iverilog.man "$(DESTDIR)$(mandir)/man1/iverilog$(suffix).1"
+$(mandir)/man1/iverilog.1: $(srcdir)/iverilog.man
+	$(INSTALL_DATA) $(srcdir)/iverilog.man $(mandir)/man1/iverilog.1

-$(prefix)/iverilog$(suffix).pdf: iverilog.pdf
-	$(INSTALL_DATA) iverilog.pdf "$(DESTDIR)$(prefix)/iverilog$(suffix).pdf"
+$(prefix)/iverilog.pdf: iverilog.pdf
+	$(INSTALL_DATA) iverilog.pdf $(prefix)/iverilog.pdf

-installdirs: $(srcdir)/../mkinstalldirs
-	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(INSTALL_DOCDIR)"
+installdirs: ../mkinstalldirs
+	$(srcdir)/../mkinstalldirs $(bindir) $(INSTALL_DOCDIR)

 uninstall:
-	rm -f "$(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@"
-	rm -f "$(DESTDIR)$(mandir)/man1/iverilog$(suffix).1" "$(DESTDIR)$(prefix)/iverilog$(suffix).pdf"
-
-include $(patsubst %.o, dep/%.d, $O)
+	rm -f $(bindir)/iverilog@EXEEXT@
+	rm -f $(mandir)/man1/iverilog.1
@@ -1,10 +1,7 @@
-%option prefix="cf"
-%option nounput
-%option noinput

 %{
 /*
- * Copyright (c) 2001-2014 Stephen Williams ([email protected])
+ * Copyright (c) 2001 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -19,48 +16,45 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: cflexor.lex,v 1.8 2004/10/04 01:10:56 steve Exp $"
+#endif

 # include  "cfparse.h"
 # include  "cfparse_misc.h"
 # include  "globals.h"
 # include  <string.h>

-static int comment_enter;
-static char* trim_trailing_white(char*txt, int trim);
-
 /*
- * Mostly copied from the flex manual. Do not make this arbitrary
- * depth without checking for looping files.
+ * Lexical location information is passed in the yylloc variable to th
+ * parser. The file names, strings, are kept in a list so that I can
+ * re-use them. The set_file_name function will return a pointer to
+ * the name as it exists in the list (and delete the passed string.)
+ * If the name is new, it will be added to the list.
 */
-#define MAX_CMDFILE_DEPTH 15
+YYLTYPE yylloc;

-typedef struct t_cmdfile {
-      char *cmdfile;
-      YY_BUFFER_STATE buffer;
-} s_cmdfile;
-s_cmdfile cmdfile_stack[MAX_CMDFILE_DEPTH];
-int cmdfile_stack_ptr = 0;
+static int comment_enter;

 %}

 %x CCOMMENT
 %x LCOMMENT
 %x PLUS_ARGS
-%x FILE_NAME

 %%

  /* Accept C++ style comments. */
 "//".* { comment_enter = YY_START; BEGIN(LCOMMENT); }
 <LCOMMENT>.    { yymore(); }
-<LCOMMENT>\n   { cflloc.first_line += 1; BEGIN(comment_enter); }
+<LCOMMENT>\n   { yylloc.first_line += 1; BEGIN(comment_enter); }

  /* Accept C style comments. */
 "/*" { comment_enter = YY_START; BEGIN(CCOMMENT); }
 <CCOMMENT>.    { yymore(); }
-<CCOMMENT>\n   { cflloc.first_line += 1; yymore(); }
+<CCOMMENT>\n   { yylloc.first_line += 1; yymore(); }
 <CCOMMENT>"*/" { BEGIN(comment_enter); }

  /* Accept shell type comments. */
@@ -69,30 +63,19 @@ int cmdfile_stack_ptr = 0;
  /* Skip white space. */
 [ \t\f\r] { ; }
  /* Skip line ends, but also count the line. */
-\n { cflloc.first_line += 1; }
+\n { yylloc.first_line += 1; }


 "+define+" { BEGIN(PLUS_ARGS); return TOK_DEFINE; }

 "+incdir+" { BEGIN(PLUS_ARGS); return TOK_INCDIR; }

-"+integer-width+" { BEGIN(PLUS_ARGS); return TOK_INTEGER_WIDTH; }
-
 "+libdir+" { BEGIN(PLUS_ARGS); return TOK_LIBDIR; }

 "+libdir-nocase+" { BEGIN(PLUS_ARGS); return TOK_LIBDIR_NOCASE; }

 "+libext+" { BEGIN(PLUS_ARGS); return TOK_LIBEXT; }

-"+parameter+" { BEGIN(PLUS_ARGS); return TOK_PARAMETER; }
-
-"+timescale+" { BEGIN(PLUS_ARGS); return TOK_TIMESCALE; }
-
-"+vhdl-work+" { BEGIN(PLUS_ARGS); return TOK_VHDL_WORK; }
-
-"+vhdl-libdir+" { BEGIN(PLUS_ARGS); return TOK_VHDL_LIBDIR; }
-
-"+width-cap+" { BEGIN(PLUS_ARGS); return TOK_WIDTH_CAP; }

  /* If it is not any known plus-flag, return the generic form. */
 "+"[^\n \t\b\f\r+]* {
@@ -114,16 +97,12 @@ int cmdfile_stack_ptr = 0;
 <PLUS_ARGS>[ \t\b\f\r] { BEGIN(0); }

 <PLUS_ARGS>\n {
-      cflloc.first_line += 1;
+      yylloc.first_line += 1;
      BEGIN(0); }

  /* Notice the -a flag. */
 "-a" { return TOK_Da; }

-  /* Notice the -c or -f flag. */
-"-c" { return TOK_Dc; }
-"-f" { return TOK_Dc; }
-
  /* Notice the -v flag. */
 "-v" { return TOK_Dv; }

@@ -133,127 +112,26 @@ int cmdfile_stack_ptr = 0;
  /* This rule matches paths and strings that may be file names. This
     is a little bit tricky, as we don't want to mistake a comment for
     a string word. */
-"/"[\r\n] { /* Special case of file name "/" */
-      cflval.text = trim_trailing_white(yytext, 0);
-      return TOK_STRING; }
-"/"[^\*\/] { /* A file name that starts with "/". */
-      yymore();
-      BEGIN(FILE_NAME); }
-[^/\n \t\b\r+-][^/\n\r]* { /* A file name that starts with other than "/" */
-      yymore();
-      BEGIN(FILE_NAME); }
+"/"[^\*\/].* { cflval.text = strdup(yytext);
+               return TOK_STRING; }

-<FILE_NAME>"//" {
-	/* Found a trailing comment. Returning the terminated name. */
-      cflval.text = trim_trailing_white(yytext, 2);
-      BEGIN(LCOMMENT);
-      return TOK_STRING; }
-<FILE_NAME>"/"?[^/\n\r]* {
-      yymore();
-      /* not a comment... continuing */; }
-<FILE_NAME>[\n\r] {
-	/* No trailing comment. Return the file name. */
-      cflval.text = trim_trailing_white(yytext, 0);
-      BEGIN(0);
-      return TOK_STRING; }
+[^/\n \t\b\r+-].* { cflval.text = strdup(yytext);
+                   return TOK_STRING; }

  /* Fallback match. */
 . { return yytext[0]; }

-  /* At the end of file switch back to the previous buffer. */
-<<EOF>> {
-      if (--cmdfile_stack_ptr < 0) {
-	    free(current_file);
-	    yyterminate();
-      } else {
-	    yy_delete_buffer(YY_CURRENT_BUFFER);
-	    yy_switch_to_buffer(cmdfile_stack[cmdfile_stack_ptr].buffer);
-	    free(current_file);
-	    current_file = cmdfile_stack[cmdfile_stack_ptr].cmdfile;
-      } }
-
 %%

-static char* trim_trailing_white(char*text, int trim)
-{
-      char*cp = text + strlen(text);
-      while (cp > text && trim > 0) {
-	    trim -= 1;
-	    cp -= 1;
-	    *cp = 0;
-      }
-      while (cp > text && strchr("\n\r\t\b", cp[-1]))
-	    cp -= 1;
-
-      cp[0] = 0;
-      return strdup(text);
-}
-
 int yywrap()
 {
      return 1;
 }

-void switch_to_command_file(const char *file)
-{
-      char path[4096];
-
-      if (cmdfile_stack_ptr >= MAX_CMDFILE_DEPTH) {
-	    fprintf(stderr, "Error: command files nested too deeply (%d) "
-                    "at %s:%d.\n", MAX_CMDFILE_DEPTH, current_file,
-                    cflloc.first_line);
-	    exit(1);
-      }
-
-      cmdfile_stack[cmdfile_stack_ptr].buffer = YY_CURRENT_BUFFER;
-      cmdfile_stack[cmdfile_stack_ptr].cmdfile = current_file;
-      cmdfile_stack_ptr += 1;
-
-        /*
-         * If this is a relative file then add the current path to the
-         * file name.
-         */
-      if (file[0] != '/') {
-	    char *cp;
-	    strcpy(path, current_file);
-	    cp = strrchr(path, '/');
-	    if (cp == 0) strcpy(path, file);  /* A base file. */
-	    else {
-	          *(cp+1) = '\0';
-	          strcat(path, file);
-	    }
-      } else strcpy(path, file);  /* An absolute path. */
-
-      yyin = fopen(path, "r");
-      if (yyin == NULL) {
-	    fprintf(stderr, "Error: unable to read nested command file (%s) "
-                    "at %s:%d.\n", path, current_file, cflloc.first_line);
-	    exit(1);
-      }
-
-      current_file = strdup(path);
-      yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
-      cflloc.first_line = 1;
-}
-
 void cfreset(FILE*fd, const char*path)
 {
      yyin = fd;
      yyrestart(fd);
-      current_file = strdup(path);
-      cflloc.first_line = 1;
-}
-
-/*
- * Modern version of flex (>=2.5.9) can clean up the scanner data.
- */
-void destroy_lexor(void)
-{
-# ifdef FLEX_SCANNER
-#   if YY_FLEX_MAJOR_VERSION >= 2 && YY_FLEX_MINOR_VERSION >= 5
-#     if defined(YY_FLEX_SUBMINOR_VERSION) && YY_FLEX_SUBMINOR_VERSION >= 9
-    yylex_destroy();
-#     endif
-#   endif
-# endif
+      yylloc.first_line = 1;
+      yylloc.text = (char*)path;
 }
@@ -1,6 +1,6 @@
 %{
 /*
- * Copyright (c) 2001-2014 Stephen Williams ([email protected])
+ * Copyright (c) 20001 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -15,16 +15,18 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: cfparse.y,v 1.10 2003/09/26 21:25:58 steve Exp $"
+#endif
+

 # include  "globals.h"
 # include  "cfparse_misc.h"
 # include  <ctype.h>
 # include  <stdlib.h>
-# include  <stdio.h>
 # include  <string.h>
-# include "ivl_alloc.h"


 /*
@@ -39,13 +41,13 @@ static void translate_file_name(char*text)
 	    break;
 	  case 1:
 	    while (*text) {
-		  *text = toupper((int)*text);
+		  *text = toupper(*text);
 		  text += 1;
 	    }
 	    break;
 	  case 2:
 	    while (*text) {
-		  *text = tolower((int)*text);
+		  *text = tolower(*text);
 		  text += 1;
 	    }
 	    break;
@@ -58,10 +60,8 @@ static void translate_file_name(char*text)
      char*text;
 };

-%token TOK_Da TOK_Dc TOK_Dv TOK_Dy
-%token TOK_DEFINE TOK_INCDIR TOK_INTEGER_WIDTH TOK_LIBDIR TOK_LIBDIR_NOCASE
-%token TOK_LIBEXT TOK_PARAMETER TOK_TIMESCALE TOK_VHDL_WORK TOK_VHDL_LIBDIR
-%token TOK_WIDTH_CAP
+%token TOK_Da TOK_Dv TOK_Dy
+%token TOK_DEFINE TOK_INCDIR TOK_LIBDIR TOK_LIBDIR_NOCASE TOK_LIBEXT
 %token <text> TOK_PLUSARG TOK_PLUSWORD TOK_STRING

 %%
@@ -83,7 +83,7 @@ item
 	: TOK_STRING
 		{ char*tmp = substitutions($1);
 		  translate_file_name(tmp);
-		  process_file_name(tmp, 0);
+		  process_file_name(tmp);
 		  free($1);
 		  free(tmp);
 		}
@@ -92,23 +92,15 @@ item

        | TOK_Da { }

-  /* Match a -c <cmdfile> or -f <cmdfile> */
-
-        | TOK_Dc TOK_STRING
-		{ char*tmp = substitutions($2);
-		  translate_file_name(tmp);
-		  switch_to_command_file(tmp);
-		  free($2);
-		  free(tmp);
-		}
-
  /* The -v <libfile> flag is ignored, and the <libfile> is processed
     as an ordinary source file. */

        | TOK_Dv TOK_STRING
 		{ char*tmp = substitutions($2);
 		  translate_file_name(tmp);
-		  process_file_name(tmp, 1);
+		  process_file_name(tmp);
+		  fprintf(stderr, "%s:%u: Ignoring -v in front of %s\n",
+			  @1.text, @1.first_line, $2);
 		  free($2);
 		  free(tmp);
 		}
@@ -138,41 +130,11 @@ item
 		  free(tmp);
 		}

-        | TOK_PARAMETER TOK_PLUSARG
-                { char*tmp = substitutions($2);
-		  process_parameter(tmp);
-		  free($2);
-		  free(tmp);
-		}
-
-  /* The +timescale token is used to set the default timescale for
-     the simulator. */
-        | TOK_TIMESCALE TOK_PLUSARG
-                { char*tmp = substitutions($2);
-		  process_timescale(tmp);
-		  free($2);
-		  free(tmp);
-		}
-
 	| TOK_DEFINE TOK_PLUSARG
 		{ process_define($2);
 		  free($2);
 		}

-        | TOK_VHDL_WORK TOK_PLUSARG
-	        { char*tmp = substitutions($2);
-	          vhdlpp_work = tmp;
-		  free($2);
-		}
-
-        | TOK_VHDL_LIBDIR TOK_PLUSARG
-	        { char*tmp = substitutions($2);
-		  vhdlpp_libdir = realloc(vhdlpp_libdir, (vhdlpp_libdir_cnt+1)*sizeof(char*));
-	          vhdlpp_libdir[vhdlpp_libdir_cnt] = tmp;
-		  vhdlpp_libdir_cnt += 1;
-		  free($2);
-		}
-
  /* The +incdir token introduces a list of +<path> arguments that are
     the include directories to search. */

@@ -183,22 +145,6 @@ item

 	| TOK_LIBEXT libext_args

-  /* These are various misc flags that are supported. */
-
-	| TOK_INTEGER_WIDTH TOK_PLUSARG
-                { char*tmp = substitutions($2);
-		  free($2);
-		  integer_width = strtoul(tmp,0,10);
-		  free(tmp);
-		}
-
-	| TOK_WIDTH_CAP TOK_PLUSARG
-                { char*tmp = substitutions($2);
-		  free($2);
-		  width_cap = strtoul(tmp,0,10);
-		  free(tmp);
-		}
-
  /* The +<word> tokens that are not otherwise matched, are
     ignored. The skip_args rule arranges for all the argument words
     to be consumed. */
@@ -219,12 +165,6 @@ item
 		  }
 		  free($1);
 		}
-
-	| error
-		{ fprintf(stderr, "Error: unable to parse line %u in "
-		          "%s.\n", cflloc.first_line, current_file);
-		  return 1;
-		}
 	;

  /* inc_args are +incdir+ arguments in order. */
@@ -270,6 +210,5 @@ skip_arg : TOK_PLUSARG

 int yyerror(const char*msg)
 {
-	(void)msg; /* Parameter is not used. */
 	return 0;
 }
@@ -1,7 +1,7 @@
-#ifndef IVL_cfparse_misc_H
-#define IVL_cfparse_misc_H
+#ifndef __cfparse_misc_H
+#define __cfparse_misc_H
 /*
- * Copyright (c) 2001-2014 Picture Elements, Inc.
+ * Copyright (c) 2001 Picture Elements, Inc.
 *    Stephen Williams (steve@picturel.com)
 *
 *    This source code is free software; you can redistribute it
@@ -17,8 +17,11 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: cfparse_misc.h,v 1.6 2004/02/15 18:03:30 steve Exp $"
+#endif

 /*
 * The vlltype supports the passing of detailed source file location
@@ -33,12 +36,32 @@ struct cfltype {
      const char*text;
 };
 # define YYLTYPE struct cfltype
+extern YYLTYPE yylloc;

 int cflex(void);
 int cferror(const char *);
 int cfparse(void);
-void switch_to_command_file(const char *);
-void destroy_lexor(void);
-char *current_file;

-#endif /* IVL_cfparse_misc_H */
+/*
+ * $Log: cfparse_misc.h,v $
+ * Revision 1.6  2004/02/15 18:03:30  steve
+ *  Cleanup of warnings.
+ *
+ * Revision 1.5  2003/09/26 21:25:58  steve
+ *  Warnings cleanup.
+ *
+ * Revision 1.4  2002/08/12 01:35:01  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.3  2002/01/02 02:39:34  steve
+ *  Use my own cfltype to defend against bison 1.30.
+ *
+ * Revision 1.2  2001/11/12 18:47:32  steve
+ *  Support +incdir in command files, and ignore other
+ *  +args flags. Also ignore -a and -v flags.
+ *
+ * Revision 1.1  2001/11/12 01:26:36  steve
+ *  More sophisticated command file parser.
+ *
+ */
+#endif
@@ -1,7 +1,7 @@
-#ifndef IVL_globals_H
-#define IVL_globals_H
+#ifndef __globals_H
+#define __globals_H
 /*
- * Copyright (c) 2000-2014 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2000 Stephen Williams (steve@icarus.com)
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,26 +16,44 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: globals.h,v 1.19 2003/11/18 06:31:46 steve Exp $"
+#endif

 # include  <stddef.h>

-  /* This is the integer-width argument that will be passed to ivl. */
-extern unsigned integer_width;
+  /* This is the base (i.e. -B<value>) of the Icarus Verilog files. */
+extern const char*base;

-  /* This is the width-cap argument that will be passed to ivl. */
-extern unsigned width_cap;
+  /* This is the path to the iconfig file sent to ivl. */
+extern char* iconfig_path;
+extern char* iconfig_common_path;

-extern const char*vhdlpp_work;
-extern const char**vhdlpp_libdir;
-extern unsigned vhdlpp_libdir_cnt;
+  /* Ths is the optional -M<dependfile> value, if one was supplied. */
+extern const char*depfile;
+
+  /* Ths is the optional -N<path> value, if one was supplied. */
+extern const char*npath;
+
+  /* This is the name of the output file that the user selected. */
+extern const char*opath;
+
+  /* This pointer is set if there were -s<value> parameters. */
+extern char*start;
+
+  /* This flag is true if the -S flag was used on the command line. */
+extern int synth_flag;
+
+  /* This is the name of the selected target. */
+extern const char*targ;

  /* Perform variable substitutions on the string. */
 extern char* substitutions(const char*str);

  /* Add the name to the list of source files. */
-extern void process_file_name(const char*name, int lib_flag);
+extern void process_file_name(const char*name);

  /* Add the name to the list of library directories. */
 extern void process_library_switch(const char*name);
@@ -48,10 +66,39 @@ extern void process_include_dir(const char*name);
  /* Add a new -D define. */
 extern void process_define(const char*name);

-  /* Add a new parameter definition */
-extern void process_parameter(const char*name);
+  /* -v */
+extern int verbose_flag;

-  /* Set the default timescale for the simulator. */
-extern void process_timescale(const char*ts_string);
+extern char warning_flags[];

-#endif /* IVL_globals_H */
+  /* -y and -Y flags from the command line. */
+extern char* library_flags;
+extern char* library_flags2;
+
+/*
+ * $Log: globals.h,v $
+ * Revision 1.19  2003/11/18 06:31:46  steve
+ *  Remove the iverilog.conf file.
+ *
+ * Revision 1.18  2003/11/13 04:09:49  steve
+ *  Pass flags through the temporary config file.
+ *
+ * Revision 1.17  2003/11/01 04:21:57  steve
+ *  Add support for a target static config file.
+ *
+ * Revision 1.16  2002/08/12 01:35:01  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.15  2002/06/23 20:10:51  steve
+ *  Variable substitution in command files.
+ *
+ * Revision 1.14  2002/05/28 20:40:37  steve
+ *  ivl indexes the search path for libraries, and
+ *  supports case insensitive module-to-file lookup.
+ *
+ * Revision 1.13  2002/05/28 00:50:40  steve
+ *  Add the ivl -C flag for bulk configuration
+ *  from the driver, and use that to run library
+ *  modules through the preprocessor.
+ */
+#endif
@@ -0,0 +1,359 @@
+.TH iverilog 1 "$Date: 2006/06/12 00:16:53 $" Version "$Date: 2006/06/12 00:16:53 $"
+.SH NAME
+iverilog - Icarus Verilog compiler
+
+.SH SYNOPSIS
+.B iverilog
+[-ESVv] [-Bpath] [-ccmdfile] [-g1|-g2|-g3.0] [-Dmacro[=defn]] [-pflag=value]
+[-Iincludedir] [-mmodule] [-Mfile] [-Nfile] [-ooutputfilename]
+[-stopmodule] [-ttype] [-Tmin/typ/max] [-Wclass] [-ypath] sourcefile
+
+.SH DESCRIPTION
+.PP
+\fIiverilog\fP is a compiler that translates Verilog source code into
+executable programs for simulation, or other netlist formats for
+further processing. The currently supported targets are \fIvvp\fP for
+simulation, and \fIxnf\fP and \fIfpga\fP for synthesis. Other target
+types are added as code generators are implemented.
+
+.SH OPTIONS
+.l
+\fIiverilog\fP accepts the following options:
+.TP 8
+.B -B\fIbase\fP
+The \fIiverilog\fP program uses external programs and configuration
+files to preprocess and compile the Verilog source. Normally, the path
+used to locate these tools is built into the \fIiverilog\fP
+program. However, the \fB-B\fP switch allows the user to select a
+different set of programs. The path given is used to locate
+\fIivlpp\fP, \fIivl\fP, code generators and the VPI modules.
+.TP 8
+.B -c\fIfile\fP
+This flag specifies an input file that contains a list of Verilog
+source files. This is similar to the \fIcommand file\fP of other
+Verilog simulators, in that it is a file that contains the file names
+instead of taking them on the command line. See \fBCommand Files\fP below.
+.TP 8
+.B -D\fImacro\fP
+Defines macro \fImacro\fP with the string `1' as its definition. This
+form is normally only used to trigger ifdef conditionals in the
+Verilog source.
+.TP 8
+.B -D\fImacro=defn\fP
+Defines macro \fImacro\fP as \fIdefn\fP.
+.TP 8
+.B -E
+Preprocess the Verilog source, but do not compile it. The output file
+is the Verilog input, but with file inclusions and macro references
+expanded and removed. This is useful, for example, to preprocess
+Verilog source for use by other compilers.
+.TP 8
+.B -g1\fI|\fP-g2\fI|\fP-g3.0
+Select the Verilog language \fIgeneration\fP to support in the
+compiler. This selects between \fIIEEE1364-1995\fP(1),
+\fIIEEE1364-2001\fP(2), or \fISystemVerilog 3.0\fP(3.0). Normally,
+Icarus Verilog defaults to the latest known generation of the
+language. This flag is most useful to restrict the language to a set
+supported by tools of specific generations, for compatibility with
+other tools.
+.TP 8
+.B -I\fIincludedir\fP
+Append directory \fIincludedir\fP to list of directories searched
+for Verilog include files. The \fB-I\fP switch may be used many times
+to specify several directories to search, the directories are searched
+in the order they appear on the command line.
+.TP 8
+.B -M\fIpath\fP
+Write into the file specified by path a list of files that contribute
+to the compilation of the design. This includes files that are
+included by include directives and files that are automatically loaded
+by library support. The output is one file name per line, with no
+leading or trailing space.
+.TP 8
+.B -m\fImodule\fP
+Add this module to the list of VPI modules to be loaded by the
+simulation. Many modules can be specified, and all will be loaded, in
+the order specified. The system module is implicit and always included.
+.TP 8
+.B -N\fIpath\fP
+This is used for debugging the compiler proper. Dump the final netlist
+form of the design to the specified file. It otherwise does not affect
+operation of the compiler. The dump happens after the design is
+elaborated and optimized.
+.TP 8
+.B -o \fIfilename\fP
+Place output in the file \fIfilename\fP. If no output file name is
+specified, \fIiverilog\fP uses the default name \fBa.out\fP.
+.TP 8
+.B -p\fIflag=value\fP
+Assign a value to a target specific flag. The \fB-p\fP switch may be
+used as often as necessary to specify all the desired flags. The flags
+that are used depend on the target that is selected, and are described
+in target specific documentation. Flags that are not used are ignored.
+.TP 8
+.B -S
+Synthesize. Normally, if the target can accept behavioral
+descriptions the compiler will leave processes in behavioral
+form. The \fB-S\fP switch causes the compiler to perform synthesis
+even if it is not necessary for the target. If the target type is a
+netlist format, the \fB-S\fP switch is unnecessary and has no effect.
+.TP 8
+.B -s \fItopmodule\fP
+Specify the top level module to elaborate. Icarus Verilog will by default
+choose modules that are not instantiated in any other modules, but
+sometimes that is not sufficient, or instantiates too many modules. If
+the user specifies one or more root modules with \fB-s\fP flags, then
+they will be used as root modules instead.
+.TP 8
+.B -T\fImin|typ|max\fP
+Use this switch to select min, typ or max times from min:typ:max
+expressions. Normally, the compiler will simply use the typ value from
+these expressions (with a warning) but this switch will tell the
+compiler explicitly which value to use. This will suppress the
+warning that the compiler is making a choice.
+.TP 8
+.B -t\fItarget\fP
+Use this switch to specify the target output format. See the
+\fBTARGETS\fP section below for a list of valid output formats.
+.TP 8
+.B -v
+Turn on verbose messages. This will print the command lines that are
+executed to perform the actual compilation, along with version
+information from the various components, as well as the version of the
+product as a whole.  You will notice that the command lines include
+a reference to a key temporary file that passes information to the
+compiler proper.  To keep that file from being deleted at the end
+of the process, provide a file name of your own in the environment
+variable \fBIVERILOG_ICONFIG\fP.
+.TP 8
+.B -V
+Print the version of the compiler, and exit.
+.TP 8
+.B -W\fIclass\fP
+Turn on different classes of warnings. See the \fBWARNING TYPES\fP
+section below for descriptions of the different warning groups. If
+multiple \fB-W\fP switches are used, the warning set is the union of
+all the requested classes.
+.TP 8
+.B -y\fIlibdir\fP
+Append the directory to the library module search path. When the
+compiler finds an undefined module, it looks in these directories for
+files with the right name.
+
+.SH MODULE LIBRARIES
+
+The Icarus Verilog compiler supports module libraries as directories
+that contain Verilog source files.  During elaboration, the compiler
+notices the instantiation of undefined module types. If the user
+specifies library search directories, the compiler will search the
+directory for files with the name of the missing module type. If it
+finds such a file, it loads it as a Verilog source file, they tries
+again to elaborate the module.
+
+Library module files should contain only a single module, but this is
+not a requirement. Library modules may reference other modules in the
+library or in the main design.
+
+.SH TARGETS
+
+The Icarus Verilog compiler supports a variety of targets, for
+different purposes, and the \fB-t\fP switch is used to select the
+desired target.
+
+.TP 8
+.B null
+The null target causes no code to be generated. It is useful for
+checking the syntax of the Verilog source.
+.TP 8
+.B vvp
+This is the default. The vvp target generates code for the vvp
+runtime. The output is a complete program that simulates the design
+but must be run by the \fBvvp\fP command.
+.TP 8
+.B xnf
+This is the Xilinx Netlist Format used by many tools for placing
+devices in FPGAs or other programmable devices. This target is
+obsolete, use the \fBfpga\fP target instead.
+.TP 8
+.B fpga
+This is a synthesis target that supports a variety of fpga devices,
+mostly by EDIF format output. The Icarus Verilog fpga code generator
+can generate complete designs or EDIF macros that can in turn be
+imported into larger designs by other tools. The \fBfpga\fP target
+implies the synthesis \fB-S\fP flag.
+
+.SH "WARNING TYPES"
+These are the types of warnings that can be selected by the \fB-W\fP
+switch. All the warning types (other then \fBall\fP) can also be
+prefixed with \fBno-\fP to turn off that warning. This is most useful
+after a \fB-Wall\fP argument to suppress isolated warning types.
+
+.TP 8
+.B all
+This enables all supported warning categories.
+
+.TP 8
+.B implicit
+This enables warnings for creation of implicit declarations. For
+example, if a scalar wire X is used but not declared in the Verilog
+source, this will print a warning at its first use.
+
+.TP 8
+.B portbind
+This enables warnings for ports of module instantiations that are not
+connected but probably should be. Dangling input ports, for example,
+will generate a warning.
+
+.TP 8
+.B timescale
+This enables warnings for inconsistent use of the timescale
+directive. It detects if some modules have no timescale, or if modules
+inherit timescale from another file. Both probably mean that
+timescales are inconsistent, and simulation timing can be confusing
+and dependent on compilation order.
+
+.TP 8
+.B unused
+This enables warnings for unused variables. This may detect variables
+that are not assigned, or variables and nets that are not used, or
+similar possible misuses of variables and nets.
+
+.SH "SYSTEM FUNCTION TABLE FILES"
+If the source file name as a \fB.sft\fP suffix, then it is taken to be
+a system function table file. A System function table file is used to
+describe to the compiler the return types for system functions. This
+is necessary because the compiler needs this information to elaborate
+expressions that contain these system functions, but cannot run the
+sizetf functions since it has no run-time.
+
+The format of the table is ASCII, one function per line. Empty lines
+are ignored, and lines that start with the '\fI#\fP' character are
+comment lines. Each non-comment line starts with the function name,
+then the vpi type (i.e. vpiSysFuncReal). The following types are
+supported:
+
+.TP 8
+.B vpiSysFuncReal
+The function returns a real/realtime value.
+
+.TP 8
+.B vpiSysFuncInt
+The function returns an integer.
+
+.TP 8
+.B vpiSysFuncSized <wid> <signed|unsigned>
+The function returns a vector with the given width, and is signed or
+unsigned according to the flag.
+
+.SH "COMMAND FILES"
+The command file allows the user to place source file names and
+certain command line switches into a text file instead of on a long
+command line. Command files can include C or C++ style comments, as
+well as # comments, if the # starts the line.
+
+.TP 8
+.I "file name"
+A simple file name or file path is taken to be the name of a Verilog
+source file. The path starts with the first non-white-space
+character. Variables are substitued in file names.
+
+.TP 8
+.B -y\ \fIlibdir\fP
+A \fB-y\fP token prefixes a library directory in the command file,
+exactly like it does on the command line. The parameter to the \fB-y\fP
+flag may be on the same line or the next non-comment line.
+
+Variables in the \fIlibdir\fP are substituted.
+
+.TP 8
+.B +incdir+\fIincludedir\fP
+The \fB+incdir+\fP token in command files gives directories to search
+for include files in much the same way that \fB-I\fP flags work on the
+command line. The difference is that multiple \fI+includedir\fP
+directories are valid parameters to a single \fB+incdir+\fP token,
+although you may also have multiple \fB+incdir+\fP lines.
+
+Variables in the \fIincludedir\fP are substituted.
+
+.TP 8
+.B +libext+\fIext\fP
+The \fB+libext\fP token in command files fives file extensions to try
+when looking for a library file. This is useful in conjunction with
+\fB-y\fP flags to list suffixes to try in each directory before moving
+on to the next library directory.
+
+.TP 8
+.B +libdir+\fIdir\fP
+This is another way to specify library directories. See the -y flag.
+
+.TP 8
+.B +libdir-nocase+\fIdir\fP
+This is like the \fB+libdir\fP statement, but file names inside the
+directories declared here are case insensitive. The missing module
+name in a lookup need not match the file name case, as long as the
+letters are correct. For example, "foo" matches "Foo.v" but not
+"bar.v".
+
+.TP 8
+.B +define+\fINAME\fP=\fIvalue\fP
+The \fB+define+\fP token is the same as the \fB-D\fP option on the
+command line. The value part of the token is optional.
+
+.TP 8
+.B +toupper-filename\fP
+This token causes file names after this in the command file to be
+translated to uppercase. This helps with situations where a directory
+has passed through a DOS machine, and in the process the file names
+become munged.
+
+.TP 8
+.B +tolower-filename\fP
+This is similar to the \fB+toupper-filename\fP hack described above.
+
+.SH "VARIABLES IN COMMAND FILES"
+
+In certain cases, iverilog supports variables in command files. These
+are strings of the form "$(\fIvarname\fP)", where \fIvarname\fP is the
+name of the environment variable to read. The entire string is
+replaced with the contents of that variable. Variables are only
+substitued in contexts that explicitly support them, including file
+and directory strings.
+
+Variable values come from the operating system environment, and not
+from preprocessor defines elsewhere in the file or the command line.
+
+.SH EXAMPLES
+These examples assume that you have a Verilog source file called hello.v in
+the current directory
+
+To compile hello.v to an executable file called a.out:
+
+	iverilog hello.v
+
+To compile hello.v to an executable file called hello:
+
+	iverilog -o hello hello.v
+
+To compile and run explicitly using the vvp runtime:
+
+	iverilog -ohello.vvp -tvvp hello.v
+
+To compile hello.v to a file in XNF-format called hello.xnf
+
+	iverilog -txnf -ohello.xnf hello.v
+
+
+.SH "AUTHOR"
+.nf
+Steve Williams ([email protected])
+
+.SH SEE ALSO
+vvp(1),
+.BR "<http://www.icarus.com/eda/verilog/>"
+
+.SH COPYRIGHT
+.nf
+Copyright \(co  2002 Stephen Williams
+
+This document can be freely redistributed according to the terms of the
+GNU General Public License version 2.0
@@ -1,527 +0,0 @@
-.TH iverilog 1 "February 26th, 2014" "" "Version %M.%m.%n %E"
-.SH NAME
-iverilog - Icarus Verilog compiler
-
-.SH SYNOPSIS
-.B iverilog
-[\-ESVv] [\-Bpath] [\-ccmdfile|\-fcmdfile] [\-Dmacro[=defn]]
-[\-Pparameter=value] [\-pflag=value]
-[\-dname] [\-g1995|\-g2001|\-g2005|\-g2005-sv|\-g2009|\-g2012|\-g<feature>]
-[\-Iincludedir] [\-mmodule] [\-M[mode=]file] [\-Nfile] [\-ooutputfilename]
-[\-stopmodule] [\-ttype] [\-Tmin/typ/max] [\-Wclass] [\-ypath] sourcefile
-
-.SH DESCRIPTION
-.PP
-\fIiverilog\fP is a compiler that translates Verilog source code into
-executable programs for simulation, or other netlist formats for
-further processing. The currently supported targets are \fIvvp\fP for
-simulation, and \fIfpga\fP for synthesis. Other target
-types are added as code generators are implemented.
-
-.SH OPTIONS
-\fIiverilog\fP accepts the following options:
-.TP 8
-.B -B\fIbase\fP
-The \fIiverilog\fP program uses external programs and configuration
-files to preprocess and compile the Verilog source. Normally, the path
-used to locate these tools is built into the \fIiverilog\fP
-program. However, the \fB\-B\fP switch allows the user to select a
-different set of programs. The path given is used to locate
-\fIivlpp\fP, \fIivl\fP, code generators and the VPI modules.
-.TP 8
-.B -c\fIfile\fP -f\fIfile\fP
-These flags specifies an input file that contains a list of Verilog
-source files. This is similar to the \fIcommand file\fP of other
-Verilog simulators, in that it is a file that contains the file names
-instead of taking them on the command line. See \fBCommand Files\fP below.
-.TP 8
-.B -D\fImacro\fP
-Defines macro \fImacro\fP with the string `1' as its definition. This
-form is normally only used to trigger ifdef conditionals in the
-Verilog source.
-.TP 8
-.B -D\fImacro=defn\fP
-Defines macro \fImacro\fP as \fIdefn\fP.
-.TP 8
-.B -P\fIparameter=value\fP
-Override (i.e. defparam) a parameter in a root module. This allows the
-user to override at compile time (defparam) a parameter in a root
-module instance. For example, \fB\-Pmain.foo=2\fP overrides the
-parameter foo in the root instance main with the value 2.
-.TP 8
-.B -d\fIname\fP
-Activate a class of compiler debugging messages. The \fB\-d\fP switch may
-be used as often as necessary to activate all the desired messages.
-Supported names are scopes, eval_tree, elaborate, and synth2;
-any other names are ignored.
-.TP 8
-.B -E
-Preprocess the Verilog source, but do not compile it. The output file
-is the Verilog input, but with file inclusions and macro references
-expanded and removed. This is useful, for example, to preprocess
-Verilog source for use by other compilers.
-.TP 8
-.B -g1995\fI|\fP-g2001\fI|\fP-g2001-noconfig\fI|\fP-g2005\fI|\fP-g2005-sv\fI|\fP-g2009\fI|\fP-g2012
-Select the Verilog language \fIgeneration\fP to support in the compiler.
-This selects between \fIIEEE1364\-1995\fP, \fIIEEE1364\-2001\fP,
-\fIIEEE1364\-2005\fP, \fIIEEE1800\-2005\fP, \fIIEEE1800\-2009\fP, or
-\fIIEEE1800\-2012\fP.
-Icarus Verilog currently defaults to the \fIIEEE1364\-2005\fP generation
-of the language. This flag is used to restrict the language to a set of
-keywords/features, this allows simulation of older Verilog code that may
-use newer keywords and for compatibility with other tools. Much of the
-\fIIEEE1800\fP generations functionality is not currently supported.
-The \fIIEEE1800\fP generations do parse all the keywords, so they can
-be used to verify that \fIIEEE1364\fP compliant Verilog code does not
-use any of the new \fIIEEE1800\fP keywords.
-.TP 8
-.B -gverilog-ams\fI|\fP-gno-verilog-ams
-Enable or disable (default) support for Verilog\-AMS.
-Very little Verilog\-AMS specific functionality is currently supported.
-.TP 8
-.B -gspecify\fI|\fP-gno-specify
-Enable or disable (default) specify block support. When enabled,
-specify block code is elaborated. When disabled, specify blocks are
-parsed but ignored. Specify blocks are commonly not needed for RTL
-simulation, and in fact can hurt performance of the
-simulation. However, disabling specify blocks reduces accuracy of
-full-timing simulations.
-.TP 8
-.B -gstd-include\fI|\fP-gno-std-include
-Enable (default) or disable the search of a standard installation
-include directory after all other explicit include directories. This
-standard include directory is a convenient place to install standard
-header files that a Verilog program may include.
-.TP 8
-.B -grelative-include\fI|\fP-gno-relative-include
-Enable or disable (default) adding the local files directory to
-the beginning of the include file search path. This allows files
-to be included relative to the current file not the more common
-files are only found in the working directory or in the specified
-include file search path.
-.TP 8
-.B -gxtypes\fI|\fP-gno-xtypes
-Enable (default) or disable support for extended types. Enabling
-extended types allows for new types that are supported by Icarus
-Verilog as extensions beyond the baseline Verilog. It may be necessary
-to disable extended types if compiling code that clashes with the few
-new keywords used to implement the type system.
-.TP 8
-.B -gio-range-error\fI|\fP-gno-io-range-error
-The standards requires that a vectored port have matching ranges for its
-port declaration as well as any net/register declaration. It was common
-practice in the past to only specify the range for the net/register
-declaration and some tools still allow this. By default any mismatch is
-reported as a error. Using \fB\-gno\-io\-range\-error\fP will produce a
-warning instead of a fatal error for the case of a vectored net/register
-and a scalar port declaration.
-.TP 8
-.B -gstrict-ca-eval\fI|\fP-gno-strict-ca-eval
-The standard requires that if any input to a continuous assignment
-expression changes value, the entire expression is re-evaluated. By
-default, parts of the expression that do not depend on the changed
-input value(s) are not re-evaluated. If an expression contains a call
-to a function that doesn't depend solely on its input values or that
-has side effects, the resulting behavior will differ from that
-required by the standard. Using \fI\-gstrict\-ca\-eval\fP will force
-standard compliant behavior (with some loss in performance).
-.TP 8
-.B -gstrict-expr-width\fI|\fP-gno-strict-expr-width
-Enable or disable (default) strict compliance with the standard rules
-for determining expression bit lengths. When disabled, the RHS of a
-parameter assignment is evaluated as a lossless expression, as is any
-expression containing an unsized constant number, and unsized constant
-numbers are not truncated to integer width.
-.TP 8
-.B -I\fIincludedir\fP
-Append directory \fIincludedir\fP to list of directories searched
-for Verilog include files. The \fB\-I\fP switch may be used many times
-to specify several directories to search, the directories are searched
-in the order they appear on the command line.
-.TP 8
-.B -M\fIpath\fP
-This is equivalent to \fB\-Mall=path\fP. Preserved for backwards
-compatibility.
-.TP 8
-.B -M\fImode=path\fP
-Write into the file specified by path a list of files that contribute to
-the compilation of the design. If \fBmode\fP is \fBall\fP or \fBprefix\fP,
-this includes files that are included by include directives and files
-that are automatically loaded by library support as well as the files
-explicitly specified by the user. If \fBmode\fP is \fBinclude\fP, only
-files that are included by include directives are listed. If \fBmode\fP
-is \fBmodule\fP, only files that are specified by the user or that are
-automatically loaded by library support are listed. The output is one
-file name per line, with no leading or trailing space. If \fBmode\fP
-is \fBprefix\fP, files that are included by include directives are
-prefixed by "I " and other files are prefixed by "M ".
-.TP 8
-.B -m\fImodule\fP
-Add this module to the list of VPI modules to be loaded by the
-simulation. Many modules can be specified, and all will be loaded, in
-the order specified. The system module is implicit and always included.
-If a System Function Table file (<module>.sft) exists for the module it
-will be loaded automatically.
-.TP 8
-.B -N\fIpath\fP
-This is used for debugging the compiler proper. Dump the final netlist
-form of the design to the specified file. It otherwise does not affect
-operation of the compiler. The dump happens after the design is
-elaborated and optimized.
-.TP 8
-.B -o \fIfilename\fP
-Place output in the file \fIfilename\fP. If no output file name is
-specified, \fIiverilog\fP uses the default name \fBa.out\fP.
-.TP 8
-.B -p\fIflag=value\fP
-Assign a value to a target specific flag. The \fB\-p\fP switch may be
-used as often as necessary to specify all the desired flags. The flags
-that are used depend on the target that is selected, and are described
-in target specific documentation. Flags that are not used are ignored.
-.TP 8
-.B -S
-Synthesize. Normally, if the target can accept behavioral
-descriptions the compiler will leave processes in behavioral
-form. The \fB\-S\fP switch causes the compiler to perform synthesis
-even if it is not necessary for the target. If the target type is a
-netlist format, the \fB\-S\fP switch is unnecessary and has no effect.
-.TP 8
-.B -s \fItopmodule\fP
-Specify the top level module to elaborate. Icarus Verilog will by default
-choose modules that are not instantiated in any other modules, but
-sometimes that is not sufficient, or instantiates too many modules. If
-the user specifies one or more root modules with \fB\-s\fP flags, then
-they will be used as root modules instead.
-.TP 8
-.B -T\fImin|typ|max\fP
-Use this switch to select min, typ or max times from min:typ:max
-expressions. Normally, the compiler will simply use the typ value from
-these expressions (printing a warning for the first ten it finds) but
-this switch will tell the compiler explicitly which value to use. This
-will suppress the warning that the compiler is making a choice.
-.TP 8
-.B -t\fItarget\fP
-Use this switch to specify the target output format. See the
-\fBTARGETS\fP section below for a list of valid output formats.
-.TP 8
-.B -v
-Turn on verbose messages. This will print the command lines that are
-executed to perform the actual compilation, along with version
-information from the various components, as well as the version of the
-product as a whole.  You will notice that the command lines include
-a reference to a key temporary file that passes information to the
-compiler proper.  To keep that file from being deleted at the end
-of the process, provide a file name of your own in the environment
-variable \fBIVERILOG_ICONFIG\fP.
-.TP 8
-.B -V
-Print the version of the compiler, and exit.
-.TP 8
-.B -W\fIclass\fP
-Turn on different classes of warnings. See the \fBWARNING TYPES\fP
-section below for descriptions of the different warning groups. If
-multiple \fB\-W\fP switches are used, the warning set is the union of
-all the requested classes.
-.TP 8
-.B -y\fIlibdir\fP
-Append the directory to the library module search path. When the
-compiler finds an undefined module, it looks in these directories for
-files with the right name.
-.TP 8
-.B -Y\fIsuffix\fP
-Add suffix to the list of accepted file name suffixes used when
-searching a library for cells. The list defaults to the single
-entry \fI.v\fP.
-
-.SH MODULE LIBRARIES
-
-The Icarus Verilog compiler supports module libraries as directories
-that contain Verilog source files.  During elaboration, the compiler
-notices the instantiation of undefined module types. If the user
-specifies library search directories, the compiler will search the
-directory for files with the name of the missing module type. If it
-finds such a file, it loads it as a Verilog source file, they tries
-again to elaborate the module.
-
-Library module files should contain only a single module, but this is
-not a requirement. Library modules may reference other modules in the
-library or in the main design.
-
-.SH TARGETS
-
-The Icarus Verilog compiler supports a variety of targets, for
-different purposes, and the \fB\-t\fP switch is used to select the
-desired target.
-
-.TP 8
-.B null
-The null target causes no code to be generated. It is useful for
-checking the syntax of the Verilog source.
-.TP 8
-.B vvp
-This is the default. The vvp target generates code for the vvp
-runtime. The output is a complete program that simulates the design
-but must be run by the \fBvvp\fP command. The -pfileline=1 option
-can be used to add procedural statement debugging opcodes to the
-generated code.
-.TP 8
-.B fpga
-This is a synthesis target that supports a variety of fpga devices,
-mostly by EDIF format output. The Icarus Verilog fpga code generator
-can generate complete designs or EDIF macros that can in turn be
-imported into larger designs by other tools. The \fBfpga\fP target
-implies the synthesis \fB\-S\fP flag.
-.TP 8
-.B vhdl
-This target produces a VHDL translation of the Verilog netlist. The
-output is a single file containing VHDL entities corresponding to
-the modules in the Verilog source code. Note that only a subset of
-the Verilog language is supported.  See the wiki for more information.
-
-.SH "WARNING TYPES"
-These are the types of warnings that can be selected by the \fB\-W\fP
-switch. All the warning types (other than \fBall\fP) can also be
-prefixed with \fBno\-\fP to turn off that warning. This is most useful
-after a \fB\-Wall\fP argument to suppress isolated warning types.
-
-.TP 8
-.B all
-This enables the implicit, portbind, select\-range, timescale, and
-sensitivity\-entire\-array warning categories.
-
-.TP 8
-.B implicit
-This enables warnings for creation of implicit declarations. For
-example, if a scalar wire X is used but not declared in the Verilog
-source, this will print a warning at its first use.
-
-.TP 8
-.B portbind
-This enables warnings for ports of module instantiations that are not
-connected but probably should be. Dangling input ports, for example,
-will generate a warning.
-
-.TP 8
-.B select-range
-This enables warnings for constant out of bound selects. This includes
-partial or fully out of bound selects as well as a select containing
-a 'bx or 'bz in the index.
-
-.TP 8
-.B timescale
-This enables warnings for inconsistent use of the timescale
-directive. It detects if some modules have no timescale, or if modules
-inherit timescale from another file. Both probably mean that
-timescales are inconsistent, and simulation timing can be confusing
-and dependent on compilation order.
-
-.TP 8
-.B infloop
-This enables warnings for \fRalways\fP statements that may have runtime
-infinite loops (has paths with no or zero delay). This class of warnings
-is not included in \fB\-Wall\fP and hence does not have a \fBno\-\fP variant.
-A fatal error message will always be printed when the compiler can
-determine that there will definitely be an infinite loop (all paths have
-no or zero delay).
-
-When you suspect an always statement is producing a runtime infinite loop
-use this flag to find the always statements that need to have their logic
-verified. It is expected that many of the warnings will be false
-positives, since the code treats the value of all variables and signals
-as indeterminate.
-
-.TP 8
-.B sensitivity-entire-vector
-This enables warnings for when a part select within an "always @*"
-statement results in the entire vector being added to the implicit
-sensitivity list. Although this behaviour is prescribed by the IEEE
-standard, it is not what might be expected and can have performance
-implications if the vector is large.
-
-.TP 8
-.B sensitivity-entire-array
-This enables warnings for when a word select within an "always @*"
-statement results in the entire array being added to the implicit
-sensitivity list. Although this behaviour is prescribed by the IEEE
-standard, it is not what might be expected and can have performance
-implications if the array is large.
-
-.SH "SYSTEM FUNCTION TABLE FILES"
-If the source file name as a \fB.sft\fP suffix, then it is taken to be
-a system function table file. A System function table file is used to
-describe to the compiler the return types for system functions. This
-is necessary because the compiler needs this information to elaborate
-expressions that contain these system functions, but cannot run the
-sizetf functions since it has no run-time.
-
-The format of the table is ASCII, one function per line. Empty lines
-are ignored, and lines that start with the '\fI#\fP' character are
-comment lines. Each non-comment line starts with the function name,
-then the vpi type (i.e. vpiSysFuncReal). The following types are
-supported:
-
-.TP 8
-.B vpiSysFuncReal
-The function returns a real/realtime value.
-
-.TP 8
-.B vpiSysFuncInt
-The function returns an integer.
-
-.TP 8
-.B vpiSysFuncSized <wid> <signed|unsigned>
-The function returns a vector with the given width, and is signed or
-unsigned according to the flag.
-
-.SH "COMMAND FILES"
-The command file allows the user to place source file names and
-certain command line switches into a text file instead of on a long
-command line. Command files can include C or C++ style comments, as
-well as # comments, if the # starts the line.
-
-.TP 8
-.I "file name"
-A simple file name or file path is taken to be the name of a Verilog
-source file. The path starts with the first non-white-space
-character. Variables are substituted in file names.
-
-.TP 8
-.B -c\ \fIcmdfile\fP -f\ \fIcmdfile\fP
-A \fB\-c\fP or \fB\-f\fP token prefixes a command file, exactly like it
-does on the command line. The cmdfile may be on the same line or the
-next non-comment line.
-
-.TP 8
-.B -y\ \fIlibdir\fP
-A \fB\-y\fP token prefixes a library directory in the command file,
-exactly like it does on the command line. The parameter to the \fB\-y\fP
-flag may be on the same line or the next non-comment line.
-
-Variables in the \fIlibdir\fP are substituted.
-
-.TP 8
-.B +incdir+\fIincludedir\fP
-The \fB+incdir+\fP token in command files gives directories to search
-for include files in much the same way that \fB\-I\fP flags work on the
-command line. The difference is that multiple \fI+includedir\fP
-directories are valid parameters to a single \fB+incdir+\fP token,
-although you may also have multiple \fB+incdir+\fP lines.
-
-Variables in the \fIincludedir\fP are substituted.
-
-.TP 8
-.B +libext+\fIext\fP
-The \fB+libext\fP token in command files fives file extensions to try
-when looking for a library file. This is useful in conjunction with
-\fB\-y\fP flags to list suffixes to try in each directory before moving
-on to the next library directory.
-
-.TP 8
-.B +libdir+\fIdir\fP
-This is another way to specify library directories. See the \-y flag.
-
-.TP 8
-.B +libdir-nocase+\fIdir\fP
-This is like the \fB+libdir\fP statement, but file names inside the
-directories declared here are case insensitive. The missing module
-name in a lookup need not match the file name case, as long as the
-letters are correct. For example, "foo" matches "Foo.v" but not
-"bar.v".
-
-.TP 8
-.B +define+\fINAME\fP=\fIvalue\fP
-The \fB+define+\fP token is the same as the \fB\-D\fP option on the
-command line. The value part of the token is optional.
-
-.TP 8
-.B +parameter+\fINAME\fP=\fIvalue\fP
-The \fB+parameter+\fP token is the same as the \fB\-P\fP option on the
-command line.
-
-.TP 8
-.B +timescale+\fIvalue\fP
-The \fB+timescale+\fP token is used to set the default timescale for
-the simulation. This is the time units and precision before any
-`timescale directive or after a `resetall directive. The default is
-1s/1s.
-
-.TP 8
-.B +toupper-filename
-This token causes file names after this in the command file to be
-translated to uppercase. This helps with situations where a directory
-has passed through a DOS machine, and in the process the file names
-become munged.
-
-.TP 8
-.B +tolower-filename
-This is similar to the \fB+toupper\-filename\fP hack described above.
-
-.TP 8
-.B +integer-width+\fIvalue\fP
-This allows the programmer to select the width for integer variables
-in the Verilog source. The default is 32, the value can be any desired
-integer value.
-
-.TP 8
-.B +width-cap+\fIvalue\fP
-This allows the programmer to select the width cap for unsized expressions.
-If the calculated width for an unsized expression exceeds this value, the
-compiler will issue a warning and limit the expression width to this value.
-
-.SH "VARIABLES IN COMMAND FILES"
-
-In certain cases, iverilog supports variables in command files. These
-are strings of the form "$(\fIvarname\fP)" or "${\fIvarname\fP}", where
-\fIvarname\fP is the
-name of the environment variable to read. The entire string is
-replaced with the contents of that variable. Variables are only
-substituted in contexts that explicitly support them, including file
-and directory strings.
-
-Variable values come from the operating system environment, and not
-from preprocessor defines elsewhere in the file or the command line.
-
-.SH PREDEFINED MACROS
-
-The following macros are predefined by the compiler:
-.TP 8
-.B __ICARUS__ = 1
-This is always defined when compiling with Icarus Verilog.
-
-.TP 8
-.B __VAMS_ENABLE__ = 1
-This is defined if Verilog\-AMS is enabled.
-
-.SH EXAMPLES
-These examples assume that you have a Verilog source file called hello.v in
-the current directory
-
-To compile hello.v to an executable file called a.out:
-
-	iverilog hello.v
-
-To compile hello.v to an executable file called hello:
-
-	iverilog \-o hello hello.v
-
-To compile and run explicitly using the vvp runtime:
-
-	iverilog \-ohello.vvp \-tvvp hello.v
-
-.SH "AUTHOR"
-.nf
-Steve Williams ([email protected])
-
-.SH SEE ALSO
-vvp(1),
-.BR "<http://www.icarus.com/eda/verilog/>"
-
-Tips on using, debugging, and developing the compiler can be found at
-.BR "<http://iverilog.wikia.com/>"
-
-.SH COPYRIGHT
-.nf
-Copyright \(co  2002\-2014 Stephen Williams
-
-This document can be freely redistributed according to the terms of the
-GNU General Public License version 2.0
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2010 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2002 Stephen Williams (steve@icarus.com)
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -14,14 +14,17 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: substit.c,v 1.5 2003/12/19 01:27:10 steve Exp $"
+#endif

 # include  <string.h>
 # include  <stdlib.h>
-# include  <stdio.h>
-# include  "ivl_alloc.h"
-# include  "globals.h"
+#ifdef HAVE_MALLOC_H
+# include  <malloc.h>
+#endif


 char* substitutions(const char*str)
@@ -32,13 +35,13 @@ char* substitutions(const char*str)

      while (*str) {

-	    if ((str[0] == '$') && ((str[1] == '(') || str[1] == '{')) {
-		    /* If I find a $(x) or ${x} string in the source, replace
+	    if ((str[0] == '$') && (str[1] == '(')) {
+		    /* If I find a $(x) string in the source, replace
 		       it in the destination with the contents of the
 		       environment variable x. */
 		  char*name;
 		  char*value;
-		  const char*ep = strchr(str, (str[1]=='(') ? ')' : '}');
+		  const char*ep = strchr(str, ')');
 		  str += 2;

 		  name = malloc(ep-str+1);
@@ -48,14 +51,9 @@ char* substitutions(const char*str)
 		  str = ep + 1;

 		  value = getenv(name);
-		  if (value == 0) {
-			fprintf(stderr, "Warning: environment variable "
-			        "\"%s\" not found during command file "
-			        "processing.\n", name);
-			free(name);
-			continue;
-		  }
 		  free(name);
+		  if (value == 0)
+			continue;

 		  if (strlen(value) >= (nbuf - (cp-buf))) {
 			size_t old_size = cp - buf;
@@ -94,3 +92,24 @@ char* substitutions(const char*str)

      return buf;
 }
+
+
+/*
+ * $Log: substit.c,v $
+ * Revision 1.5  2003/12/19 01:27:10  steve
+ *  Fix various unsigned compare warnings.
+ *
+ * Revision 1.4  2002/08/12 01:35:01  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.3  2002/08/11 23:47:04  steve
+ *  Add missing Log and Ident strings.
+ *
+ * Revision 1.2  2002/06/25 01:33:01  steve
+ *  include malloc.h only when available.
+ *
+ * Revision 1.1  2002/06/23 20:10:51  steve
+ *  Variable substitution in command files.
+ *
+ */
+
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2013 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1999-2002 Stephen Williams (steve@icarus.com)
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -14,140 +14,27 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: dup_expr.cc,v 1.18.2.1 2006/06/12 00:16:50 steve Exp $"
+#endif

 # include "config.h"

 # include  "netlist.h"
 # include  <cassert>
-# include  <cstdlib>
-# include  "ivl_assert.h"
-
-NetEAccess* NetEAccess::dup_expr() const
-{
-      NetEAccess*tmp = new NetEAccess(branch_, nature_);
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetEArrayPattern*NetEArrayPattern::dup_expr() const
-{
-      vector<NetExpr*>tmp (items_.size());
-      for (size_t idx = 0 ; idx < tmp.size() ; idx += 1)
-	    tmp[idx] = items_[idx]->dup_expr();
-
-      NetEArrayPattern*res = new NetEArrayPattern(net_type(), tmp);
-      res->set_line(*this);
-      return res;
-}
-
-NetEBinary* NetEBinary::dup_expr() const
-{
-      ivl_assert(*this, 0);
-      return 0;
-}
-
-NetEBAdd* NetEBAdd::dup_expr() const
-{
-      NetEBAdd*tmp = new NetEBAdd(op_, left_->dup_expr(), right_->dup_expr(),
-                                  expr_width(), has_sign());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetEBBits* NetEBBits::dup_expr() const
-{
-      NetEBBits*tmp = new NetEBBits(op_, left_->dup_expr(), right_->dup_expr(),
-                                    expr_width(), has_sign());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}

 NetEBComp* NetEBComp::dup_expr() const
 {
-      NetEBComp*tmp = new NetEBComp(op_, left_->dup_expr(), right_->dup_expr());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetEBDiv* NetEBDiv::dup_expr() const
-{
-      NetEBDiv*tmp = new NetEBDiv(op_, left_->dup_expr(), right_->dup_expr(),
-                                  expr_width(), has_sign());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetEBLogic* NetEBLogic::dup_expr() const
-{
-      NetEBLogic*tmp = new NetEBLogic(op_, left_->dup_expr(), right_->dup_expr());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetEBMult* NetEBMult::dup_expr() const
-{
-      NetEBMult*tmp = new NetEBMult(op_, left_->dup_expr(), right_->dup_expr(),
-                                    expr_width(), has_sign());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetEBPow* NetEBPow::dup_expr() const
-{
-      NetEBPow*tmp = new NetEBPow(op_, left_->dup_expr(), right_->dup_expr(),
-                                  expr_width(), has_sign());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetEBShift* NetEBShift::dup_expr() const
-{
-      NetEBShift*tmp = new NetEBShift(op_, left_->dup_expr(), right_->dup_expr(),
-                                      expr_width(), has_sign());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetEConcat* NetEConcat::dup_expr() const
-{
-      NetEConcat*dup = new NetEConcat(parms_.size(), repeat_, expr_type_);
-      ivl_assert(*this, dup);
-      dup->set_line(*this);
-      for (unsigned idx = 0 ;  idx < parms_.size() ;  idx += 1)
-	    if (parms_[idx]) {
-		  NetExpr*tmp = parms_[idx]->dup_expr();
-                  ivl_assert(*this, tmp);
-		  dup->parms_[idx] = tmp;
-	    }
-
-      dup->expr_width(expr_width());
-
-      return dup;
+      NetEBComp*result = new NetEBComp(op_, left_->dup_expr(),
+				       right_->dup_expr());
+      return result;
 }

 NetEConst* NetEConst::dup_expr() const
 {
      NetEConst*tmp = new NetEConst(value_);
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetEConstEnum* NetEConstEnum::dup_expr() const
-{
-      NetEConstEnum*tmp = new NetEConstEnum(scope_, name_, enum_set_, value());
-      ivl_assert(*this, tmp);
      tmp->set_line(*this);
      return tmp;
 }
@@ -155,15 +42,6 @@ NetEConstEnum* NetEConstEnum::dup_expr() const
 NetEConstParam* NetEConstParam::dup_expr() const
 {
      NetEConstParam*tmp = new NetEConstParam(scope_, name_, value());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetECReal* NetECReal::dup_expr() const
-{
-      NetECReal*tmp = new NetECReal(value_);
-      ivl_assert(*this, tmp);
      tmp->set_line(*this);
      return tmp;
 }
@@ -171,93 +49,47 @@ NetECReal* NetECReal::dup_expr() const
 NetECRealParam* NetECRealParam::dup_expr() const
 {
      NetECRealParam*tmp = new NetECRealParam(scope_, name_, value());
-      ivl_assert(*this, tmp);
      tmp->set_line(*this);
      return tmp;
 }

 NetEEvent* NetEEvent::dup_expr() const
 {
-      ivl_assert(*this, 0);
-      return 0;
-}
-
-NetELast* NetELast::dup_expr() const
-{
-      NetELast*tmp = new NetELast(sig_);
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetENetenum* NetENetenum::dup_expr() const
-{
-      ivl_assert(*this, 0);
-      return 0;
-}
-
-NetENew* NetENew::dup_expr() const
-{
-      ivl_assert(*this, 0);
-      return 0;
-}
-
-NetENull* NetENull::dup_expr() const
-{
-      ivl_assert(*this, 0);
-      return 0;
-}
-
-NetEProperty* NetEProperty::dup_expr() const
-{
-      ivl_assert(*this, 0);
+      assert(0);
      return 0;
 }

 NetEScope* NetEScope::dup_expr() const
 {
-      ivl_assert(*this, 0);
+      assert(0);
      return 0;
 }

 NetESelect* NetESelect::dup_expr() const
 {
-      NetESelect*tmp = new NetESelect(expr_->dup_expr(),
-			              base_? base_->dup_expr() : 0,
-			              expr_width(), sel_type_);
-      ivl_assert(*this, tmp);
-      tmp->cast_signed(has_sign());
-      tmp->set_line(*this);
-      return tmp;
+      return new NetESelect(expr_->dup_expr(), base_->dup_expr(),
+			    expr_width());
 }

 NetESFunc* NetESFunc::dup_expr() const
 {
      NetESFunc*tmp = new NetESFunc(name_, type_, expr_width(), nparms());
-      ivl_assert(*this, tmp);
+      assert(tmp);

      tmp->cast_signed(has_sign());
      for (unsigned idx = 0 ;  idx < nparms() ;  idx += 1) {
-	    ivl_assert(*this, parm(idx));
-	    tmp->parm(idx, parm(idx)->dup_expr());
+	    assert(tmp->parm(idx));
+	    tmp->parm(idx, tmp->parm(idx)->dup_expr());
      }

-      tmp->set_line(*this);
      return tmp;
 }

-NetEShallowCopy* NetEShallowCopy::dup_expr() const
-{
-      ivl_assert(*this, 0);
-      return 0;
-}
-
 NetESignal* NetESignal::dup_expr() const
 {
-      NetESignal*tmp = new NetESignal(net_, word_);
-      ivl_assert(*this, tmp);
+      NetESignal*tmp = new NetESignal(net_, msi_, lsi_);
+      assert(tmp);
      tmp->expr_width(expr_width());
-      tmp->cast_signed(has_sign());
      tmp->set_line(*this);
      return tmp;
 }
@@ -266,60 +98,112 @@ NetETernary* NetETernary::dup_expr() const
 {
      NetETernary*tmp = new NetETernary(cond_->dup_expr(),
 					true_val_->dup_expr(),
-					false_val_->dup_expr(),
-                                        expr_width(),
-                                        has_sign());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
+					false_val_->dup_expr());
      return tmp;
 }

 NetEUFunc* NetEUFunc::dup_expr() const
 {
      NetEUFunc*tmp;
-      vector<NetExpr*> tmp_parms (parms_.size());
+      svector<NetExpr*> tmp_parms (parms_.count());

-      for (unsigned idx = 0 ;  idx < tmp_parms.size() ;  idx += 1) {
-	    ivl_assert(*this, parms_[idx]);
+      for (unsigned idx = 0 ;  idx < tmp_parms.count() ;  idx += 1) {
+	    assert(parms_[idx]);
 	    tmp_parms[idx] = parms_[idx]->dup_expr();
      }

-      tmp = new NetEUFunc(scope_, func_, result_sig_->dup_expr(), tmp_parms,
-                          need_const_);
+      tmp = 0;
+      if (result_sig_)
+	    tmp = new NetEUFunc(func_, result_sig_->dup_expr(), tmp_parms);
+      if (result_var_)
+	    tmp = new NetEUFunc(func_, result_var_->dup_expr(), tmp_parms);

-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetEUBits* NetEUBits::dup_expr() const
-{
-      NetEUBits*tmp = new NetEUBits(op_, expr_->dup_expr(), expr_width(), has_sign());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
+      assert(tmp);
      return tmp;
 }

 NetEUnary* NetEUnary::dup_expr() const
 {
-      NetEUnary*tmp = new NetEUnary(op_, expr_->dup_expr(), expr_width(), has_sign());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
+      NetEUnary*tmp = new NetEUnary(op_, expr_->dup_expr());
+      assert(tmp);
      return tmp;
 }

 NetEUReduce* NetEUReduce::dup_expr() const
 {
      NetEUReduce*tmp = new NetEUReduce(op_, expr_->dup_expr());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
+      assert(tmp);
      return tmp;
 }

-NetECast* NetECast::dup_expr() const
+NetEVariable* NetEVariable::dup_expr() const
 {
-      NetECast*tmp = new NetECast(op_, expr_->dup_expr(), expr_width(), has_sign());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
+      NetEVariable*tmp = new NetEVariable(var_);
      return tmp;
 }
+
+/*
+ * $Log: dup_expr.cc,v $
+ * Revision 1.18.2.1  2006/06/12 00:16:50  steve
+ *  Add support for -Wunused warnings.
+ *
+ * Revision 1.18  2004/06/17 16:06:18  steve
+ *  Help system function signedness survive elaboration.
+ *
+ * Revision 1.17  2004/05/31 23:34:36  steve
+ *  Rewire/generalize parsing an elaboration of
+ *  function return values to allow for better
+ *  speed and more type support.
+ *
+ * Revision 1.16  2003/10/31 02:47:11  steve
+ *  NetEUReduce has its own dup_expr method.
+ *
+ * Revision 1.15  2003/05/30 02:55:32  steve
+ *  Support parameters in real expressions and
+ *  as real expressions, and fix multiply and
+ *  divide with real results.
+ *
+ * Revision 1.14  2003/04/22 04:48:29  steve
+ *  Support event names as expressions elements.
+ *
+ * Revision 1.13  2003/03/15 18:08:43  steve
+ *  Comparison operators do have defined width.
+ *
+ * Revision 1.12  2003/03/15 04:46:28  steve
+ *  Better organize the NetESFunc return type guesses.
+ *
+ * Revision 1.11  2003/03/10 23:40:53  steve
+ *  Keep parameter constants for the ivl_target API.
+ *
+ * Revision 1.10  2003/01/26 21:15:58  steve
+ *  Rework expression parsing and elaboration to
+ *  accommodate real/realtime values and expressions.
+ *
+ * Revision 1.9  2002/11/09 00:25:27  steve
+ *  Add dup_expr for user defined function calls.
+ *
+ * Revision 1.8  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.7  2002/01/28 00:52:41  steve
+ *  Add support for bit select of parameters.
+ *  This leads to a NetESelect node and the
+ *  vvp code generator to support that.
+ *
+ * Revision 1.6  2001/11/19 01:54:14  steve
+ *  Port close cropping behavior from mcrgb
+ *  Move window array reset to libmc.
+ *
+ * Revision 1.5  2001/07/25 03:10:48  steve
+ *  Create a config.h.in file to hold all the config
+ *  junk, and support gcc 3.0. (Stephan Boettcher)
+ *
+ * Revision 1.4  2000/05/07 18:20:07  steve
+ *  Import MCD support from Stephen Tell, and add
+ *  system function parameter support to the IVL core.
+ *
+ * Revision 1.3  2000/05/04 03:37:58  steve
+ *  Add infrastructure for system functions, move
+ *  $time to that structure and add $random.
+ */
+
@@ -14,8 +14,11 @@
 *
 *    You should have received a copy of the GNU General Public License
 *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: elab_anet.cc,v 1.10 2004/10/04 01:10:52 steve Exp $"
+#endif

 # include "config.h"

@@ -81,18 +84,15 @@ NetNet* PEConcat::elaborate_anet(Design*des, NetScope*scope) const
 	   concat operator from least significant to most significant,
 	   which is opposite from how they are given in the list.

-	   Allow for a repeat count other than 1 by repeating the
+	   Allow for a repeat count other then 1 by repeating the
 	   connect loop as many times as necessary. */

      NetNet*osig = new NetNet(scope, scope->local_symbol(),
 			       NetNet::IMPLICIT_REG, pins);
-	/* Assume that all the data types are the same. */
-      osig->data_type(nets[0]->data_type());

      pins = 0;
      for (unsigned idx = nets.count() ;  idx > 0 ;  idx -= 1) {
 	    NetNet*cur = nets[idx-1];
-	    assert(cur->data_type() == osig->data_type());
 	    for (unsigned pin = 0;  pin < cur->pin_count();  pin += 1) {
 		  connect(osig->pin(pins), cur->pin(pin));
 		  pins += 1;
@@ -109,10 +109,11 @@ NetNet* PEIdent::elaborate_anet(Design*des, NetScope*scope) const

      NetNet*       sig = 0;
      NetMemory*    mem = 0;
+      NetVariable*  var = 0;
      const NetExpr*par = 0;
      NetEvent*     eve = 0;

-      symbol_search(this, des, scope, path_, sig, mem, par, eve);
+      symbol_search(des, scope, path_, sig, mem, var, par, eve);


      if (mem != 0) {
@@ -164,3 +165,39 @@ NetNet* PEIdent::elaborate_anet(Design*des, NetScope*scope) const
      return sig;
 }

+/*
+ * $Log: elab_anet.cc,v $
+ * Revision 1.10  2004/10/04 01:10:52  steve
+ *  Clean up spurious trailing white space.
+ *
+ * Revision 1.9  2003/09/19 03:50:12  steve
+ *  Remove find_memory method from Design class.
+ *
+ * Revision 1.8  2003/06/21 01:21:43  steve
+ *  Harmless fixup of warnings.
+ *
+ * Revision 1.7  2003/03/06 00:28:41  steve
+ *  All NetObj objects have lex_string base names.
+ *
+ * Revision 1.6  2003/01/27 05:09:17  steve
+ *  Spelling fixes.
+ *
+ * Revision 1.5  2002/08/12 01:34:58  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.4  2001/12/03 04:47:14  steve
+ *  Parser and pform use hierarchical names as hname_t
+ *  objects instead of encoded strings.
+ *
+ * Revision 1.3  2001/07/25 03:10:48  steve
+ *  Create a config.h.in file to hold all the config
+ *  junk, and support gcc 3.0. (Stephan Boettcher)
+ *
+ * Revision 1.2  2001/01/06 02:29:36  steve
+ *  Support arrays of integers.
+ *
+ * Revision 1.1  2000/12/06 06:31:09  steve
+ *  Check lvalue of procedural continuous assign (PR#29)
+ *
+ */
+
@@ -0,0 +1,315 @@
+/*
+ * Copyright (c) 2000 Stephen Williams (steve@icarus.com)
+ *
+ *    This source code is free software; you can redistribute it
+ *    and/or modify it in source code form under the terms of the GNU
+ *    General Public License as published by the Free Software
+ *    Foundation; either version 2 of the License, or (at your option)
+ *    any later version.
+ *
+ *    This program 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.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: elab_pexpr.cc,v 1.21 2004/02/20 06:22:56 steve Exp $"
+#endif
+
+# include "config.h"
+
+# include  "PExpr.h"
+# include  "compiler.h"
+# include  "util.h"
+
+# include  <iostream>
+
+NetExpr*PExpr::elaborate_pexpr(Design*des, NetScope*sc) const
+{
+      cerr << get_line() << ": error: invalid parameter expression: "
+	   << *this << endl;
+      des->errors += 1;
+
+      return 0;
+}
+
+/*
+ * Binary operators have sub-expressions that must be elaborated as
+ * parameter expressions. If either of them fail, then give up. Once
+ * they are taken care of, make the base object just as in any other
+ * expression.
+ */
+NetExpr*PEBinary::elaborate_pexpr (Design*des, NetScope*scope) const
+{
+      NetExpr*lp = left_->elaborate_pexpr(des, scope);
+      NetExpr*rp = right_->elaborate_pexpr(des, scope);
+      if ((lp == 0) || (rp == 0)) {
+	    delete lp;
+	    delete rp;
+	    return 0;
+      }
+
+      NetEBinary*tmp = elaborate_expr_base_(des, lp, rp);
+      return tmp;
+}
+
+/*
+ * Event though parameters are not generally sized, parameter
+ * expressions can include concatenation expressions. This requires
+ * that the subexpressions all have well-defined size (in spite of
+ * being in a parameter expression) in order to get a defined
+ * value. The sub-expressions themselves must also be value parameter
+ * expressions.
+ */
+NetEConcat* PEConcat::elaborate_pexpr(Design*des, NetScope*scope) const
+{
+      NetExpr* repeat = 0;
+
+	/* If there is a repeat expression, then evaluate the constant
+	   value and set the repeat count.  */
+      if (repeat_) {
+	    repeat = repeat_->elaborate_pexpr(des, scope);
+	    if (repeat == 0) {
+		  cerr << get_line() << ": error: "
+			"concatenation repeat expression cannot be evaluated."
+		       << endl;
+		  des->errors += 1;
+	    }
+
+	      /* continue on even if the repeat expression doesn't
+		 work, as we can find more errors. */
+      }
+
+	/* Make the empty concat expression. */
+      NetEConcat*tmp = new NetEConcat(parms_.count(), repeat);
+      tmp->set_line(*this);
+
+	/* Elaborate all the operands and attach them to the concat
+	   node. Use the elaborate_pexpr method instead of the
+	   elaborate_expr method. */
+      for (unsigned idx = 0 ;  idx < parms_.count() ;  idx += 1) {
+	    assert(parms_[idx]);
+	    NetExpr*ex = parms_[idx]->elaborate_pexpr(des, scope);
+	    if (ex == 0) continue;
+
+	    ex->set_line(*parms_[idx]);
+
+	    if (dynamic_cast<NetEParam*>(ex)) {
+
+		    /* If this parameter is a NetEParam, then put off
+		       the width check for later. */
+
+	    } else if (! ex->has_width()) {
+		  cerr << ex->get_line() << ": error: operand of "
+		       << "concatenation has indefinite width: "
+		       << *ex << endl;
+		  des->errors += 1;
+
+	    }
+
+	    tmp->set(idx, ex);
+      }
+
+      return tmp;
+}
+
+NetExpr*PEFNumber::elaborate_pexpr(Design*des, NetScope*scope) const
+{
+      return elaborate_expr(des, scope);
+}
+
+/*
+ * Parameter expressions may reference other parameters, but only in
+ * the current scope. Preserve the parameter reference in the
+ * parameter expression I'm generating, instead of evaluating it now,
+ * because the referenced parameter may yet be overridden.
+ */
+NetExpr*PEIdent::elaborate_pexpr(Design*des, NetScope*scope) const
+{
+      hname_t path = path_;
+      char*name = path.remove_tail_name();
+
+      NetScope*pscope = scope;
+      if (path.peek_name(0))
+	    pscope = des->find_scope(scope, path);
+
+      perm_string perm_name = lex_strings.make(name);
+      delete name;
+
+      const NetExpr*ex = pscope->get_parameter(perm_name);
+      if (ex == 0) {
+	    cerr << get_line() << ": error: identifier ``" << path_ <<
+		  "'' is not a parameter in " << scope->name() << "." << endl;
+	    des->errors += 1;
+	    return 0;
+      }
+
+      NetExpr*res = new NetEParam(des, pscope, perm_name);
+      res->set_line(*this);
+      assert(res);
+
+      assert(idx_ == 0);
+      if (msb_ && lsb_) {
+	    cerr << get_line() << ": sorry: Cannot part select "
+		  "bits of parameters." << endl;
+	    des->errors += 1;
+
+      } else if (msb_) {
+
+	      /* We have here a bit select. Insert a NetESelect node
+		 to handle it. */
+	    NetExpr*tmp = msb_->elaborate_pexpr(des, scope);
+	    if (tmp != 0) {
+		  res = new NetESelect(res, tmp, 1);
+	    }
+      }
+
+      return res;
+}
+
+/*
+ * Simple numbers can be elaborated by the elaborate_expr method.
+ */
+NetExpr*PENumber::elaborate_pexpr(Design*des, NetScope*sc) const
+{
+      return elaborate_expr(des, sc);
+}
+
+
+NetEConst* PEString::elaborate_pexpr(Design*des, NetScope*scope) const
+{
+      return elaborate_expr(des, scope);
+}
+
+NetETernary* PETernary::elaborate_pexpr(Design*des, NetScope*scope) const
+{
+      NetExpr*c = expr_->elaborate_pexpr(des, scope);
+      NetExpr*t = tru_->elaborate_pexpr(des, scope);
+      NetExpr*f = fal_->elaborate_pexpr(des, scope);
+      if (c == 0) return 0;
+      if (t == 0) return 0;
+      if (f == 0) return 0;
+      return new NetETernary(c, t, f);
+}
+
+NetExpr*PEUnary::elaborate_pexpr (Design*des, NetScope*scope) const
+{
+      NetExpr*ip = expr_->elaborate_pexpr(des, scope);
+      if (ip == 0) return 0;
+
+      /* Should we evaluate expressions ahead of time,
+       * just like in PEBinary::elaborate_expr() ?
+       */
+
+      NetEUnary*tmp;
+      switch (op_) {
+	  default:
+	    tmp = new NetEUnary(op_, ip);
+	    tmp->set_line(*this);
+	    break;
+	  case '~':
+	    tmp = new NetEUBits(op_, ip);
+	    tmp->set_line(*this);
+	    break;
+	  case '!': // Logical NOT
+	  case '&': // Reduction AND
+	  case '|': // Reduction OR
+	  case '^': // Reduction XOR
+	  case 'A': // Reduction NAND (~&)
+	  case 'N': // Reduction NOR (~|)
+	  case 'X': // Reduction NXOR (~^)
+	    tmp = new NetEUReduce(op_, ip);
+	    tmp->set_line(*this);
+	    break;
+      }
+      return tmp;
+}
+
+/*
+ * $Log: elab_pexpr.cc,v $
+ * Revision 1.21  2004/02/20 06:22:56  steve
+ *  parameter keys are per_strings.
+ *
+ * Revision 1.20  2003/05/30 02:55:32  steve
+ *  Support parameters in real expressions and
+ *  as real expressions, and fix multiply and
+ *  divide with real results.
+ *
+ * Revision 1.19  2003/01/27 05:09:17  steve
+ *  Spelling fixes.
+ *
+ * Revision 1.18  2002/12/05 02:14:33  steve
+ *  Support bit select in constant expressions.
+ *
+ * Revision 1.17  2002/11/09 01:40:19  steve
+ *  Postpone parameter width check to evaluation.
+ *
+ * Revision 1.16  2002/08/12 01:34:59  steve
+ *  conditional ident string using autoconfig.
+ *
+ * Revision 1.15  2002/05/06 02:30:27  steve
+ *  Allow parameters in concatenation of widths are defined.
+ *
+ * Revision 1.14  2002/05/05 21:11:50  steve
+ *  Put off evaluation of concatenation repeat expresions
+ *  until after parameters are defined. This allows parms
+ *  to be used in repeat expresions.
+ *
+ *  Add the builtin $signed system function.
+ *
+ * Revision 1.13  2002/01/28 00:52:41  steve
+ *  Add support for bit select of parameters.
+ *  This leads to a NetESelect node and the
+ *  vvp code generator to support that.
+ *
+ * Revision 1.12  2001/12/03 04:47:14  steve
+ *  Parser and pform use hierarchical names as hname_t
+ *  objects instead of encoded strings.
+ *
+ * Revision 1.11  2001/11/07 04:01:59  steve
+ *  eval_const uses scope instead of a string path.
+ *
+ * Revision 1.10  2001/10/07 03:38:08  steve
+ *  parameter names do not have defined size.
+ *
+ * Revision 1.9  2001/07/25 03:10:49  steve
+ *  Create a config.h.in file to hold all the config
+ *  junk, and support gcc 3.0. (Stephan Boettcher)
+ *
+ * Revision 1.8  2001/01/14 23:04:56  steve
+ *  Generalize the evaluation of floating point delays, and
+ *  get it working with delay assignment statements.
+ *
+ *  Allow parameters to be referenced by hierarchical name.
+ *
+ * Revision 1.7  2001/01/02 04:21:13  steve
+ *  Support a bunch of unary operators in parameter expressions.
+ *
+ * Revision 1.6  2000/12/16 19:03:30  steve
+ *  Evaluate <= and ?: in parameter expressions (PR#81)
+ *
+ * Revision 1.5  2000/06/13 05:22:16  steve
+ *  Support concatenation in parameter expressions.
+ *
+ * Revision 1.4  2000/06/01 02:31:39  steve
+ *  Parameters can be strings.
+ *
+ * Revision 1.3  2000/03/12 18:22:11  steve
+ *  Binary and unary operators in parameter expressions.
+ *
+ * Revision 1.2  2000/03/12 04:35:22  steve
+ *  Allow parameter identifiers in parameter expressions.
+ *
+ * Revision 1.1  2000/03/08 04:36:53  steve
+ *  Redesign the implementation of scopes and parameters.
+ *  I now generate the scopes and notice the parameters
+ *  in a separate pass over the pform. Once the scopes
+ *  are generated, I can process overrides and evalutate
+ *  paremeters before elaboration begins.
+ *
+ */
+
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2008 Stephen Williams (steve@icarus.com)
- *
- *    This source code is free software; you can redistribute it
- *    and/or modify it in source code form under the terms of the GNU
- *    General Public License as published by the Free Software
- *    Foundation; either version 2 of the License, or (at your option)
- *    any later version.
- *
- *    This program 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.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include "config.h"
-
-# include  "AStatement.h"
-
-# include  <cstdlib>
-# include  <iostream>
-
@@ -1,246 +0,0 @@
-/*
- * Copyright (c) 2012-2014 Stephen Williams (steve@icarus.com)
- *
- *    This source code is free software; you can redistribute it
- *    and/or modify it in source code form under the terms of the GNU
- *    General Public License as published by the Free Software
- *    Foundation; either version 2 of the License, or (at your option)
- *    any later version.
- *
- *    This program 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.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include  "pform_types.h"
-# include  "netlist.h"
-# include  "netclass.h"
-# include  "netdarray.h"
-# include  "netenum.h"
-# include  "netparray.h"
-# include  "netscalar.h"
-# include  "netstruct.h"
-# include  "netvector.h"
-# include  "netmisc.h"
-# include  <typeinfo>
-# include  "ivl_assert.h"
-
-using namespace std;
-
-/*
- * Elaborations of types may vary depending on the scope that it is
- * done in, so keep a per-scope cache of the results.
- */
-ivl_type_s* data_type_t::elaborate_type(Design*des, NetScope*scope)
-{
-      Definitions*use_definitions = scope;
-      if (use_definitions == 0)
-	    use_definitions = des;
-
-      map<Definitions*,ivl_type_s*>::iterator pos = cache_type_elaborate_.lower_bound(use_definitions);
-      if (pos->first == use_definitions)
-	    return pos->second;
-
-      ivl_type_s*tmp = elaborate_type_raw(des, scope);
-      cache_type_elaborate_.insert(pos, pair<NetScope*,ivl_type_s*>(scope, tmp));
-      return tmp;
-}
-
-ivl_type_s* data_type_t::elaborate_type_raw(Design*des, NetScope*) const
-{
-      cerr << get_fileline() << ": internal error: "
-	   << "Elaborate method not implemented for " << typeid(*this).name()
-	   << "." << endl;
-      des->errors += 1;
-      return 0;
-}
-
-ivl_type_s* atom2_type_t::elaborate_type_raw(Design*des, NetScope*) const
-{
-      switch (type_code) {
-	  case 64:
-	    if (signed_flag)
-		  return &netvector_t::atom2s64;
-	    else
-		  return &netvector_t::atom2u64;
-
-	  case 32:
-	    if (signed_flag)
-		  return &netvector_t::atom2s32;
-	    else
-		  return &netvector_t::atom2u32;
-
-	  case 16:
-	    if (signed_flag)
-		  return &netvector_t::atom2s16;
-	    else
-		  return &netvector_t::atom2u16;
-
-	  case 8:
-	    if (signed_flag)
-		  return &netvector_t::atom2s8;
-	    else
-		  return &netvector_t::atom2u8;
-
-	  default:
-	    cerr << get_fileline() << ": internal error: "
-		 << "atom2_type_t type_code=" << type_code << "." << endl;
-	    des->errors += 1;
-	    return 0;
-      }
-}
-
-ivl_type_s* class_type_t::elaborate_type_raw(Design*, NetScope*) const
-{
-      ivl_assert(*this, save_elaborated_type);
-      return save_elaborated_type;
-}
-
-/*
- * elaborate_type_raw for enumerations is actually mostly performed
- * during scope elaboration so that the enumeration literals are
- * available at the right time. At that time, the netenum_t* object is
- * stashed in the scope so that I can retrieve it here.
- */
-ivl_type_s* enum_type_t::elaborate_type_raw(Design*des, NetScope*scope) const
-{
-      ivl_assert(*this, scope);
-      ivl_type_s*tmp = scope->enumeration_for_key(this);
-      if (tmp) return tmp;
-
-      tmp = des->enumeration_for_key(this);
-      return tmp;
-}
-
-ivl_type_s* vector_type_t::elaborate_type_raw(Design*des, NetScope*scope) const
-{
-      vector<netrange_t> packed;
-
-      if (pdims.get()) {
-	    for (list<pform_range_t>::const_iterator cur = pdims->begin()
-		       ; cur != pdims->end() ; ++ cur) {
-
-		  NetExpr*me = elab_and_eval(des, scope, cur->first, 0, true);
-
-		  NetExpr*le = elab_and_eval(des, scope, cur->second, 0, true);
-
-		    /* If elaboration failed for either expression, we
-		       should have already reported the error, so just
-		       skip the following evaluation to recover. */
-
-		  long mnum = 0, lnum = 0;
-		  if ( me && ! eval_as_long(mnum, me) ) {
-			assert(0);
-			des->errors += 1;
-		  }
-
-		  if ( le && ! eval_as_long(lnum, le) ) {
-			assert(0);
-			des->errors += 1;
-		  }
-
-		  packed.push_back(netrange_t(mnum, lnum));
-	    }
-      }
-
-      netvector_t*tmp = new netvector_t(packed, base_type);
-      tmp->set_signed(signed_flag);
-      tmp->set_isint(integer_flag);
-
-      return tmp;
-}
-
-ivl_type_s* real_type_t::elaborate_type_raw(Design*, NetScope*) const
-{
-      switch (type_code) {
-	  case REAL:
-	    return &netreal_t::type_real;
-	  case SHORTREAL:
-	    return &netreal_t::type_shortreal;
-      }
-      return 0;
-}
-
-ivl_type_s* string_type_t::elaborate_type_raw(Design*, NetScope*) const
-{
-      return &netstring_t::type_string;
-}
-
-ivl_type_s* parray_type_t::elaborate_type_raw(Design*des, NetScope*) const
-{
-      cerr << get_fileline() << " : sorry: "
-           << "Packed arrays are not currently supported in this context."
-           << endl;
-      des->errors += 1;
-      return 0;
-}
-
-netstruct_t* struct_type_t::elaborate_type_raw(Design*des, NetScope*scope) const
-{
-      netstruct_t*res = new netstruct_t;
-
-      res->packed(packed_flag);
-
-      if (union_flag)
-	    res->union_flag(true);
-
-      for (list<struct_member_t*>::iterator cur = members->begin()
-		 ; cur != members->end() ; ++ cur) {
-
-	      // Elaborate the type of the member.
-	    struct_member_t*curp = *cur;
-	    ivl_type_t mem_vec = curp->type->elaborate_type(des, scope);
-	    if (mem_vec == 0)
-		  continue;
-
-	      // There may be several names that are the same type:
-	      //   <data_type> name1, name2, ...;
-	      // Process all the member, and give them a type.
-	    for (list<decl_assignment_t*>::iterator name = curp->names->begin()
-		       ; name != curp->names->end() ;  ++ name) {
-		  decl_assignment_t*namep = *name;
-
-		  netstruct_t::member_t memb;
-		  memb.name = namep->name;
-		  memb.net_type = mem_vec;
-		  res->append_member(des, memb);
-	    }
-      }
-
-      return res;
-}
-
-ivl_type_s* uarray_type_t::elaborate_type_raw(Design*des, NetScope*scope) const
-{
-
-      ivl_type_t btype = base_type->elaborate_type(des, scope);
-
-      assert(dims->size() >= 1);
-      list<pform_range_t>::const_iterator cur = dims->begin();
-
-	// Special case: if the dimension is nil:nil, this is a
-	// dynamic array. Note that we only know how to handle dynamic
-	// arrays with 1 dimension at a time.
-      if (cur->first==0 && cur->second==0) {
-	    assert(dims->size()==1);
-	    ivl_type_s*res = new netdarray_t(btype);
-	    return res;
-      }
-
-      vector<netrange_t> dimensions;
-      bool bad_range = evaluate_ranges(des, scope, dimensions, *dims);
-
-      if (bad_range) {
-	    cerr << get_fileline() << " : warning: "
-		 << "Bad dimensions for type here." << endl;
-      }
-
-      ivl_assert(*this, btype);
-      ivl_type_s*res = new netuarray_t(dimensions, btype);
-      return res;
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
steve	568924dcb5	Version stamp update	2006-10-04 17:08:59 +00:00
steve	33b3f7bdda	Detect delay precision overflow.	2006-10-04 00:37:03 +00:00
steve	3a04e0a051	Fix a dangling reference to NetEParam objects in defparams.	2006-10-04 00:34:45 +00:00
steve	66ae377801	Snapshot v0.8.3	2006-10-03 21:34:40 +00:00
steve	898db57405	Describe the preconfigure steps.	2006-09-28 23:42:14 +00:00
steve	0fe45b5046	Fix host type detection in some configure scripts.	2006-09-22 03:29:02 +00:00
steve	20cfe99457	Fix left shift of small unsized constants.	2006-09-20 20:27:02 +00:00
steve	4ec8b38a5c	Special handling of exploded memory arguments.	2006-09-15 23:56:05 +00:00
steve	79add47002	Build instruction typos and minor corrections.	2006-09-15 23:53:24 +00:00
steve	c429f4c9a7	missing sig diagnostics.	2006-08-23 04:09:14 +00:00
steve	7f6a0b652a	Do not count self as signifincant in nodangle.	2006-08-23 04:08:55 +00:00
steve	9f3f9154eb	Fix missing sig on certain mux outputs. Ignore condit statements (for synthesis) with no outputs.	2006-08-23 04:08:19 +00:00
steve	498fd06412	Add synthesis for casez statements.	2006-08-22 04:22:45 +00:00
steve	6d3b780791	Improve performance of unlink of heavily connected nexa.	2006-08-15 03:41:24 +00:00
steve	a0ec981c50	Improved nexus management performance.	2006-08-08 02:17:48 +00:00
steve	930cd598a0	Typo clearing an event cell.	2006-08-06 18:09:42 +00:00
steve	77adab0f33	Remove excess PEString:: prefix for stubborn compilers.	2006-07-28 16:26:17 +00:00
steve	0e3768f829	Handle statement output override better in blocks.	2006-07-23 19:42:33 +00:00
steve	22884f2e64	Add support for full_case attribute.	2006-07-10 00:21:49 +00:00
steve	62da6aca28	Root dir variable does not include lib/ivl components.	2006-07-07 21:31:50 +00:00
steve	525ebddb0c	Properly synthesize casex statements.	2006-07-02 00:50:15 +00:00
steve	521750c007	Fix ambiguity warnings.	2006-06-27 01:47:25 +00:00
steve	85d2833a62	Fix const/non-const warnings.	2006-06-27 01:37:14 +00:00
steve	e2cc258283	Cure exit from main warning.	2006-06-27 01:33:17 +00:00
steve	f09cf85c76	Fix unused var warning for mingw32 build.	2006-06-27 01:30:20 +00:00
steve	c32de1dba0	Handle case where case output appears to be internal.	2006-06-26 00:05:46 +00:00
steve	628b866c36	Change Copyright tag to License.	2006-06-24 05:22:55 +00:00
steve	08dbe801c1	synthesis of NetCondit handles partial resets.	2006-06-23 03:49:46 +00:00
steve	101810df21	Handle simple memory addressing in expression synthesis.	2006-06-15 01:57:26 +00:00
steve	3877b636df	synthesis for NetEBitSel.	2006-06-14 03:02:54 +00:00
steve	9d028a63f2	Remove redundant call to get_root_dir.	2006-06-14 03:01:49 +00:00
steve	35e5cea9df	Add support for -Wunused warnings.	2006-06-12 00:16:50 +00:00
steve	ec510071f1	Fix partial use of NetMux in sync condit statements.	2006-06-07 03:17:39 +00:00
steve	7413c533f6	Compilation warnings.	2006-06-02 23:42:48 +00:00
steve	dde69cebb6	Handle condit clauses with unassigned outputs.	2006-06-01 03:01:48 +00:00
steve	f942657ad5	NetESignal input is only selected bits.	2006-05-21 21:58:46 +00:00
steve	fad1620828	Replace assertions with error messages.	2006-05-20 16:06:48 +00:00
steve	a9931e7a58	Fix synthesis of l-value bit select in block.	2006-05-18 01:47:12 +00:00
steve	6cd4adb135	Fix synthesis of expressions with land of vectors.	2006-05-15 03:55:22 +00:00
steve	9643b86ab3	Update to use only Mingw for build.	2006-05-08 04:33:35 +00:00
steve	452eaeaea8	Handle memory assignments out of range during synthesis	2006-05-05 01:56:36 +00:00
steve	3a6e2df958	Fix uninitialized mem_lref_ member.	2006-05-02 02:00:15 +00:00
steve	e73b7e2656	parse.cc and parse.h are made by the same steps.	2006-05-01 20:11:56 +00:00
steve	469ec11190	Merge fixes from devel tree.	2006-04-25 05:11:14 +00:00
steve	e0bbfa512c	Constant propagate addresses through NetRamDq read ports.	2006-04-23 04:26:13 +00:00
steve	94c9af2a5d	Add cprop debugging.	2006-04-23 04:25:45 +00:00
steve	9f2e7df0ff	vpp.conf is generated, so add it to cvsignore.	2006-04-23 02:44:29 +00:00
steve	f02b2c9d7a	Fix handling of exploded memories with partial or missing resets.	2006-04-16 19:26:37 +00:00
steve	058dac4290	Exploded memories accessed by constant indices.	2006-04-10 03:43:39 +00:00
steve	ce4e21a962	Punt on set/reset if some sources are unconnected.	2006-04-01 01:37:58 +00:00
steve	065d6bc1e3	Add synth debug flag	2006-04-01 01:37:24 +00:00
steve	312d09dc1d	Handle asynchronous demux/bit replacements.	2006-03-26 23:09:21 +00:00
steve	faf7f30283	Add the .demux device.	2006-03-26 23:09:00 +00:00
steve	5d41e98c1f	More installation directory flexibility.	2006-03-26 21:47:26 +00:00
steve	5e8330a4ff	Better error messages when synthesis fails.	2006-03-18 18:43:21 +00:00
steve	ef8964c65a	Fix crash when memory exploding doesnot work	2006-03-16 05:40:18 +00:00
steve	aa42ec381c	Fix a spelling error in an error message.	2006-03-16 05:39:43 +00:00
steve	c9d4aab9cb	Right shifts really are allowed.	2006-03-16 05:39:20 +00:00
steve	b8bc531f05	Fix the memsynth1 case.	2006-03-12 07:34:16 +00:00
steve	79cb8c883a	Add support for negedge FFs by using attributes.	2006-02-25 05:03:28 +00:00
steve	27e633410c	Add change callback to vpiMemory objects.	2006-02-19 16:57:31 +00:00
steve	7527c466ed	Handle synthesis of FF vectors with l-value decoder.	2006-02-19 00:11:31 +00:00
steve	3ea1214160	More robust test for concat constant-ness.	2006-02-07 22:46:23 +00:00
steve	782542922d	Detect nul arguments to concat expressions.	2006-02-07 22:45:54 +00:00
steve	1f8102c4dc	Speed up processing of connect when one side is empty.	2006-01-27 02:05:46 +00:00
steve	c4b34e8720	Document how the default statement handling works.	2006-01-27 01:58:53 +00:00
steve	e494be7cbf	Fix pin_Sel overrun.	2006-01-22 00:13:59 +00:00
steve	eb0a78e9ce	When mux has wide select but sparse choices, use 1hot translation.	2006-01-21 21:42:31 +00:00
steve	e80138ec8c	Restrict DFF to only one of Sset and Sclr.	2006-01-18 06:16:11 +00:00
steve	943316c6f6	Support DFF with synchronous inputs.	2006-01-18 06:15:45 +00:00
steve	52b8ed9077	Rework l-value handling to allow for more l-value type flexibility.	2006-01-18 01:23:23 +00:00
steve	fc227aa3e1	Remember to set DLL= flag.	2006-01-14 20:13:38 +00:00
steve	41993815e9	Show synchronous set/clr of FF.	2006-01-14 20:13:22 +00:00
steve	c5063f5d2f	Case statement handles partial outputs.	2006-01-01 02:25:07 +00:00
steve	f28aa11936	Allow for implicit case default in synchronous processes.	2006-01-01 01:30:39 +00:00
steve	3131fa68b7	Fix crashes caused bu synthesis of sqrt32.v.	2005-12-31 04:28:14 +00:00
steve	def3809b3f	Handle DFF definitions spread out within a block.	2005-12-19 01:13:47 +00:00
steve	3429c24a6a	Properly fail when concat is not actually constant.	2005-12-18 21:06:01 +00:00
steve	f47627d752	Fix missing outputs from synchronous conditionals to get out from in.	2005-12-15 02:38:51 +00:00
steve	9468f3d06f	Handle both asynchronous set and reset.	2005-12-14 01:53:39 +00:00
steve	b997de63a5	Account for sync vs async muxes.	2005-12-14 00:54:29 +00:00
steve	f50f06ab4e	Handle concatenations in l-values.	2005-12-10 04:26:32 +00:00
steve	d5d03812cd	Fix crash on block with assignments that assign lval to self.	2005-12-10 03:30:50 +00:00
steve	b6d5a0675e	Support constant concatenation of constants.	2005-12-07 03:28:44 +00:00
steve	e63e830d62	Error messages for missing else clauses.	2005-12-07 02:14:37 +00:00
steve	74ca34bd82	Handle partial sets of conditional clauses.	2005-11-16 00:38:26 +00:00
steve	c9d480028e	Allow for block output to be set throughout the statements.	2005-11-13 22:28:48 +00:00
steve	cc89ba66af	Do not panic if case statement is nul.	2005-11-13 22:28:14 +00:00
steve	05e6d51004	Snapshot 0.8.2	2005-09-30 15:13:37 +00:00
steve	ae583204e3	Snapshot 0.8.2	2005-09-30 15:01:44 +00:00
steve	018476f7cd	More predictable ordering of items in NexusSet.	2005-09-25 23:30:31 +00:00
steve	bfabeab6b9	Add Xilinx virtex as a reference EDIF device.	2005-09-25 16:35:36 +00:00
steve	4a3f1a3641	Attach line numbers to NetMux devices.	2005-09-11 02:56:37 +00:00
steve	d97560caa7	Fix overly agressive constant propagation through MUX causing lost Z bits.	2005-09-11 02:50:51 +00:00
steve	393102d43a	Evaluate magnitude compare with real operands.	2005-09-09 02:17:08 +00:00
steve	8e97a0e4d4	Support b1 edge in primitive tables.	2005-09-09 02:13:15 +00:00
steve	4ea789a2d7	More explicit internal error message.	2005-09-04 15:41:54 +00:00
steve	354f7ad920	More explicit internal error message.	2005-09-04 15:39:19 +00:00
steve	f4a6206790	Handle b0 edges in primitives.	2005-09-04 15:33:19 +00:00
steve	fd29ba3398	Reduce mux slices that are constant throughout range.	2005-08-28 22:00:39 +00:00
steve	44fbf60885	More thorough constant propagation through MUX devices.	2005-08-28 19:51:02 +00:00
steve	a0d69113c3	More thorough constant propagation through MUX devices.	2005-08-28 19:50:03 +00:00
steve	86942ac592	Dump CMP_GE devices.	2005-08-28 17:37:28 +00:00
steve	075f9cbc4b	Back-port edif_nexus_to_joint from tgt-edif.	2005-08-27 22:29:30 +00:00
steve	9dab368880	fix configure and build instructions for mingw build.	2005-08-27 22:19:37 +00:00
steve	5f6027fb66	Join cell0 and cell1 instances in LPM target.	2005-08-25 18:52:32 +00:00
steve	53156793fe	Add support for implicit defaults in case and conditions.	2005-08-22 01:00:41 +00:00
steve	4644c220e8	Handle statements in blocks overriding previous statement outputs.	2005-08-21 22:49:54 +00:00
steve	c30cd9afea	Display NOR gates.	2005-08-21 22:27:57 +00:00
steve	a8f45a18f0	Fix the comment in the EDIT header.	2005-08-21 22:25:51 +00:00
steve	6828e3e2ea	Generate LPM for the CMP_EQ device.	2005-08-21 14:39:33 +00:00
steve	75eb372adf	configure tgt-edif subdir.	2005-08-21 02:20:16 +00:00
steve	3b753fe52b	Add the tgt-edif target.	2005-08-17 01:17:28 +00:00
steve	8c73fa7840	Fix compilation warnings/errors with newer compilers.	2005-08-13 00:45:53 +00:00
steve	d310e656c7	Fix parse errors related to pr766.	2005-07-27 14:48:34 +00:00
steve	0510367b70	Fix compile errors with g++-4.	2005-07-06 22:41:34 +00:00
steve	3e11207a56	Fix gcc4 build issues.	2005-06-14 15:33:54 +00:00
steve	665f31271f	popen must be matched by pclose.	2005-03-22 15:53:12 +00:00
steve	9a2b56675c	Fix set_width to allow binary logical operands to be self determined.	2005-03-05 01:36:16 +00:00
steve	c9f38f5ffa	Improve distclean targets.	2005-02-23 18:40:23 +00:00
steve	5ea4152162	Spelling fixes from Larry.	2005-02-23 18:37:52 +00:00
steve	327c897d7e	Spellig fixes.	2005-02-19 16:39:30 +00:00
steve	29ebe486b7	Fix multiple delete of an expression.	2005-02-19 16:38:14 +00:00
steve	4af0acb3be	Fix (from Tony) for clock compression detection	2005-02-11 17:04:22 +00:00
steve	8435774c26	Fix evaluate of constants in netlist concatenation repeats.	2005-01-29 00:18:23 +00:00
steve	6172748c65	Add stub config files to CVS.	2005-01-28 18:30:11 +00:00
steve	ca0ae9040a	Add ability to compile real values into index registers.	2005-01-28 18:29:29 +00:00
steve	d9cdbde3f6	More robust handling of file name argument to $fopen.	2005-01-01 20:07:41 +00:00
steve	307a97116f	Fix leak of word registers in code generator.	2004-12-12 04:25:10 +00:00
steve	83d2c6dfd1	Update for 0.8 files.	2004-10-14 01:12:41 +00:00