Fix some compile warnings when using more modern compilers

This just copies the same change that was done for development over to V0.8.

.gitattributes

@@ -1,2 +0,0 @@
-# gperf in MSYS chokes on DOS line endings
-*.gperf text eol=lf

.gitignore

@@ -4,23 +4,9 @@
 #
 # 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
@@ -29,17 +15,8 @@ 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
@@ -51,8 +28,6 @@ dep
 *.vpi
 /cadpli/cadpli.vpl
 
-/tgt-blif/Makefile
-
 # lex, yacc and gperf output
 /driver/cflexor.c
 /driver/cfparse.c
@@ -60,14 +35,9 @@ dep
 /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
+/ivlpp/parse.c
+/ivlpp/parse.h
+/ivlpp/parse.output
 
 /lexor.cc
 /lexor_keyword.cc
@@ -77,17 +47,8 @@ dep
 /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
@@ -96,11 +57,6 @@ dep
 # Program created files
 /vvp/tables.cc
 
-/iverilog-vpi.man
-/driver-vpi/res.rc
-/driver/iverilog.man
-/vvp/vvp.man
-
 # The executables.
 *.exe
 /driver/iverilog
@@ -114,3 +70,13 @@ dep
 
 # Check output
 /check.vvp
+
+# The PostScript and PDF generated manual files.
+/driver/iverilog.ps
+/driver/iverilog.pdf
+/iverilog-vpi.ps
+/iverilog-vpi.pdf
+/tgt-fpga/iverilog-fpga.ps
+/tgt-fpga/iverilog-fpga.pdf
+/vvp/vvp.ps
+/vvp/vvp.pdf

.travis.yml

@@ -1,71 +0,0 @@
-language: cpp
-sudo: required
-dist: xenial
-
-addons:
-  apt:
-    packages:
-    - gperf
-
-sudo: false
-
-notifications:
-  email: false
-
-jobs:
-  include:
-  
-    - stage: Test
-      os: linux
-      dist: xenial
-      before_install:
-        - git clone https://github.com/steveicarus/ivtest.git
-        - export PATH=$HOME/bin:$PATH
-      script:
-        - autoconf
-        - ./configure --prefix=$HOME
-        - make install
-        - make check
-        - cd ivtest
-        - perl vvp_reg.pl
-        - diff regression_report-devel.txt regression_report.txt
-        - perl vpi_reg.pl
-
-    - stage: Test
-      os: linux
-      dist: bionic
-      before_install:
-        - git clone https://github.com/steveicarus/ivtest.git
-        - export PATH=$HOME/bin:$PATH
-      script:
-        - autoconf
-        - ./configure --prefix=$HOME
-        - make install
-        - make check
-        - cd ivtest
-        - perl vvp_reg.pl
-        - diff regression_report-devel.txt regression_report.txt
-        - perl vpi_reg.pl
-
-    - stage: Test
-      os: windows
-      before_install:
-        - git clone https://github.com/steveicarus/ivtest.git
-        - choco uninstall -y mingw
-        - choco upgrade --no-progress -y msys2
-        - export msys2='cmd //C RefreshEnv.cmd '
-        - export msys2+='& set MSYS=winsymlinks:nativestrict '
-        - export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start'
-        - export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --"
-        - export msys2+=" -msys2 -c "\"\$@"\" --"
-        - $msys2 pacman --sync --noconfirm --needed base-devel mingw-w64-x86_64-toolchain
-      script:
-        - $mingw64 ./autoconf.sh
-        - $mingw64 ./configure
-        - $mingw64 make install
-        - $mingw64 make check
-        - cd ivtest
-        - $mingw64 perl update_msys2_report.pl
-        - $mingw64 perl vvp_reg.pl
-        - diff --strip-trailing-cr regression_report-msys2.txt regression_report.txt
-        - $mingw64 perl vpi_reg.pl

AStatement.cc

@@ -1,37 +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 "config.h"
-
-# include  "AStatement.h"
-
-AContrib::AContrib(PExpr*lv, PExpr*rv)
-: lval_(lv), rval_(rv)
-{
-}
-
-AContrib::~AContrib()
-{
-      delete lval_;
-      delete rval_;
-}
-
-AProcess::~AProcess()
-{
-}

AStatement.h

@@ -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 */

Attrib.cc

@@ -14,13 +14,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
  */
 
 # include "config.h"
 
 # include  "Attrib.h"
-# include  <cassert>
+# include  <assert.h>
 
 Attrib::Attrib()
 {

Attrib.h

@@ -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-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
@@ -16,7 +16,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
  */
 
 # include  "StringHeap.h"
@@ -30,7 +30,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 +57,4 @@ class Attrib {
       Attrib& operator= (const Attrib&);
 };
 
-#endif /* IVL_Attrib_H */
+#endif

BUGS.txt

@@ -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,26 +28,26 @@ 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).
@@ -58,25 +57,24 @@ know. What's on my disk is more recent than 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
 
@@ -93,13 +91,13 @@ 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
@@ -110,23 +108,15 @@ invoke the error without any Verilog other than 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 <https://sourceforge.net/p/iverilog/bugs/> is the main
-bug tracking system, although some users have reported bugs at
-<https://github.com/steveicarus/iverilog/issues/>. 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.
-
- system (although you will also find bug rep
-
+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
@@ -135,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
 
@@ -143,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
-<https://sourceforge.net/p/iverilog/patches/>. 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-2018 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
@@ -172,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.
+

COPYING

@@ -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.

HName.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2014 Stephen Williams ([email protected])
+ * Copyright (c) 2001-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
@@ -14,108 +14,241 @@
  *
  *    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
  */
 
 # 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, const 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;
 }

HName.h

@@ -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-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
@@ -16,97 +16,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
  */
 
 # 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, const 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;
-      const std::vector<int>&peek_numbers() 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 this vector has size, then the numbers all together make
-	// up part of the hierarchical name.
-      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 const std::vector<int>& hname_t::peek_numbers(void) const
-{
-      return number_;
-}
-
-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 */
+#endif

LineInfo.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2000-2010 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,21 +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
  */
 
+# include "config.h"
+
 # include  "LineInfo.h"
 # include  <sstream>
 
-using namespace std;
-
 LineInfo::LineInfo()
-: lineno_(0)
-{
-}
-
-LineInfo::LineInfo(const LineInfo&that) :
-    file_(that.file_), lineno_(that.lineno_)
+: file_(0), lineno_(0)
 {
 }
 
@@ -36,12 +31,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;
 }
 
@@ -51,7 +46,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;
 }

LineInfo.h

@@ -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-2010 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,9 @@
  *
  *    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
  */
 
-# include  "StringHeap.h"
 # include  <string>
 
 using namespace std;
@@ -36,23 +35,18 @@ using namespace std;
 class LineInfo {
     public:
       LineInfo();
-      LineInfo(const LineInfo&that);
-      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 */
+#endif

Makefile.in

@@ -12,21 +12,13 @@
 #
 #    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
+
 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
+# This string 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
@@ -37,25 +29,9 @@ 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@
@@ -64,81 +40,54 @@ libdir = @libdir@
 includedir = @includedir@/iverilog$(suffix)
 mandir = @mandir@
 
+libdir64 = @libdir64@
+
 dllib=@DLLIB@
+strip_dynamic=@strip_dynamic@
 
-# For a cross compile these defines will need to be set accordingly.
-HOSTCC = @CC@
-HOSTCFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ @CFLAGS@
-
-BUILDCC = @CC_FOR_BUILD@
-BUILDEXT = @BUILD_EXEEXT@
+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 = @DEFS@ -I. -I$(srcdir) @CPPFLAGS@
+CXXFLAGS = @WARNING_CXXFLAGS@ @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 exposenodes.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 vpi_modules.o target.o \
-    Attrib.o HName.o Module.o PClass.o PDelays.o PEvent.o PExpr.o PFunction.o \
-    PGate.o PGenerate.o PModport.o PNamedItem.o PPackage.o PScope.o PSpec.o \
-    PTask.o PUdp.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) $@
 
 # In the windows world, the installer will need a dosify program to
 # dosify text files.
-ifeq (@MINGW32@,yes)
-all: dosify$(BUILDEXT)
-dosify$(BUILDEXT): $(srcdir)/dosify.c
-	$(BUILDCC) $(CFLAGS) -o dosify$(BUILDEXT) $(srcdir)/dosify.c
+ifeq (@WIN32@,yes)
+all: dep dosify.exe
+dosify.exe: $(srcdir)/dosify.c
+	$(CC) -o dosify.exe $(srcdir)/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. -BMvpi -BPivlpp -tcheck -ocheck.vvp $(srcdir)/examples/hello.vl
+	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'
@@ -154,61 +103,53 @@ else
 endif
 
 clean:
-	$(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true
+	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.h lexor.cc
-	rm -f ivl.exp iverilog-vpi.man iverilog-vpi.pdf iverilog-vpi.ps
-	rm -f parse.output syn-rules.output dosify$(BUILDEXT) ivl@EXEEXT@ check.vvp
+	rm -f ivl.exp iverilog-vpi.pdf iverilog-vpi.ps parse.output
+	rm -f 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
 
 distclean: clean
-	$(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true
-	$(foreach dir,$(NOTUSED),$(MAKE) -C $(dir) $@ && ) true
+	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
-	rm -f stamp-config-h config.h
-	rm -f stamp-_pli_types-h _pli_types.h
+	rm -f config.h
+	rm -f _pli_types.h
 ifneq (@srcdir@,.)
-	rm -f version_tag.h check.conf
-	rmdir $(SUBDIRS) $(NOTUSED)
+	rm -f check.conf
+	rmdir $(SUBDIRS)
 endif
 	rm -rf autom4te.cache
 
-cppcheck: $(O:.o=.cc) $(srcdir)/dosify.c $(srcdir)/version.c
-	cppcheck --enable=all --std=posix --std=c99 --std=c++03 -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
@@ -216,171 +157,154 @@ ifeq (@WIN32@,yes)
 # that really exports the things that the import library imports.
 ivl@EXEEXT@: $O $(srcdir)/ivl.def
 	$(CXX) -o ivl@EXEEXT@ $O $(dllib) @EXTRALIBS@
-	$(DLLTOOL) --dllname ivl@EXEEXT@ --def $(srcdir)/ivl.def \
+	dlltool --dllname ivl@EXEEXT@ --def $(srcdir)/ivl.def \
 		--output-lib libivl.a --output-exp ivl.exp
 	$(CXX) $(LDFLAGS) -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;@IVCFLAGS@;$(CXXFLAGS);' \
+	    -e 's;@LIBDIR64@;@libdir64@;' \
+	    -e 's;@VPIDIR1@;@vpidir1@;' -e 's;@VPIDIR2@;@vpidir2@;' \
 	    -e 's;@INCLUDEDIR@;$(includedir);' \
 	    -e 's;@LIBDIR@;@libdir@;' $< > $@
 	chmod +x $@
 endif
 
-version.exe: $(srcdir)/version.c $(srcdir)/version_base.h version_tag.h
-	$(BUILDCC) $(CFLAGS) -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) @DEPENDENCY_CPPFLAGS@ -c $< -o $*.o $(DEBUGFLAGS)
 	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
 
-# Use pattern rules to avoid parallel build issues (see pr3462585)
-parse%cc parse%h: $(srcdir)/parse%y
-	$(YACC) --verbose -t -p VL --defines=parse.h -o parse.cc $<
+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=`(cd $(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 = installman
+INSTALL_DOC = $(mandir)/man1/iverilog-vpi$(suffix).1
 else
 ifeq ($(PS2PDF),none)
-INSTALL_DOC = installman
+INSTALL_DOC = $(mandir)/man1/iverilog-vpi$(suffix).1
 else
-INSTALL_DOC = installpdf installman
+INSTALL_DOC = $(prefix)/iverilog-vpi$(suffix).pdf $(mandir)/man1/iverilog-vpi$(suffix).1
 all: dep iverilog-vpi.pdf
 endif
 endif
 INSTALL_DOCDIR = $(mandir)/man1
 else
-INSTALL_DOC = installman
+INSTALL_DOC = $(mandir)/man1/iverilog-vpi$(suffix).1
 INSTALL_DOCDIR = $(mandir)/man1
 endif
 
 ifeq (@MINGW32@,yes)
 WIN32_INSTALL =
 else
-WIN32_INSTALL = installwin32
+WIN32_INSTALL = $(bindir)/iverilog-vpi$(suffix)
 endif
 
-install: all installdirs installfiles
-	$(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true
+XNF_INSTALL = $(libdir)/ivl$(suffix)/xnf.conf $(libdir)/ivl$(suffix)/xnf-s.conf
 
-F = ./ivl@EXEEXT@ \
-	$(srcdir)/constants.vams \
-	$(srcdir)/disciplines.vams \
-	$(srcdir)/ivl_target.h \
-	./_pli_types.h \
-	$(srcdir)/sv_vpi_user.h \
-	$(srcdir)/vpi_user.h \
-	$(srcdir)/acc_user.h \
-	$(srcdir)/veriuser.h \
-	$(INSTALL_DOC) \
-	$(WIN32_INSTALL)
+install: all installdirs $(libdir)/ivl$(suffix)/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
 
-installwin32: ./iverilog-vpi installdirs
-	$(INSTALL_SCRIPT) ./iverilog-vpi "$(DESTDIR)$(bindir)/iverilog-vpi$(suffix)"
+$(DESTDIR)$(bindir)/iverilog-vpi$(suffix): ./iverilog-vpi
+	$(INSTALL_SCRIPT) ./iverilog-vpi $(DESTDIR)$(bindir)/iverilog-vpi$(suffix)
 
-installman: iverilog-vpi.man installdirs
-	$(INSTALL_DATA) iverilog-vpi.man "$(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1"
+$(libdir)/ivl$(suffix)/ivl@EXEEXT@: ./ivl@EXEEXT@
+	$(INSTALL_PROGRAM) ./ivl@EXEEXT@ $(DESTDIR)$(libdir)/ivl$(suffix)/ivl@EXEEXT@
 
-installpdf: iverilog-vpi.pdf installdirs
-	$(INSTALL_DATA) iverilog-vpi.pdf "$(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf"
+$(DESTDIR)$(libdir)/ivl$(suffix)/xnf-s.conf: $(srcdir)/xnf-s.conf
+	$(INSTALL_DATA) $(srcdir)/xnf-s.conf $(DESTDIR)$(libdir)/ivl$(suffix)/xnf-s.conf
 
-installfiles: $(F) | installdirs
-	$(INSTALL_PROGRAM) ./ivl@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/ivl@EXEEXT@"
-	$(INSTALL_DATA) $(srcdir)/constants.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/constants.vams"
-	$(INSTALL_DATA) $(srcdir)/disciplines.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/disciplines.vams"
-	$(INSTALL_DATA) $(srcdir)/ivl_target.h "$(DESTDIR)$(includedir)/ivl_target.h"
-	$(INSTALL_DATA) ./_pli_types.h "$(DESTDIR)$(includedir)/_pli_types.h"
-	$(INSTALL_DATA) $(srcdir)/sv_vpi_user.h "$(DESTDIR)$(includedir)/sv_vpi_user.h"
-	$(INSTALL_DATA) $(srcdir)/vpi_user.h "$(DESTDIR)$(includedir)/vpi_user.h"
-	$(INSTALL_DATA) $(srcdir)/acc_user.h "$(DESTDIR)$(includedir)/acc_user.h"
-	$(INSTALL_DATA) $(srcdir)/veriuser.h "$(DESTDIR)$(includedir)/veriuser.h"
+$(DESTDIR)$(libdir)/ivl$(suffix)/xnf.conf: $(srcdir)/xnf.conf
+	$(INSTALL_DATA) $(srcdir)/xnf.conf $(DESTDIR)$(libdir)/ivl$(suffix)/xnf.conf
 
-installdirs: $(srcdir)/mkinstalldirs
-	$(srcdir)/mkinstalldirs "$(DESTDIR)$(bindir)" \
-	    "$(DESTDIR)$(includedir)" \
-	    "$(DESTDIR)$(libdir)/ivl$(suffix)" \
-	    "$(DESTDIR)$(libdir)/ivl$(suffix)/include" \
-	    "$(DESTDIR)$(mandir)" \
-	    "$(DESTDIR)$(mandir)/man1"
+$(DESTDIR)$(includedir)/ivl_target.h: $(srcdir)/ivl_target.h
+	$(INSTALL_DATA) $(srcdir)/ivl_target.h $(DESTDIR)$(includedir)/ivl_target.h
+
+$(DESTDIR)$(includedir)/_pli_types.h: _pli_types.h
+	$(INSTALL_DATA) $< $(DESTDIR)$(includedir)/_pli_types.h
+
+$(DESTDIR)$(includedir)/vpi_user.h: $(srcdir)/vpi_user.h
+	$(INSTALL_DATA) $(srcdir)/vpi_user.h $(DESTDIR)$(includedir)/vpi_user.h
+
+$(DESTDIR)$(includedir)/acc_user.h: $(srcdir)/acc_user.h
+	$(INSTALL_DATA) $(srcdir)/acc_user.h $(DESTDIR)$(includedir)/acc_user.h
+
+$(DESTDIR)$(includedir)/veriuser.h: $(srcdir)/veriuser.h
+	$(INSTALL_DATA) $(srcdir)/veriuser.h $(DESTDIR)$(includedir)/veriuser.h
+
+$(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1: $(srcdir)/iverilog-vpi.man
+	$(INSTALL_DATA) $(srcdir)/iverilog-vpi.man $(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1
+
+$(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf: iverilog-vpi.pdf
+	$(INSTALL_DATA) iverilog-vpi.pdf $(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf
+
+
+installdirs: mkinstalldirs
+	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/ivl$(suffix) \
+	    $(DESTDIR)$(libdir)/ivl$(suffix)/include $(DESTDIR)$(mandir) $(DESTDIR)$(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@EXEEXT@; \
+	    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); \
+	    do rm -f $(DESTDIR)$(bindir)/$$f; done
+	for f in ivl_target.h vpi_user.h _pli_types.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
+	rm -f $(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf
 
 
 -include $(patsubst %.o, dep/%.d, $O)
+-include $(patsubst %.o, dep/%.d, vpithunk.o)

Module.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2019 Stephen Williams ([email protected])
+ * Copyright (c) 1998-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
@@ -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
  */
 
 # include "config.h"
@@ -22,19 +22,13 @@
 # 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;
-      is_interface = false;
-      program_block = false;
-      uc_drive = UCD_NONE;
+      default_nettype = NetNet::NONE;
 }
 
 Module::~Module()
@@ -46,9 +40,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();
 }
 
 /*
@@ -56,10 +75,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;
@@ -70,7 +89,7 @@ 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) {
+      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,
@@ -84,32 +103,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 || ports[idx]->name.str() == 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. Port references
-		 that aren't simple or escaped identifiers are
-		 also inaccessible to binding by name. */
-            return perm_string::literal("unnamed");
-      }
-      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;
@@ -118,17 +129,17 @@ 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_;
 }
 
-PNamedItem::SymbolType Module::symbol_type() const
+const list<PProcess*>& Module::get_behaviors() const
 {
-      if (program_block)
-            return PROGRAM;
-      if (is_interface)
-            return INTERFACE;
-
-      return MODULE;
+      return behaviors_;
 }

Module.h

@@ -1,7 +1,7 @@
-#ifndef IVL_Module_H
-#define IVL_Module_H
+#ifndef __Module_H
+#define __Module_H
 /*
- * Copyright (c) 1998-2019 Stephen Williams ([email protected])
+ * Copyright (c) 1998-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
@@ -16,27 +16,22 @@
  *
  *    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
  */
 
-
 # include  <list>
 # include  <map>
-# include  <vector>
-# include  <utility>
+# include  "svector.h"
 # include  "StringHeap.h"
 # include  "HName.h"
 # include  "named.h"
-# include  "PScope.h"
-# include  "PNamedItem.h"
+# include  "LineInfo.h"
 # include  "netlist.h"
-# include  "pform_types.h"
+class PData;
+class PEvent;
 class PExpr;
 class PEIdent;
 class PGate;
-class PGenerate;
-class PModport;
-class PSpecPath;
 class PTask;
 class PFunction;
 class PWire;
@@ -48,13 +43,9 @@ class NetScope;
  * A module is a named container and scope. A module holds a bunch of
  * semantic quantities such as wires and gates. The module is
  * therefore the handle for grasping the described circuit.
- *
- * SystemVerilog introduces program blocks and interfaces. These have
- * much in common with modules, so the Module class is used to represent
- * these containers as well.
  */
 
-class Module : public PScopeExtra, public PNamedItem {
+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
@@ -64,48 +55,40 @@ class Module : public PScopeExtra, public PNamedItem {
     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 name must be a permallocated string. */
-      explicit Module(LexicalScope*parent, perm_string name);
+	   name. This make must be a permallocated string. */
+      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;
 
-	/* This is true if the module represents a interface
-	   instead of a module/cell. Interfaces have different
-	   content restrictions and some extra allowed items. */
-      bool is_interface;
-
-      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,
@@ -117,58 +100,65 @@ class Module : public PScopeExtra, public PNamedItem {
 
 	/* 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;
 
-	/* The module has a list of generate schemes that appear in
-	   the module definition. These are used at elaboration time. */
-      list<PGenerate*> generate_schemes;
+	/* These are the timescale for this module. The default is
+	   set by the `timescale directive. */
+      int time_unit, time_precision;
 
-	/* Nested modules are placed here, and are not elaborated
-	   unless they are instantiated, implicitly or explicitly. */
-      std::map<perm_string,Module*> nested_modules;
-
-	/* An interface can contain one or more named modport lists.
-           The parser will ensure these don't appear in modules or
-           program blocks. */
-      map<perm_string,PModport*> modports;
-
-      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;
 
-      SymbolType symbol_type() 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 */
+#endif

PClass.cc

@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2012-2019 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()
-{
-}
-
-PNamedItem::SymbolType PClass::symbol_type() const
-{
-      return CLASS;
-}

PClass.h

@@ -1,49 +0,0 @@
-#ifndef IVL_PClass_H
-#define IVL_PClass_H
-/*
- * Copyright (c) 2012-2019 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  "PNamedItem.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 PNamedItem {
-
-    public:
-      explicit PClass (perm_string name, LexicalScope*parent);
-      ~PClass();
-
-      void dump(std::ostream&out, unsigned indent) const;
-
-      SymbolType symbol_type() const;
-
-    public:
-      class_type_t*type;
-};
-
-#endif /* IVL_PClass_H */

PData.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2003-2010 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,12 +14,22 @@
  *
  *    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
  */
-# include  "compiler.h"
 
-StringHeapLex lex_strings;
+# include  "config.h"
+# include  "PData.h"
 
-StringHeapLex filename_strings;
+PData::PData(const hname_t&h)
+: hname_(h)
+{
+}
 
-StringHeapLex gen_strings;
+PData::~PData()
+{
+}
+
+const hname_t&PData::name() const
+{
+      return hname_;
+}

PData.h

@@ -0,0 +1,53 @@
+#ifndef __PData_H
+#define __PData_H
+/*
+ * Copyright (c) 2003-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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+# 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&);
+};
+
+#endif

PDelays.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2017 Stephen Williams ([email protected])
+ * Copyright (c) 1999-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
@@ -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
  */
 
 # include "config.h"
@@ -24,7 +24,6 @@
 # include  "PDelays.h"
 # include  "PExpr.h"
 # include  "verinum.h"
-# include  "netmisc.h"
 
 PDelays::PDelays()
 {
@@ -50,125 +49,98 @@ 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);
-
-      check_for_inconsistent_delays(scope);
+      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
 	   constant, then evaluate it, scale it to the local time
 	   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);

PDelays.h

@@ -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-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
@@ -16,12 +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
  */
 
 # include  "svector.h"
 # include  <string>
-# include  <list>
 # include  <iostream>
 
 #ifdef __GNUC__
@@ -32,7 +31,6 @@ using namespace std;
 
 class Design;
 class NetScope;
-class NetExpr;
 class PExpr;
 
 /*
@@ -49,15 +47,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 +67,4 @@ class PDelays {
 
 ostream& operator << (ostream&o, const PDelays&);
 
-#endif /* IVL_PDelays_H */
+#endif

PEvent.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2019 Stephen Williams ([email protected])
+ * Copyright (c) 2004-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
@@ -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
  */
 
 # include "config.h"
@@ -34,8 +34,3 @@ perm_string  PEvent::name() const
 {
       return name_;
 }
-
-PNamedItem::SymbolType PEvent::symbol_type() const
-{
-      return EVENT;
-}

PEvent.h

@@ -1,7 +1,7 @@
-#ifndef IVL_PEvent_H
-#define IVL_PEvent_H
+#ifndef __PEvent_H
+#define __PEvent_H
 /*
- * Copyright (c) 2000-2019 Stephen Williams ([email protected])
+ * Copyright (c) 2000-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
@@ -16,10 +16,10 @@
  *
  *    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
  */
 
-# include  "PNamedItem.h"
+# include  "LineInfo.h"
 # include  "StringHeap.h"
 # include  <string>
 
@@ -31,7 +31,7 @@ class NetScope;
  * are declared in Verilog as ``event foo;'' The name passed to the
  * constructor is the "foo" part of the declaration.
  */
-class PEvent : public PNamedItem {
+class PEvent : public LineInfo {
 
     public:
 	// The name is a perm-allocated string. It is the simple name
@@ -43,8 +43,6 @@ class PEvent : public PNamedItem {
 
       void elaborate_scope(Design*des, NetScope*scope) const;
 
-      SymbolType symbol_type() const;
-
     private:
       perm_string name_;
 
@@ -53,4 +51,4 @@ class PEvent : public PNamedItem {
       PEvent& operator= (const PEvent&);
 };
 
-#endif /* IVL_PEvent_H */
+#endif

PExpr.cc

@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 1998-2020 Stephen Williams <[email protected]>
- * Copyright CERN 2013 / Stephen Williams ([email protected])
+ * Copyright (c) 1998-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
@@ -15,104 +14,40 @@
  *
  *    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
  */
 
 # 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,174 +59,39 @@ PEBinary::~PEBinary()
 {
 }
 
-void PEBinary::declare_implicit_nets(LexicalScope*scope, NetNet::Type type)
+bool PEBinary::is_constant(Module*mod) const
 {
-      if (left_) left_->declare_implicit_nets(scope, type);
-      if (right_) 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(PExpr*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' || op == 'q' || op == 'Q');
-}
-
-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), is_overridden_(false)
-{
-}
-
-PECallFunction::PECallFunction(PPackage*pkg, const pform_name_t&n, const vector<PExpr *> &parms)
-: package_(pkg), path_(n), parms_(parms), is_overridden_(false)
-{
-}
-
-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()), is_overridden_(false)
-{
-      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), is_overridden_(false)
-{
-}
-
-PECallFunction::PECallFunction(perm_string n)
-: package_(0), path_(pn_from_ps(n)), is_overridden_(false)
-{
-}
-
-// 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()), is_overridden_(false)
-{
-      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()), is_overridden_(false)
-{
-      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()
@@ -299,25 +99,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)
 {
@@ -332,25 +113,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)
 {
@@ -366,19 +133,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)
 {
 }
 
@@ -386,101 +147,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)
@@ -508,6 +204,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)
 {
@@ -523,6 +224,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)
 {
@@ -532,29 +238,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)
@@ -566,22 +254,7 @@ PEUnary::~PEUnary()
 {
 }
 
-void PEUnary::declare_implicit_nets(LexicalScope*scope, NetNet::Type type)
-{
-      assert(expr_);
-      expr_->declare_implicit_nets(scope, type);
-}
-
-bool PEUnary::has_aa_term(Design*des, NetScope*scope) const
-{
-      assert(expr_);
-      return expr_->has_aa_term(des, scope);
-}
-
-PEVoid::PEVoid()
-{
-}
-
-PEVoid::~PEVoid()
+bool PEUnary::is_constant(Module*m) const
 {
+      return expr_->is_constant(m);
 }

PFunction.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2019 Stephen Williams ([email protected])
+ * Copyright (c) 1999-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
@@ -14,26 +14,29 @@
  *
  *    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
  */
 
 # 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,51 +44,7 @@ void PFunction::set_statement(Statement*s)
       statement_ = s;
 }
 
-void PFunction::push_statement_front(Statement*stmt)
-{
-        // This should not be possible.
-      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_ = new PBlock(PBlock::BL_SEQ);
-	    statement_->set_line(*this);
-
-      } else if (PBlock*blk = dynamic_cast<PBlock*>(statement_)) {
-	    res = blk->extract_chain_constructor();
-      }
-
-      return res;
-}
-
-PNamedItem::SymbolType PFunction::symbol_type() const
-{
-      return FUNCTION;
-}

PGate.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2019 Stephen Williams ([email protected])
+ * Copyright (c) 1999-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
@@ -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
  */
 
 # include "config.h"
@@ -22,68 +22,55 @@
 # 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,38 +87,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();
-}
-
-PNamedItem::SymbolType PGate::symbol_type() const
-{
-      return INSTANCE;
-}
-
-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()
@@ -139,14 +112,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)
 {
@@ -166,128 +139,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;
@@ -310,7 +181,7 @@ void PGModule::set_range(PExpr*msb, PExpr*lsb)
       lsb_ = lsb;
 }
 
-perm_string PGModule::get_type() const
+perm_string PGModule::get_type()
 {
       return type_;
 }

PGate.h

@@ -1,7 +1,7 @@
-#ifndef IVL_PGate_H
-#define IVL_PGate_H
+#ifndef __PGate_H
+#define __PGate_H
 /*
- * Copyright (c) 1998-2019 Stephen Williams ([email protected])
+ * Copyright (c) 1998-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
@@ -16,21 +16,20 @@
  *
  *    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
  */
 
 # include  "svector.h"
 # include  "StringHeap.h"
 # include  "named.h"
-# include  "PNamedItem.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;
 
 /*
@@ -47,51 +46,46 @@ class Module;
  * single strength pair. There is a strength of the 0 drive, and a
  * strength of the 1 drive.
  */
-class PGate : public PNamedItem {
+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;
 
-      SymbolType symbol_type() 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;
@@ -99,11 +93,9 @@ class PGate : public PNamedItem {
     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&);
@@ -117,16 +109,14 @@ class PGate : public PNamedItem {
 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;
 };
 
 
@@ -150,35 +140,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_;
 };
@@ -197,43 +174,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);
 
-      map<perm_string,PExpr*> attributes;
-
-      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_;
 
@@ -245,23 +216,10 @@ 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 */
+#endif

PGenerate.cc

@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2006-2020 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;
-      local_index = false;
-      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;
-}
-
-PNamedItem::SymbolType PGenerate::symbol_type() const
-{
-      return GENBLOCK;
-}

PGenerate.h

@@ -1,147 +0,0 @@
-#ifndef IVL_PGenerate_H
-#define IVL_PGenerate_H
-/*
- * Copyright (c) 2006-2020 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  "PNamedItem.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 PNamedItem, 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>)
-	// the index is local if it was declared in the init expression,
-	// e.g. for (genvar index = <init>; <test>; index=<step>)
-      bool local_index;
-      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;
-
-      SymbolType symbol_type() 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 */

PModport.h

@@ -1,54 +0,0 @@
-#ifndef IVL_PModport_H
-#define IVL_PModport_H
-/*
- * Copyright (c) 2015-2019 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  "PNamedItem.h"
-# include  "PScope.h"
-# include  "StringHeap.h"
-# include  "netlist.h"
-# include  <vector>
-
-/*
- * The PModport class represents a parsed SystemVerilog modport list.
- */
-class PModport : public PNamedItem {
-
-    public:
-	// The name is a perm-allocated string. It is the simple name
-	// of the modport, without any scope.
-      explicit PModport(perm_string name);
-      ~PModport();
-
-      perm_string name() const { return name_; }
-
-      typedef pair <NetNet::PortType,PExpr*> simple_port_t;
-      map<perm_string,simple_port_t> simple_ports;
-
-      SymbolType symbol_type() const;
-
-    private:
-      perm_string name_;
-
-    private: // not implemented
-      PModport(const PModport&);
-      PModport& operator= (const PModport&);
-};
-
-#endif /* IVL_PModport_H */

PNamedItem.cc

@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2019 Martin Whitaker ([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  "PNamedItem.h"
-# include  <ostream>
-
-PNamedItem::PNamedItem()
-{
-}
-
-PNamedItem::~PNamedItem()
-{
-}
-
-PNamedItem::SymbolType PNamedItem::symbol_type() const
-{
-      return ANY;
-}
-
-std::ostream& operator << (std::ostream&o, PNamedItem::SymbolType st)
-{
-      switch (st) {
-          case PNamedItem::ANY:
-            o << "a symbol";
-            break;
-          case PNamedItem::PARAM:
-            o << "a parameter";
-            break;
-          case PNamedItem::NET:
-            o << "a net";
-            break;
-          case PNamedItem::VAR:
-            o << "a variable";
-            break;
-          case PNamedItem::GENVAR:
-            o << "a genvar";
-            break;
-          case PNamedItem::EVENT:
-            o << "an event";
-            break;
-          case PNamedItem::TYPE:
-            o << "a type";
-            break;
-          case PNamedItem::ENUM:
-            o << "an enum type or value";
-            break;
-          case PNamedItem::CLASS:
-            o << "a class";
-            break;
-          case PNamedItem::FUNCTION:
-            o << "a function";
-            break;
-          case PNamedItem::TASK:
-            o << "a task";
-            break;
-          case PNamedItem::BLOCK:
-            o << "a named block";
-            break;
-          case PNamedItem::GENBLOCK:
-            o << "a generate block";
-            break;
-          case PNamedItem::MODPORT:
-            o << "a modport";
-            break;
-          case PNamedItem::PACKAGE:
-            o << "a package";
-            break;
-          case PNamedItem::MODULE:
-            o << "a module";
-            break;
-          case PNamedItem::PROGRAM:
-            o << "a program";
-            break;
-          case PNamedItem::INTERFACE:
-            o << "an interface";
-            break;
-          case PNamedItem::PRIMITIVE:
-            o << "a primitive";
-            break;
-          case PNamedItem::INSTANCE:
-            o << "an instance name";
-            break;
-          default:
-            break;
-      }
-      return o;
-}
-
-PGenvar::PGenvar()
-{
-}
-
-PGenvar::~PGenvar()
-{
-}
-
-PNamedItem::SymbolType PGenvar::symbol_type() const
-{
-      return GENVAR;
-}

PNamedItem.h

@@ -1,57 +0,0 @@
-#ifndef IVL_PNamedItem_H
-#define IVL_PNamedItem_H
-/*
- * Copyright (c) 2019 Martin Whitaker ([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"
-
-/*
- * The PNamedItem class is the base class for all items that can be added
- * to a scope's local symbol map.
- */
-class PNamedItem : virtual public LineInfo {
-
-    public:
-      enum SymbolType { ANY, PARAM, NET, VAR, GENVAR, EVENT, TYPE, ENUM,
-                        CLASS, FUNCTION, TASK, BLOCK, GENBLOCK, MODPORT,
-                        PACKAGE, MODULE, PROGRAM, INTERFACE, PRIMITIVE,
-                        INSTANCE };
-
-      explicit PNamedItem();
-      virtual ~PNamedItem();
-
-      virtual SymbolType symbol_type() const;
-};
-
-extern std::ostream& operator << (std::ostream&, PNamedItem::SymbolType);
-
-/*
- * The PGenvar class represents a genvar. This is only used to represent
- * genvar in a scope's local symbol map.
- */
-class PGenvar : public PNamedItem {
-
-    public:
-      explicit PGenvar();
-      virtual ~PGenvar();
-
-      SymbolType symbol_type() const;
-};
-
-#endif /* IVL_PNamedItem_H */

PPackage.h

@@ -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 */

PScope.cc

@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2008-2019 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"
-
-bool LexicalScope::var_init_needs_explicit_lifetime() const
-{
-      return false;
-}
-
-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;
-}
-
-PNamedItem::SymbolType LexicalScope::param_expr_t::symbol_type() const
-{
-      return PARAM;
-}
-
-PScope::PScope(perm_string n, LexicalScope*parent)
-: LexicalScope(parent), name_(n)
-{
-      time_unit = 0;
-      time_precision = 0;
-      time_unit_is_default = true;
-      time_prec_is_default = true;
-}
-
-PScope::~PScope()
-{
-    for(map<perm_string, data_type_t*>::iterator it = typedefs.begin();
-        it != typedefs.end(); ++it)
-        delete it->second;
-}
-
-PScopeExtra::PScopeExtra(perm_string n, LexicalScope*parent)
-: PScope(n, parent)
-{
-      time_unit_is_local = false;
-      time_prec_is_local = false;
-}
-
-PScopeExtra::~PScopeExtra()
-{
-}

PScope.h

@@ -1,235 +0,0 @@
-#ifndef IVL_PScope_H
-#define IVL_PScope_H
-/*
- * Copyright (c) 2008-2019 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  "PNamedItem.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 Statement;
-
-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:
-      enum lifetime_t { INHERITED, STATIC, AUTOMATIC };
-
-      explicit LexicalScope(LexicalScope*parent) : default_lifetime(INHERITED), parent_(parent) { }
-	// A virtual destructor is so that dynamic_cast can work.
-      virtual ~LexicalScope() { }
-
-      lifetime_t default_lifetime;
-
-	// Symbols that are defined or declared in this scope.
-      std::map<perm_string,PNamedItem*>local_symbols;
-
-	// Symbols that are explicitly imported. Bind the imported name
-	// to the package from which the name is imported.
-      std::map<perm_string,PPackage*>explicit_imports;
-
-	// Packages that are wildcard imported. When identifiers from
-	// these packages are referenced, they will be added to the
-	// explicit imports (IEEE 1800-2012 26.3).
-      std::set<PPackage*>potential_imports;
-
-	// A task or function call may reference a task or function defined
-	// later in the scope. So here we stash the potential imports for
-	// task and function calls. They will be added to the explicit
-	// imports if we don't find a local definition.
-      std::map<perm_string,PPackage*>possible_imports;
-
-      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 PNamedItem {
-	    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;
-
-	    SymbolType symbol_type() const;
-      };
-      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;
-
-	// 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;
-
-	// Variable initializations in this scope
-      vector<Statement*> var_inits;
-
-	// 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_; }
-
-      virtual bool var_init_needs_explicit_lifetime() const;
-
-    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;
-
-      void dump_var_inits_(ostream&out, unsigned indent) const;
-
-      bool elaborate_var_inits_(Design*des, NetScope*scope) 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.
-      explicit PScope(perm_string name, LexicalScope*parent =0);
-      virtual ~PScope();
-
-      perm_string pscope_name() const { return name_; }
-
-	/* These are the timescale for this scope. The value is
-	   set by the `timescale directive or, in SystemVerilog,
-	   by timeunit and timeprecision statements. */
-      int time_unit, time_precision;
-
-	/* Flags used to support warnings about timescales. */
-      bool time_unit_is_default;
-      bool time_prec_is_default;
-
-      bool has_explicit_timescale() const {
-	     return !(time_unit_is_default || time_prec_is_default);
-	   }
-
-    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:
-      explicit PScopeExtra(perm_string, LexicalScope*parent =0);
-      ~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;
-
-	/* Flags used to support warnings about timescales. */
-      bool time_unit_is_local;
-      bool time_prec_is_local;
-
-    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 */

PSpec.cc

@@ -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()
-{
-}

PSpec.h

@@ -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 */

PTask.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2019 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1999-2010 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,67 +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
  */
 
 # 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()
-{
-}
-
-bool PTaskFunc::var_init_needs_explicit_lifetime() const
-{
-      return default_lifetime == STATIC;
-}
-
-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 synthesis 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;
 }
-
-PNamedItem::SymbolType PTask::symbol_type() const
-{
-      return TASK;
-}

PTask.h

@@ -1,7 +1,7 @@
-#ifndef IVL_PTask_H
-#define IVL_PTask_H
+#ifndef __PTask_H
+#define __PTask_H
 /*
- * Copyright (c) 1999-2019 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1999-2010 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,71 +16,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
  */
 
-# include  "PScope.h"
-# include  "PNamedItem.h"
+# include  "LineInfo.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 PNamedItem {
-
-    public:
-      PTaskFunc(perm_string name, LexicalScope*parent);
-      ~PTaskFunc();
-
-      bool var_init_needs_explicit_lifetime() const;
-
-      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
@@ -95,15 +67,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;
-
-      SymbolType symbol_type() const;
+      void dump(std::ostream&, unsigned) const;
 
     private:
+      svector<PWire*>*ports_;
       Statement*statement_;
-      bool is_auto_;
 
     private: // Not implemented
       PTask(const PTask&);
@@ -117,26 +85,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;
 
@@ -146,16 +103,13 @@ 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;
-
-      SymbolType symbol_type() 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 */
+#endif

PUdp.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2004 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2003-2010 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,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
  */
 
 # include  "PUdp.h"
@@ -34,4 +34,3 @@ unsigned PUdp::find_port(const char*name)
 
       return ports.count();
 }
-

PUdp.h

@@ -1,7 +1,7 @@
-#ifndef IVL_PUdp_H
-#define IVL_PUdp_H
+#ifndef __PUdp_H
+#define __PUdp_H
 /*
- * Copyright (c) 1998-2014 Stephen Williams (steve@picturel.com)
+ * Copyright (c) 1998-2010 Stephen Williams (steve@picturel.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,11 +16,10 @@
  *
  *    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
  */
 
 # include  <map>
-# include  "LineInfo.h"
 # include  "StringHeap.h"
 # include  "svector.h"
 # include  "verinum.h"
@@ -29,7 +28,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 +47,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 +75,4 @@ class PUdp : public LineInfo {
       PUdp& operator= (const PUdp&);
 };
 
-#endif /* IVL_PUdp_H */
+#endif

PWire.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2019 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1999-2010 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,23 +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
  */
 
 # 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), uarray_type_(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 +48,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,16 +62,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::IMPLICIT_REG) return true;
+	    if (t == NetNet::REG) { type_ = t; return true; }
 	    return false;
 	  case NetNet::REG:
 	    if (t == NetNet::INTEGER) {
@@ -110,26 +105,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;
@@ -142,156 +117,20 @@ 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;
-      }
-}
-
-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;
-
-	  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_;
-}
-
-PNamedItem::SymbolType PWire::symbol_type() const
-{
-      switch (type_) {
-          case NetNet::IMPLICIT_REG:
-          case NetNet::INTEGER:
-          case NetNet::REG:
-            return VAR;
-          default:
-            return NET;
-    }
+      assert(lidx_ == 0);
+      assert(ridx_ == 0);
+      assert(type_ == NetNet::REG);
+      lidx_ = ldx;
+      ridx_ = rdx;
 }

PWire.h

@@ -1,7 +1,7 @@
-#ifndef IVL_PWire_H
-#define IVL_PWire_H
+#ifndef __PWire_H
+#define __PWire_H
 /*
- * Copyright (c) 1998-2019 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1998-2010 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,14 +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
  */
 
 # include  "netlist.h"
-# include  "PNamedItem.h"
-# include  <list>
+# include  "LineInfo.h"
 # include  <map>
-# include  "StringHeap.h"
+# include  "svector.h"
 
 #ifdef HAVE_IOSFWD
 # include  <iosfwd>
@@ -33,12 +32,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 +39,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 PNamedItem {
+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,66 +61,38 @@ class PWire : public PNamedItem {
       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_uarray_type(uarray_type_t*type) { uarray_type_ = type; }
-
-      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;
-
-      SymbolType symbol_type() 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_;
-      uarray_type_t*uarray_type_;
-
-	// 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 */
+#endif

README.txt

@@ -1,18 +1,21 @@
 		THE ICARUS VERILOG COMPILATION SYSTEM
-		Copyright 2000-2019 Stephen Williams
+		Copyright 2000-2004 Stephen Williams
 
 
 1.0 What is ICARUS Verilog?
 
 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 behavioural
+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.
@@ -20,13 +23,13 @@ tools.
 
 2.0 Building/Installing Icarus Verilog From Source
 
-If you are starting from the source, the build process is designed to be
+If you are starting from source, the build process is designed to be
 as simple as practical. Someone basically familiar with the target
 system and C/C++ compilation should be able to build the source
 distribution with little effort. Some actual programming skills are
 not required, but helpful in case of problems.
 
-If you are building on Windows, see the mingw.txt file.
+If you are building for Windows, see the mingw.txt file.
 
 2.1 Compile Time Prerequisites
 
@@ -46,12 +49,8 @@ on a UNIX-like system:
 	  to work. MSVC++ 5 and 6 are known to definitely *not* work.
 
 	- bison and flex
-          OSX note: bison 2.3 shipped with MacOS including Catalina generates
-          broken code, but bison 3+ works. We recommend using the Fink
-          project version of bison and flex (finkproject.org), brew version
-          works fine either.
 
-	- gperf 3.0 or later
+	- gperf 2.7
 	  The lexical analyzer doesn't recognize keywords directly,
 	  but instead matches symbols and looks them up in a hash
 	  table in order to get the proper lexical code. The gperf
@@ -60,18 +59,18 @@ on a UNIX-like system:
 	  A version problem with this program is the most common cause
 	  of difficulty. See the Icarus Verilog FAQ.
 
-	- readline 4.2 or later
+	- readline 4.2
 	  On Linux systems, this usually means the readline-devel
 	  rpm. In any case, it is the development headers of readline
 	  that are needed.
 
 	- termcap
-	  The readline library, in turn, uses 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 or later
+	- autoconf 2.53
 	  This generates configure scripts from configure.in. The 2.53
 	  or later versions are known to work, autoconf 2.13 is
 	  reported to *not* work.
@@ -79,21 +78,15 @@ the configure scripts.
 2.2 Compilation
 
 Unpack the tar-ball and cd into the verilog-######### directory
-(presumably, that is how you got to this README) and compile the source
+(presumably that is how you got to this README) and compile the source
 with the commands:
 
   ./configure
   make
 
-If you are building from git, you have to run the command below before
-compiling the source. This will generate the "configure" file, which is
-automatically done when building from tarball.
-
-  sh autoconf.sh
-
 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 behaviour:
+configure script that modify its behavior:
 
 	--prefix=<root>
 	    The default is /usr/local, which causes the tool suite to
@@ -105,6 +98,11 @@ configure script that modify its behaviour:
 	    common to use --prefix=/opt.  You can configure for a non-root
 	    install with --prefix=$HOME.
 
+	--enable-vvp32 (experimental)
+	    If compiling on AMD64 systems, this enables the
+	    compilation of 32bit compatible vvp (vvp32) and the vpi
+	    modules that match.
+
 	--enable-suffix
 	--enable-suffix=<your-suffix>
 	--disable-suffix
@@ -116,11 +114,22 @@ configure script that modify its behaviour:
 	    with the same prefix but different suffix are guaranteed
 	    to not interfere with each other.
 
-	--host=<host-type>
-	    Compile iverilog for a different platform. You can use:
-                x64_64-w64-mingw32 for building 64-bit Windows executables
-                i686-w64-mingw32 for building 32-bit Windows executables
-            Both options require installing the required mingw-w64 packages.
+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
 
@@ -171,10 +180,9 @@ output of the parse is a list of Module objects in "pform". The pform
 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.)
+One can see a human readable version of the final pform by using the
+``-P <path>'' flag to the compiler. This will cause iverilog to dump
+the pform into the file named <path>.
 
 3.3 Elaboration
 
@@ -183,26 +191,27 @@ This phase takes the pform and generates a netlist. The driver selects
 resolves references and expands the instantiations to form the design
 netlist. (See netlist.txt.) Final semantic checks are performed during
 elaboration, and some simple optimizations are performed. The netlist
-includes all the behavioural descriptions, as well as gates and wires.
+includes all the behavioral descriptions, as well as gates and wires.
 
 The elaborate() function performs the elaboration.
 
-One can see a human-readable version of the final, elaborated and
+One can see a human readable version of the final, elaborated and
 optimized netlist by using the ``-N <path>'' flag to the compiler. If
 elaboration succeeds, the final netlist (i.e., after optimizations but
 before code generation) will be dumped into the file named <path>.
 
-Elaboration is performed in two steps: scopes and parameters
-first, followed by the structural and behavioural elaboration.
+Elaboration is actually performed in two steps: scopes and parameters
+first, followed by the structural and behavioral elaboration.
 
 3.3.1 Scope 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 behaviour (after the pform is
+The tail of the elaborate_scope behavior (after the pform is
 traversed) includes a scan of the NetScope tree to locate defparam
 assignments that were collected during scope elaboration. This is when
 the defparam overrides are applied to the parameters.
@@ -211,14 +220,14 @@ the defparam overrides are applied to the parameters.
 
 After the scopes and parameters are generated and the NetScope tree
 fully formed, the elaboration runs through the pform again, this time
-generating the structural and behavioural netlist. Parameters are
+generating the structural and behavioral netlist. Parameters are
 elaborated and evaluated by now so all the constants of code
 generation are now known locally, so the netlist can be generated by
 simply passing through the pform.
 
 3.4 Optimization
 
-This is a collection of processing steps that perform
+This is actually a collection of processing steps that perform
 optimizations that do not depend on the target technology. Examples of
 some useful transformations are
 
@@ -236,7 +245,7 @@ generator (see target.h). This may require transforming the
 design to suit the technology.
 
 The emit() method of the Design class performs this step. It runs
-through the design elements, calling target functions as the need arises
+through the design elements, calling target functions as need arises
 to generate actual output.
 
 The user selects the target code generator with the -t flag on the
@@ -244,7 +253,7 @@ command line.
 
 3.6 ATTRIBUTES
 
-    NOTE: The $attribute syntax will soon be deprecated in favour of the
+    NOTE: The $attribute syntax will soon be deprecated in favor of the
     Verilog-2001 attribute syntax, which is cleaner and standardized.
 
 The parser accepts, as an extension to Verilog, the $attribute module
@@ -253,7 +262,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
@@ -267,7 +276,7 @@ Attributes can also be applied to gate types. When this is done, the
 attribute is given to every instantiation of the primitive. The syntax
 for the attribute statement is the same, except that the <identifier>
 names a primitive earlier in the compilation unit and the statement is
-placed in the global scope, instead of within a module. The semicolon is
+placed in global scope, instead of within a module. The semicolon is
 not part of a type attribute.
 
 Note that attributes are also occasionally used for communication
@@ -326,7 +335,7 @@ by the compiler. See the iverilog(1) man page.
 
 Icarus Verilog is in development - as such it still only supports a
 (growing) subset of Verilog.  Below is a description of some of the
-currently unsupported Verilog features. This list is not exhaustive
+currently unsupported Verilog features. This list is not exhaustive,
 and does not account for errors in the compiler. See the Icarus
 Verilog web page for the current state of support for Verilog, and in
 particular, browse the bug report database for reported unsupported
@@ -355,10 +364,9 @@ constructs.
 5.1 Nonstandard Constructs or Behaviors
 
 Icarus Verilog includes some features that are not part of the
-IEEE1364 standard, but have well-defined meaning, and also sometimes
+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
@@ -372,7 +380,7 @@ more details.
 	function is undefined if the argument doesn't have a
 	self-determined size.
 
-	The $sizeof function is deprecated in favour of $bits, which is
+	The $sizeof function is deprecated in favor of $bits, which is
 	the same thing, but included in the SystemVerilog definition.
 
     $simtime
@@ -398,8 +406,8 @@ more details.
 
     Builtin system functions
 
-	Certain of the system functions have well-defined meanings, so
-	can theoretically be evaluated at compile-time, instead of
+	Certain of the system functions have well defined meanings, so
+	can theoretically be evaluated at compile time, instead of
 	using runtime VPI code. Doing so means that VPI cannot
 	override the definitions of functions handled in this
 	manner. On the other hand, this makes them synthesizable, and
@@ -418,8 +426,8 @@ more details.
 
 	Icarus Verilog does preprocess modules that are loaded from
 	libraries via the -y mechanism. However, the only macros
-	defined during the compilation of that file are those that it
-	defines itself (or includes) or that are defined in the
+	defined during compilation of that file are those that it
+	defines itself (or includes) or that are defined on the
 	command line or command file.
 
 	Specifically, macros defined in the non-library source files
@@ -436,7 +444,7 @@ more details.
 	Standard Verilog does not allow width fields in the %t formats
 	of display strings. For example, this is illegal:
 
-		$display("Time is %0t", $time);
+		$display("Time is %0t", %time);
 
 	Standard Verilog instead relies on the $timeformat to
 	completely specify the format.
@@ -460,7 +468,7 @@ more details.
 
     time 0 race resolution.
 
-	Combinational logic is routinely modelled using always
+	Combinational logic is routinely modeled using always
 	blocks. However, this can lead to race conditions if the
 	inputs to the combinational block are initialized in initial
 	statements. Icarus Verilog slightly modifies time 0 scheduling
@@ -469,25 +477,61 @@ 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 supports an extended 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
 Copyright Stephen Williams. The proper notices are in the head of each
 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 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.
+

Statement.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2019 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1998-2010 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,33 +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
  */
 
 # 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 +50,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 +69,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,115 +83,43 @@ 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];
 }
 
-bool PBlock::var_init_needs_explicit_lifetime() const
+PCallTask::PCallTask(const hname_t&n, const svector<PExpr*>&p)
+: path_(n), parms_(p)
 {
-      return default_lifetime == STATIC;
-}
-
-PChainConstructor* PBlock::extract_chain_constructor()
-{
-      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;
-}
-
-PNamedItem::SymbolType PBlock::symbol_type() const
-{
-      return BLOCK;
-}
-
-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_;
 }
 
-PCase::PCase(ivl_case_quality_t q, NetCase::TYPE t, PExpr*ex, svector<PCase::Item*>*l)
-: quality_(q), type_(t), expr_(ex), items_(l)
+PCase::PCase(NetCase::TYPE t, PExpr*ex, svector<PCase::Item*>*l)
+: type_(t), expr_(ex), items_(l)
 {
 }
 
@@ -231,21 +143,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)
 {
@@ -278,7 +175,7 @@ PDelayStatement::~PDelayStatement()
 {
 }
 
-PDisable::PDisable(const pform_name_t&sc)
+PDisable::PDisable(const hname_t&sc)
 : scope_(sc)
 {
 }
@@ -287,32 +184,21 @@ 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), always_sens_(false)
+: expr_(ee), statement_(0)
 {
       assert(expr_.count() > 0);
 }
 
 
 PEventStatement::PEventStatement(PEEvent*ee)
-: expr_(1), statement_(0), always_sens_(false)
+: expr_(1), statement_(0)
 {
       expr_[0] = ee;
 }
 
-PEventStatement::PEventStatement(bool always_sens)
-: statement_(0), always_sens_(always_sens)
+PEventStatement::PEventStatement(void)
+: statement_(0)
 {
 }
 
@@ -326,15 +212,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)
 {
@@ -346,20 +223,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)
 {
@@ -371,8 +234,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)
 {
 }
 
@@ -406,18 +270,8 @@ PRepeat::~PRepeat()
       delete statement_;
 }
 
-PReturn::PReturn(PExpr*e)
-: expr_(e)
-{
-}
-
-PReturn::~PReturn()
-{
-      delete expr_;
-}
-
-PTrigger::PTrigger(PPackage*pkg, const pform_name_t&e)
-: package_(pkg), event_(e)
+PTrigger::PTrigger(const hname_t&e)
+: event_(e)
 {
 }
 
@@ -425,8 +279,8 @@ PTrigger::~PTrigger()
 {
 }
 
-PWhile::PWhile(PExpr*ex, Statement*st)
-: cond_(ex), statement_(st)
+PWhile::PWhile(PExpr*e1, Statement*st)
+: cond_(e1), statement_(st)
 {
 }
 

Statement.h

@@ -1,7 +1,7 @@
-#ifndef IVL_Statement_H
-#define IVL_Statement_H
+#ifndef __Statement_H
+#define __Statement_H
 /*
- * Copyright (c) 1998-2020 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1998-2010 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,49 +16,42 @@
  *
  *    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
  */
 
 # 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 +59,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 +68,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 : virtual 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,55 +89,37 @@ class Statement : virtual 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,
-			       bool force_unsigned =false) 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_ {
@@ -152,7 +127,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;
@@ -170,57 +144,48 @@ class PAssignNB  : public PAssign_ {
  * statements before constructing this object, so it knows a priori
  * what is contained.
  */
-class PBlock  : public PScope, public Statement, public PNamedItem {
+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_; }
 
-      bool var_init_needs_explicit_lifetime() const;
-
-	// 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;
-
-      SymbolType symbol_type() 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;
@@ -229,47 +194,26 @@ 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_void_function_(Design*des, NetScope*scope,
-				       NetFuncDef*def) 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;
-      NetProc*elaborate_queue_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;
       };
 
-      PCase(ivl_case_quality_t, NetCase::TYPE, PExpr*ex, svector<Item*>*);
+      PCase(NetCase::TYPE, PExpr*ex, svector<Item*>*);
       ~PCase();
 
       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:
-      ivl_case_quality_t quality_;
       NetCase::TYPE type_;
       PExpr*expr_;
 
@@ -294,26 +238,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:
-      explicit 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:
@@ -322,7 +246,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:
@@ -357,7 +280,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_;
@@ -371,30 +293,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_;
 };
 
 /*
@@ -411,46 +317,35 @@ class PEventStatement  : public Statement {
 
       explicit PEventStatement(const svector<PEEvent*>&ee);
       explicit PEventStatement(PEEvent*ee);
-	// Make an @* statement or make a special @* version with the items
-	// from functions added and outputs removed for always_comb/latch.
-      explicit PEventStatement(bool always_sens = false);
+	// Make an @* statement.
+      explicit PEventStatement(void);
 
       ~PEventStatement();
 
       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_;
-      bool always_sens_;
 };
 
-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:
@@ -458,26 +353,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);
@@ -485,7 +360,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:
@@ -496,12 +370,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:
@@ -510,7 +383,8 @@ class PForStatement  : public Statement {
 
       PExpr*cond_;
 
-      Statement*step_;
+      PExpr* name2_;
+      PExpr* expr2_;
 
       Statement*statement_;
 };
@@ -519,7 +393,6 @@ class PNoop  : public Statement {
 
     public:
       PNoop() { }
-      ~PNoop() { }
 };
 
 class PRepeat : public Statement {
@@ -529,7 +402,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:
@@ -550,19 +422,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.
@@ -570,26 +429,24 @@ class PReturn  : public Statement {
 class PTrigger  : public Statement {
 
     public:
-      explicit PTrigger(PPackage*pkg, 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:
-      PPackage*package_;
-      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:
@@ -597,4 +454,4 @@ class PWhile  : public Statement {
       Statement*statement_;
 };
 
-#endif /* IVL_Statement_H */
+#endif

StringHeap.cc

@@ -14,28 +14,22 @@
  *
  *    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
  */
 
 # 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
-
-static const unsigned DEFAULT_CELL_SIZE = 0x10000;
-
+# include  <stdlib.h>
+# include  <string.h>
+# include  <assert.h>
 
 StringHeap::StringHeap()
 {
       cell_base_ = 0;
-      cell_ptr_  = 0;
+      cell_ptr_ = HEAPCELL;
+      cell_count_ = 0;
 }
 
 StringHeap::~StringHeap()
@@ -47,53 +41,22 @@ StringHeap::~StringHeap()
 const char* StringHeap::add(const char*text)
 {
       unsigned len = strlen(text);
-      unsigned rem = cell_base_==0? 0 : (DEFAULT_CELL_SIZE - cell_ptr_);
+      assert((len+1) <= HEAPCELL);
 
-	// Special case: huge items get their own allocation.
-      if ( (len+1) >= DEFAULT_CELL_SIZE ) {
-	    char*buf = strdup(text);
-#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] = buf;
-#endif
-	    return buf;
-      }
-
-	// If the current cell that I'm working through cannot hold
-	// the current string, then set it aside and get another cell
-	// to put the string into.
+      unsigned rem = HEAPCELL - cell_ptr_;
       if (rem < (len+1)) {
-	      // release any unused memory. This assumes that a
-	      // realloc shrink of the memory region will return the
-	      // same pointer.
-	    if (rem > 0) {
-		  char*old = cell_base_;
-		  cell_base_ = (char*)realloc(cell_base_, cell_ptr_);
-		  assert(cell_base_ != 0);
-		  assert(cell_base_ == old);
-	    }
-	      // start new cell
-	    cell_base_ = (char*)malloc(DEFAULT_CELL_SIZE);
-	    cell_ptr_  = 0;
-	    rem = DEFAULT_CELL_SIZE;
+	    cell_base_ = (char*)malloc(HEAPCELL);
+	    cell_ptr_ = 0;
+	    cell_count_ += 1;
 	    assert(cell_base_ != 0);
-#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
       }
 
-      assert( (len+1) <= rem );
       char*res = cell_base_ + cell_ptr_;
       memcpy(res, text, len);
       cell_ptr_ += len;
       cell_base_[cell_ptr_++] = 0;
 
-      assert(cell_ptr_ <= DEFAULT_CELL_SIZE);
+      assert(cell_ptr_ <= HEAPCELL);
 
       return res;
 }
@@ -117,22 +80,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_;
@@ -181,7 +128,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()));
 }
@@ -228,14 +175,3 @@ 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;
-}
-
-const perm_string empty_perm_string = perm_string::literal("");

StringHeap.h

@@ -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-2010 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,10 @@
  *
  *    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
  */
 
+# include  "config.h"
 # include  <string>
 
 using namespace std;
@@ -30,8 +31,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,20 +38,19 @@ 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); }
 
     private:
       friend class StringHeap;
       friend class StringHeapLex;
-      explicit perm_string(const char*t) : text_(t) { };
+      perm_string(const char*t) : text_(t) { };
 
     private:
       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 +59,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
@@ -78,8 +75,11 @@ class StringHeap {
       perm_string make(const char*);
 
     private:
+      enum { HEAPCELL = 0x10000 };
+
       char*cell_base_;
       unsigned cell_ptr_;
+      unsigned cell_count_;
 
     private: // not implemented
       StringHeap(const StringHeap&);
@@ -100,11 +100,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 };
@@ -118,4 +117,4 @@ class StringHeapLex  : private StringHeap {
       StringHeapLex& operator= (const StringHeapLex&);
 };
 
-#endif /* IVL_StringHeap_H */
+#endif

_pli_types.h.in

@@ -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-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
@@ -16,7 +16,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
  */
 
 # undef HAVE_INTTYPES_H
@@ -81,8 +81,8 @@ 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 */
+#endif

acc_user.h

@@ -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 (steve@icarus.com)
+ * Copyright (c) 2002-2010 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,7 +16,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
  */
 
 /*
@@ -228,9 +228,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 +270,4 @@ extern char* acc_version(void);
 
 EXTERN_C_END
 
-#endif /* ACC_USER_H */
+#endif

aclocal.m4

@@ -1,4 +1,3 @@
-
 # AX_ENABLE_SUFFIX
 # ----------------
 #  Create the configure option --enable-suffix[=suffix] to generate suffix
@@ -8,9 +7,9 @@
 AC_DEFUN([AX_ENABLE_SUFFIX],
 [AC_ARG_ENABLE([suffix],[AC_HELP_STRING([--enable-suffix],
                                         [Use/set the installation command suffix])],
-               [true],[enable_suffix=no])
+               [true],[enable_suffix=yes])
 if test X$enable_suffix = Xyes; then
-  install_suffix='-0.10'
+  install_suffix='-0.8'
 elif test X$enable_suffix = Xno; then
   install_suffix=''
 else
@@ -23,13 +22,11 @@ AC_SUBST(install_suffix)
 # ------------------------------
 # Sub-macro for AX_C_UNDERSCORES_LEADING and AX_C_UNDERSCORES_TRAILING.
 # Unwarranted assumptions:
-#   - the object file produced by AC_COMPILE_IFELSE is called
-#     "conftest.$ac_objext"
-#   - the nm(1) utility or an equivalent is available, and its name
-#     is defined by the $NM variable.
+#   - 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){}])],
-[AS_IF([$NM conftest.$ac_objext|grep $1 >/dev/null 2>/dev/null],[$2],[$3])],
+[AS_IF([nm conftest.$ac_objext|grep $1 >/dev/null 2>/dev/null],[$2],[$3])],
 [AC_MSG_ERROR([underscore test crashed])]
 )])
 
@@ -66,24 +63,19 @@ fi
 # 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
@@ -92,13 +84,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
@@ -110,11 +98,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"
         ;;
 
@@ -129,13 +113,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)
@@ -150,11 +127,7 @@ AC_DEFUN([AX_C_PICFLAG],
 PICFLAG=-fPIC
 case "${host}" in
 
-     *-*-cygwin*)
-        PICFLAG=
-        ;;
-
-     *-*-mingw*)
+     *-*-cygwin* | *-*-mingw32*)
         PICFLAG=
         ;;
 
@@ -162,12 +135,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)
@@ -195,11 +162,7 @@ case "${host}" in
         rdynamic=""
         ;;
 
-    *-*-cygwin*)
-        rdynamic=""
-        ;;
-
-    *-*-mingw*)
+    *-*-cygwin* | *-*-mingw32*)
         rdynamic=""
         ;;
 
@@ -220,158 +183,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().
- # mingw-w64 doesn't need this, and the 64-bit version doesn't support it.
+# AX_CPP_PRECOMP
+# --------------
+AC_DEFUN([AX_CPP_PRECOMP],
+[# Darwin requires -no-cpp-precomp
 case "${host}" in
-    x86_64-w64-mingw32)
-        ;;
-    *-*-mingw32)
-        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
-
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_CC_FOR_BUILD
-#
-# DESCRIPTION
-#
-#   This macro searches for a C compiler that generates native executables,
-#   that is a C compiler that surely is not a cross-compiler. This can be
-#   useful if you have to generate source code at compile-time like for
-#   example GCC does.
-#
-#   The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything
-#   needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD).
-#   The value of these variables can be overridden by the user by specifying
-#   a compiler with an environment variable (like you do for standard CC).
-#
-#   It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object
-#   file extensions for the build platform, and GCC_FOR_BUILD to `yes' if
-#   the compiler we found is GCC. All these variables but GCC_FOR_BUILD are
-#   substituted in the Makefile.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Paolo Bonzini <[email protected]>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 8
-
-AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
-AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_CPP])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-dnl Use the standard macros, but make them use other variable names
-dnl
-pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
-pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
-pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
-pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
-pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl
-pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
-pushdef([ac_cv_objext], ac_cv_build_objext)dnl
-pushdef([ac_exeext], ac_build_exeext)dnl
-pushdef([ac_objext], ac_build_objext)dnl
-pushdef([CC], CC_FOR_BUILD)dnl
-pushdef([CPP], CPP_FOR_BUILD)dnl
-pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl
-pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
-pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
-pushdef([host], build)dnl
-pushdef([host_alias], build_alias)dnl
-pushdef([host_cpu], build_cpu)dnl
-pushdef([host_vendor], build_vendor)dnl
-pushdef([host_os], build_os)dnl
-pushdef([ac_cv_host], ac_cv_build)dnl
-pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
-pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
-pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
-pushdef([ac_cv_host_os], ac_cv_build_os)dnl
-pushdef([ac_cpp], ac_build_cpp)dnl
-pushdef([ac_compile], ac_build_compile)dnl
-pushdef([ac_link], ac_build_link)dnl
-
-save_cross_compiling=$cross_compiling
-save_ac_tool_prefix=$ac_tool_prefix
-cross_compiling=no
-ac_tool_prefix=
-
-AC_PROG_CC
-AC_PROG_CPP
-AC_EXEEXT
-
-ac_tool_prefix=$save_ac_tool_prefix
-cross_compiling=$save_cross_compiling
-
-dnl Restore the old definitions
-dnl
-popdef([ac_link])dnl
-popdef([ac_compile])dnl
-popdef([ac_cpp])dnl
-popdef([ac_cv_host_os])dnl
-popdef([ac_cv_host_vendor])dnl
-popdef([ac_cv_host_cpu])dnl
-popdef([ac_cv_host_alias])dnl
-popdef([ac_cv_host])dnl
-popdef([host_os])dnl
-popdef([host_vendor])dnl
-popdef([host_cpu])dnl
-popdef([host_alias])dnl
-popdef([host])dnl
-popdef([LDFLAGS])dnl
-popdef([CPPFLAGS])dnl
-popdef([CFLAGS])dnl
-popdef([CPP])dnl
-popdef([CC])dnl
-popdef([ac_objext])dnl
-popdef([ac_exeext])dnl
-popdef([ac_cv_objext])dnl
-popdef([ac_cv_exeext])dnl
-popdef([ac_cv_prog_cc_g])dnl
-popdef([ac_cv_prog_cc_cross])dnl
-popdef([ac_cv_prog_cc_works])dnl
-popdef([ac_cv_prog_gcc])dnl
-popdef([ac_cv_prog_CPP])dnl
-
-dnl Finally, set Makefile variables
-dnl
-BUILD_EXEEXT=$ac_build_exeext
-BUILD_OBJEXT=$ac_build_objext
-AC_SUBST(BUILD_EXEEXT)dnl
-AC_SUBST(BUILD_OBJEXT)dnl
-AC_SUBST([CFLAGS_FOR_BUILD])dnl
-AC_SUBST([CPPFLAGS_FOR_BUILD])dnl
-AC_SUBST([LDFLAGS_FOR_BUILD])dnl
-])
-
+])# AX_CPP_PRECOMP

async.cc

@@ -14,14 +14,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
  */
 
 # include "config.h"
 
 # include  "functor.h"
 # include  "netlist.h"
-# include  <cassert>
+# include  <assert.h>
 
 bool NetAssign::is_asynchronous()
 {
@@ -50,8 +50,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 +63,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;
@@ -84,7 +88,7 @@ bool NetProc::is_asynchronous()
 
 bool NetProcTop::is_asynchronous() const
 {
-      if (type_ == IVL_PR_INITIAL)
+      if (type_ == NetProcTop::KINITIAL)
 	    return false;
 
       return statement_->is_asynchronous();

attributes.txt

@@ -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 ]
 
 

autoconf.sh

@@ -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

cadpli/Makefile.in

@@ -12,9 +12,10 @@
 #
 #    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
+
 SHELL = /bin/sh
 
 suffix = @install_suffix@
@@ -29,69 +30,74 @@ bindir = @bindir@
 libdir = @libdir@
 includedir = $(prefix)/include
 
-vpidir = @libdir@/ivl$(suffix)
+vpidir = @libdir@/ivl$(suffix)/@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 = -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$(suffix)/@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 --std=posix --std=c99 --std=c++03 -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
 
-SYSTEM_VPI_LDFLAGS = -L../vpi -lvpi
-ifeq (@MINGW32@,yes)
+O = cadpli.o
+
+SYSTEM_VPI_LDFLAGS = -L../vvp -lvpi
+ifeq (@WIN32@,yes)
     SYSTEM_VPI_LDFLAGS += @EXTRALIBS@
 endif
 
-cadpli.vpl: $O ../vpi/libvpi.a ../libveriuser/libveriuser.o
-	$(CC) @shared@ $(LDFLAGS) -o $@ $O ../libveriuser/libveriuser.o $(SYSTEM_VPI_LDFLAGS)
+cadpli.vpl: $O ../vvp/libvpi.a ../libveriuser/libveriuser.o
+	$(CC) @shared@ -o $@ $O ../libveriuser/libveriuser.o $(SYSTEM_VPI_LDFLAGS)
 
-install: all installdirs installfiles
+clean:
+	rm -rf *.o dep cadpli.vpl bin32
 
-F = ./cadpli.vpl
+distclean: clean
+	rm -f Makefile config.status config.log config.cache
+	rm -rf autom4te.cache
 
-installfiles: $(F) | installdirs
-	$(INSTALL_PROGRAM) ./cadpli.vpl "$(DESTDIR)$(vpidir)/cadpli.vpl"
+install: all installdirs $(vpidir)/cadpli.vpl $(INSTALL32)
 
-installdirs: $(srcdir)/../mkinstalldirs
-	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(vpidir)"
+$(DESTDIR)$(vpidir)/cadpli.vpl: ./cadpli.vpl
+	$(INSTALL_PROGRAM) ./cadpli.vpl $(DESTDIR)$(vpidir)/cadpli.vpl
+
+installdirs: ../mkinstalldirs
+	$(srcdir)/../mkinstalldirs $(DESTDIR)$(vpidir)
 
 uninstall: $(UNINSTALL32)
-	rm -f "$(DESTDIR)$(vpidir)/cadpli.vpl"
+	rm -f $(DESTDIR)$(vpidir)/cadpli.vpl
 
-uninstall32:
+ifeq (@enable_vvp32@,yes)
+include $(srcdir)/enable_vvp32.mk
+endif
 
 -include $(patsubst %.o, dep/%.d, $O)

cadpli/cadpli.c

@@ -14,17 +14,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
  */
 
 # 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 +80,7 @@ static void thunker_register(void)
       }
 }
 
-void (*vlog_startup_routines[])(void) = {
+void (*vlog_startup_routines[])() = {
       thunker_register,
       0
 };

cadpli/cadpli.txt

@@ -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.
+

cadpli/configure.in

@@ -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
+
+AX_ENABLE_SUFFIX
+
+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 when 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
+#######################
+
+# 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)

cadpli/enable_vvp32.mk

@@ -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

cadpli/ivl_dlfcn.h

@@ -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 (steve@icarus.com)
+ * Copyright (c) 2001-2010 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,7 +16,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
  */
 
 #if defined(__MINGW32__)
@@ -32,16 +32,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 +58,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 +70,25 @@ 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 */
+#endif

compiler.h

@@ -1,7 +1,7 @@
-#ifndef IVL_compiler_H
-#define IVL_compiler_H
+#ifndef __compiler_H
+#define __compiler_H
 /*
- * Copyright (c) 1999-2019 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1999-2010 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,7 +16,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
  */
 
 # include  <list>
@@ -29,23 +29,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,10 +67,7 @@ extern unsigned recursive_mod_limit;
 
 /* Implicit definitions of wires. */
 extern bool warn_implicit;
-
-/* Warn if dimensions of port or var/net are implicitly taken from
-   the input/output/inout declaration. */
-extern bool warn_implicit_dimensions;
+extern bool error_implicit;
 
 /* inherit timescales across files. */
 extern bool warn_timescale;
@@ -90,22 +75,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 nets that are references but not driven. */
-extern bool warn_floating_nets;
+/* Warn about unused or unassigned variables. */
+extern bool warn_unused;
 
 /* This is true if verbose output is requested. */
 extern bool verbose_flag;
@@ -113,35 +84,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;
-
-/* Ignore errors about missing modules */
-extern bool ignore_missing_modules;
-
-/* Treat each source file as a separate compilation unit (as defined
-   by SystemVerilog). */
-extern bool separate_compilation;
-
-/* 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;
@@ -151,108 +95,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. Note that the compiler often assumes
-   this is an ordered list. */
+   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 supported assertion statements. If
-   this flag is false, then stub out supported assertion statements. */
-extern bool gn_supported_assertions_flag;
-/* If this flag is true, then error on unsupported assertion statements. If
-   this flag is false, then stub out unsupported assertion statements. */
-extern bool gn_unsupported_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 this flag is true, then don't add a for-loop control variable
-   to an implicit event_expression list if it is only used inside the
-   loop. */
-extern bool gn_shared_loop_index_flag;
-
-static inline bool gn_system_verilog(void)
-{
-      if (generation_flag >= GN_VER2005_SV)
-	    return true;
-      return false;
-}
-
-/* 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)
-{
-      return gn_system_verilog();
-}
-
-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
@@ -260,19 +117,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.
@@ -284,28 +128,12 @@ extern StringHeapLex filename_strings;
  */
 struct sfunc_return_type {
       const char*   name;
-      ivl_variable_type_t type;
+      NetExpr::TYPE type;
       unsigned      wid;
-      bool          signed_flag;
-      bool          override_flag;
+      int           signed_flag;
 };
 
-extern void add_sys_func(const struct sfunc_return_type&ret_type);
 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();
-/*
- * This temporarily loads a VPI module, to determine the return values
- * of system functions provided by that module, and adds the return values
- * to the system function table.
- */
-extern bool load_vpi_module(const char*path);
 
-/*
- * 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.
- */
-extern ivl_sfunc_as_task_t def_sfunc_as_task;
-
-#endif /* IVL_compiler_H */
+#endif

config.h.in

@@ -1,7 +1,7 @@
-#ifndef IVL_config_H                                           /* -*- c++ -*- */
-#define IVL_config_H
+#ifndef __config_H                                           /* -*- c++ -*- */
+#define __config_H
 /*
- * Copyright (c) 2001-2015 Stephen Williams ([email protected])
+ * Copyright (c) 2001-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
@@ -16,7 +16,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
  */
 
 #if defined(__cplusplus)
@@ -34,33 +34,15 @@
 # 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
-# undef HAVE_REALPATH
-
-/*
- * Define this if you want to compile vvp with memory freeing and
- * special valgrind hooks for the memory pools.
- */
-# undef CHECK_WITH_VALGRIND
-
-#endif /* IVL_config_H */
+#endif // __config_H

configure.in

@@ -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 ""
@@ -54,103 +39,25 @@ then
         exit 1
 fi
 
-if test "x$NM" = "x"; then
-	NM=nm
-fi
-
 AC_EXEEXT
 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, ["-Wstrict-prototypes"])
-AC_SUBST(WARNING_FLAGS_CXX, [""])
-fi
+AC_CHECK_DECL(__SUNPRO_C,AC_SUBST(WARNING_CFLAGS,),AC_SUBST(WARNING_CFLAGS,-Wall))
 
 AC_LANG(C++)
 
-AC_ARG_WITH([m32], [AC_HELP_STRING([--with-m32], [Compile 32-bit on x86_64])],
-            [ with_m32=yes ],[ with_m32=no ])
+AC_CHECK_DECL(__SUNPRO_CC,AC_SUBST(WARNING_CXXFLAGS,),AC_SUBST(WARNING_CXXFLAGS,-Wall))
+AC_CHECK_DECL(__SUNPRO_CC,AC_SUBST(DEPENDENCY_CPPFLAGS,-xMD),AC_SUBST(DEPENDENCY_CPPFLAGS,-MD))
 
-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"
-    ],
-    [])
+AC_CHECK_HEADERS(getopt.h malloc.h inttypes.h libiberty.h iosfwd sys/wait.h)
 
-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(readline, add_history, NEED_LIBHISTORY=no, NEED_LIBHISTORY=yes)
-if test "$NEED_LIBHISTORY" = "yes"; then
-AC_CHECK_LIB(history, add_history)
-else
-# libreadline includes libhistory functions
-AC_DEFINE(HAVE_LIBHISTORY, 1)
-fi
-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)
@@ -163,23 +70,6 @@ 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(
 #include <unistd.h>
@@ -203,11 +93,6 @@ 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
 
@@ -224,74 +109,8 @@ AX_LD_EXTRALIBS
 # 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"
-	;;
-    *-*-mingw*)
-	CXXFLAGS="-D__USE_MINGW_ANSI_STDIO=1 $CXXFLAGS"
-	CFLAGS="-D__USE_MINGW_ANSI_STDIO=1 $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)
-
-# fstapi.c (from GTKWave) needs this define.
-AC_CHECK_FUNCS(realpath)
-
-# 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
@@ -311,29 +130,27 @@ AX_C_UNDERSCORES_TRAILING
 ## end of test for underscores
 #######################
 
-#######################
-# Sanity check the configured results
-#######################
-
-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)
-AX_PROG_CC_FOR_BUILD
-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_SUBST(vpidir1)
+AC_SUBST(vpidir2)
+AC_MSG_RESULT(${vpidir1} ${vpidir2})
+
+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)

constants.vams

@@ -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

cppcheck.sup

@@ -1,619 +0,0 @@
-// These are correct and are used to find the base (zero) pin.
-thisSubtraction:netlist.h:5126
-thisSubtraction:netlist.h:5135
-
-// These are the functions that the compiler exports to the targets.
-//ivl_branch_island()
-unusedFunction:t-dll-api.cc:39
-//ivl_branch_terminal()
-unusedFunction:t-dll-api.cc:45
-
-//ivl_const_bits()
-unusedFunction:t-dll-api.cc:196
-//ivl_const_delay()
-unusedFunction:t-dll-api.cc:214
-//ivl_const_file()
-unusedFunction:t-dll-api.cc:221
-//ivl_const_lineno()
-unusedFunction:t-dll-api.cc:227
-//ivl_const_nex()
-unusedFunction:t-dll-api.cc:233
-//ivl_const_real()
-unusedFunction:t-dll-api.cc:239
-//ivl_const_scope()
-unusedFunction:t-dll-api.cc:246
-//ivl_const_signed()
-unusedFunction:t-dll-api.cc:252
-//ivl_const_type()
-unusedFunction:t-dll-api.cc:190
-//ivl_const_width()
-unusedFunction:t-dll-api.cc:258
-
-//ivl_design_const()
-unusedFunction:t-dll-api.cc:127
-//ivl_design_consts()
-unusedFunction:t-dll-api.cc:121
-//ivl_design_delay_sel()
-unusedFunction:t-dll-api.cc:52
-//ivl_design_discipline()
-unusedFunction:t-dll-api.cc:140
-//ivl_design_disciplines()
-unusedFunction:t-dll-api.cc:134
-//ivl_design_flag()
-unusedFunction:t-dll-api.cc:59
-//ivl_design_process()
-unusedFunction:t-dll-api.cc:66
-//ivl_design_root()
-unusedFunction:t-dll-api.cc:80
-//ivl_design_roots()
-unusedFunction:t-dll-api.cc:89
-//ivl_design_time_precision()
-unusedFunction:t-dll-api.cc:115
-
-//ivl_discipline_domain()
-unusedFunction:t-dll-api.cc:147
-//ivl_discipline_flow()
-unusedFunction:t-dll-api.cc:153
-//ivl_discipline_name()
-unusedFunction:t-dll-api.cc:159
-//ivl_discipline_potential()
-unusedFunction:t-dll-api.cc:165
-
-//ivl_enum_bits()
-unusedFunction:t-dll-api.cc:277
-//ivl_enum_file()
-unusedFunction:t-dll-api.cc:302
-//ivl_enum_lineno()
-unusedFunction:t-dll-api.cc:308
-//ivl_enum_name()
-unusedFunction:t-dll-api.cc:270
-//ivl_enum_names()
-unusedFunction:t-dll-api.cc:264
-//ivl_enum_signed()
-unusedFunction:t-dll-api.cc:296
-//ivl_enum_type()
-unusedFunction:t-dll-api.cc:284
-//ivl_enum_width()
-unusedFunction:t-dll-api.cc:290
-
-//ivl_event_any()
-unusedFunction:t-dll-api.cc:369
-//ivl_event_file()
-unusedFunction:t-dll-api.cc:345
-//ivl_event_lineno()
-unusedFunction:t-dll-api.cc:351
-//ivl_event_name()
-unusedFunction:t-dll-api.cc:314
-//ivl_event_nany()
-unusedFunction:t-dll-api.cc:363
-//ivl_event_neg()
-unusedFunction:t-dll-api.cc:382
-//ivl_event_nneg()
-unusedFunction:t-dll-api.cc:376
-//ivl_event_npos()
-unusedFunction:t-dll-api.cc:389
-//ivl_event_pos()
-unusedFunction:t-dll-api.cc:395
-//ivl_event_scope()
-unusedFunction:t-dll-api.cc:357
-
-//ivl_expr_bits()
-unusedFunction:t-dll-api.cc:402
-//ivl_expr_branch()
-unusedFunction:t-dll-api.cc:409
-//ivl_expr_def()
-unusedFunction:t-dll-api.cc:416
-//ivl_expr_delay_val()
-unusedFunction:t-dll-api.cc:432
-//ivl_expr_dvalue()
-unusedFunction:t-dll-api.cc:439
-//ivl_expr_enumtype()
-unusedFunction:t-dll-api.cc:446
-//ivl_expr_event()
-unusedFunction:t-dll-api.cc:656
-//ivl_expr_file()
-unusedFunction:t-dll-api.cc:178
-//ivl_expr_lineno()
-unusedFunction:t-dll-api.cc:184
-//ivl_expr_name()
-unusedFunction:t-dll-api.cc:459
-//ivl_expr_nature()
-unusedFunction:t-dll-api.cc:483
-//ivl_expr_net_type()
-unusedFunction:t-dll-api.cc:453
-//ivl_expr_opcode()
-unusedFunction:t-dll-api.cc:490
-//ivl_expr_oper1()
-unusedFunction:t-dll-api.cc:506
-//ivl_expr_oper2()
-unusedFunction:t-dll-api.cc:544
-//ivl_expr_oper3()
-unusedFunction:t-dll-api.cc:570
-//ivl_expr_parameter()
-unusedFunction:t-dll-api.cc:584
-//ivl_expr_parm()
-unusedFunction:t-dll-api.cc:599
-//ivl_expr_parms()
-unusedFunction:t-dll-api.cc:626
-//ivl_expr_repeat()
-unusedFunction:t-dll-api.cc:649
-//ivl_expr_scope()
-unusedFunction:t-dll-api.cc:670
-//ivl_expr_sel_type()
-unusedFunction:t-dll-api.cc:677
-//ivl_expr_signed()
-unusedFunction:t-dll-api.cc:702
-//ivl_expr_sized()
-unusedFunction:t-dll-api.cc:708
-//ivl_expr_string()
-unusedFunction:t-dll-api.cc:714
-//ivl_expr_type()
-unusedFunction:t-dll-api.cc:171
-//ivl_expr_uvalue()
-unusedFunction:t-dll-api.cc:721
-//ivl_expr_value()
-unusedFunction:t-dll-api.cc:747
-//ivl_expr_width()
-unusedFunction:t-dll-api.cc:753
-
-//ivl_file_table_index()
-unusedFunction:t-dll-api.cc:795
-//ivl_file_table_item()
-unusedFunction:t-dll-api.cc:785
-//ivl_file_table_size()
-unusedFunction:t-dll-api.cc:813
-
-//ivl_island_flag_set()
-unusedFunction:t-dll-api.cc:822
-//ivl_island_flag_test()
-unusedFunction:t-dll-api.cc:837
-
-//ivl_logic_attr()
-unusedFunction:t-dll-api.cc:864
-//ivl_logic_attr_cnt()
-unusedFunction:t-dll-api.cc:880
-//ivl_logic_attr_val()
-unusedFunction:t-dll-api.cc:886
-//ivl_logic_basename()
-unusedFunction:t-dll-api.cc:935
-//ivl_logic_delay()
-unusedFunction:t-dll-api.cc:974
-//ivl_logic_drive0()
-unusedFunction:t-dll-api.cc:894
-//ivl_logic_drive1()
-unusedFunction:t-dll-api.cc:911
-//ivl_logic_file()
-unusedFunction:t-dll-api.cc:846
-//ivl_logic_is_cassign()
-unusedFunction:t-dll-api.cc:858
-//ivl_logic_lineno()
-unusedFunction:t-dll-api.cc:852
-//ivl_logic_name()
-unusedFunction:t-dll-api.cc:928
-//ivl_logic_pins()
-unusedFunction:t-dll-api.cc:953
-//ivl_logic_scope()
-unusedFunction:t-dll-api.cc:941
-//ivl_logic_type()
-unusedFunction:t-dll-api.cc:947
-//ivl_logic_udp()
-unusedFunction:t-dll-api.cc:966
-//ivl_logic_width()
-unusedFunction:t-dll-api.cc:981
-
-//ivl_lpm_array()
-unusedFunction:t-dll-api.cc:1109
-//ivl_lpm_aset_value()
-unusedFunction:t-dll-api.cc:1160
-//ivl_lpm_async_clr()
-unusedFunction:t-dll-api.cc:1054
-//ivl_lpm_async_set()
-unusedFunction:t-dll-api.cc:1085
-//ivl_lpm_base()
-unusedFunction:t-dll-api.cc:1121
-//ivl_lpm_basename()
-unusedFunction:t-dll-api.cc:1048
-//ivl_lpm_clk()
-unusedFunction:t-dll-api.cc:1148
-//ivl_lpm_data()
-unusedFunction:t-dll-api.cc:1221
-//ivl_lpm_datab()
-unusedFunction:t-dll-api.cc:1321
-//ivl_lpm_define()
-unusedFunction:t-dll-api.cc:1183
-//ivl_lpm_delay()
-unusedFunction:t-dll-api.cc:1078
-//ivl_lpm_drive0()
-unusedFunction:t-dll-api.cc:1453
-//ivl_lpm_drive1()
-unusedFunction:t-dll-api.cc:1470
-//ivl_lpm_enable()
-unusedFunction:t-dll-api.cc:1195
-//ivl_lpm_file()
-unusedFunction:t-dll-api.cc:1209
-//ivl_lpm_lineno()
-unusedFunction:t-dll-api.cc:1215
-//ivl_lpm_name()
-unusedFunction:t-dll-api.cc:1355
-//ivl_lpm_negedge()
-unusedFunction:t-dll-api.cc:1136
-//ivl_lpm_select()
-unusedFunction:t-dll-api.cc:1493
-//ivl_lpm_selects()
-unusedFunction:t-dll-api.cc:1510
-//ivl_lpm_signed()
-unusedFunction:t-dll-api.cc:1528
-//ivl_lpm_size()
-unusedFunction:t-dll-api.cc:1587
-//ivl_lpm_sset_value()
-unusedFunction:t-dll-api.cc:1171
-//ivl_lpm_string()
-unusedFunction:t-dll-api.cc:1640
-//ivl_lpm_sync_clr()
-unusedFunction:t-dll-api.cc:1066
-//ivl_lpm_sync_set()
-unusedFunction:t-dll-api.cc:1097
-//ivl_lpm_trigger()
-unusedFunction:t-dll-api.cc:1659
-//ivl_lpm_type()
-unusedFunction:t-dll-api.cc:1647
-//ivl_lpm_width()
-unusedFunction:t-dll-api.cc:1653
-
-//ivl_lval_idx()
-unusedFunction:t-dll-api.cc:1681
-//ivl_lval_mux()
-unusedFunction:t-dll-api.cc:1676
-//ivl_lval_nest()
-unusedFunction:t-dll-api.cc:1726
-//ivl_lval_part_off()
-unusedFunction:t-dll-api.cc:1690
-//ivl_lval_property_idx()
-unusedFunction:t-dll-api.cc:1708
-//ivl_lval_sel_type()
-unusedFunction:t-dll-api.cc:1696
-//ivl_lval_sig()
-unusedFunction:t-dll-api.cc:1714
-
-//ivl_nature_name()
-unusedFunction:t-dll-api.cc:1735
-
-//ivl_nexus_get_private()
-unusedFunction:t-dll-api.cc:1756
-//ivl_nexus_name()
-unusedFunction:t-dll-api.cc:1745
-//ivl_nexus_ptr_branch()
-unusedFunction:t-dll-api.cc:1799
-//ivl_nexus_ptr_con()
-unusedFunction:t-dll-api.cc:1808
-//ivl_nexus_ptr_sig()
-unusedFunction:t-dll-api.cc:1835
-//ivl_nexus_ptr_switch()
-unusedFunction:t-dll-api.cc:1844
-//ivl_nexus_set_private()
-unusedFunction:t-dll-api.cc:1762
-
-//ivl_parameter_basename()
-unusedFunction:t-dll-api.cc:1853
-//ivl_parameter_expr()
-unusedFunction:t-dll-api.cc:1896
-//ivl_parameter_file()
-unusedFunction:t-dll-api.cc:1902
-//ivl_parameter_lineno()
-unusedFunction:t-dll-api.cc:1908
-//ivl_parameter_local()
-unusedFunction:t-dll-api.cc:1859
-//ivl_parameter_lsb()
-unusedFunction:t-dll-api.cc:1877
-//ivl_parameter_msb()
-unusedFunction:t-dll-api.cc:1871
-//ivl_parameter_scope()
-unusedFunction:t-dll-api.cc:1914
-//ivl_parameter_signed()
-unusedFunction:t-dll-api.cc:1865
-//ivl_parameter_width()
-unusedFunction:t-dll-api.cc:1887
-
-//ivl_path_condit()
-unusedFunction:t-dll-api.cc:1920
-//ivl_path_delay()
-unusedFunction:t-dll-api.cc:1932
-//ivl_path_is_condit()
-unusedFunction:t-dll-api.cc:1926
-//ivl_path_scope()
-unusedFunction:t-dll-api.cc:1938
-//ivl_path_source()
-unusedFunction:t-dll-api.cc:1945
-//ivl_path_source_negedge()
-unusedFunction:t-dll-api.cc:1957
-//ivl_path_source_posedge()
-unusedFunction:t-dll-api.cc:1951
-
-//ivl_process_analog()
-unusedFunction:t-dll-api.cc:1981
-//ivl_process_attr_cnt()
-unusedFunction:t-dll-api.cc:1999
-//ivl_process_attr_val()
-unusedFunction:t-dll-api.cc:2005
-//ivl_process_file()
-unusedFunction:t-dll-api.cc:1963
-//ivl_process_lineno()
-unusedFunction:t-dll-api.cc:1969
-//ivl_process_scope()
-unusedFunction:t-dll-api.cc:1987
-//ivl_process_stmt()
-unusedFunction:t-dll-api.cc:1993
-//ivl_process_type()
-unusedFunction:t-dll-api.cc:1975
-
-//ivl_scope_attr_cnt()
-unusedFunction:t-dll-api.cc:2013
-//ivl_scope_attr_val()
-unusedFunction:t-dll-api.cc:2019
-//ivl_scope_basename()
-unusedFunction:t-dll-api.cc:2027
-//ivl_scope_child()
-unusedFunction:t-dll-api.cc:2054
-//ivl_scope_children()
-unusedFunction:t-dll-api.cc:2033
-//ivl_scope_childs()
-unusedFunction:t-dll-api.cc:2047
-//ivl_scope_class()
-unusedFunction:t-dll-api.cc:2061
-//ivl_scope_classes()
-unusedFunction:t-dll-api.cc:2068
-//ivl_scope_def()
-unusedFunction:t-dll-api.cc:2075
-//ivl_scope_def_file()
-unusedFunction:t-dll-api.cc:2081
-//ivl_scope_def_lineno()
-unusedFunction:t-dll-api.cc:2087
-//ivl_scope_enumerate()
-unusedFunction:t-dll-api.cc:2099
-//ivl_scope_enumerates()
-unusedFunction:t-dll-api.cc:2093
-//ivl_scope_event()
-unusedFunction:t-dll-api.cc:2112
-//ivl_scope_events()
-unusedFunction:t-dll-api.cc:2106
-//ivl_scope_file()
-unusedFunction:t-dll-api.cc:2119
-//ivl_scope_func_signed
-unusedFunction:t-dll-api.cc:2132
-//ivl_scope_func_type
-unusedFunction:t-dll-api.cc:2125
-//ivl_scope_func_width
-unusedFunction:t-dll-api.cc:2140
-//ivl_scope_is_auto()
-unusedFunction:t-dll-api.cc:2148
-//ivl_scope_is_cell()
-unusedFunction:t-dll-api.cc:2154
-//ivl_scope_lineno()
-unusedFunction:t-dll-api.cc:2160
-//ivl_scope_log()
-unusedFunction:t-dll-api.cc:2172
-//ivl_scope_logs()
-unusedFunction:t-dll-api.cc:2166
-//ivl_scope_lpm()
-unusedFunction:t-dll-api.cc:2185
-//ivl_scope_lpms()
-unusedFunction:t-dll-api.cc:2179
-//ivl_scope_mod_module_port_name()
-unusedFunction:t-dll-api.cc:2264
-//ivl_scope_mod_module_port_type()
-unusedFunction:t-dll-api.cc:2273
-//ivl_scope_mod_module_port_width()
-unusedFunction:t-dll-api.cc:2285
-//ivl_scope_mod_module_ports()
-unusedFunction:t-dll-api.cc:2257
-//ivl_scope_mod_port()
-unusedFunction:t-dll-api.cc:2310
-//ivl_scope_param()
-unusedFunction:t-dll-api.cc:2243
-//ivl_scope_params()
-unusedFunction:t-dll-api.cc:2237
-//ivl_scope_parent()
-unusedFunction:t-dll-api.cc:2250
-//ivl_scope_port()
-unusedFunction:t-dll-api.cc:2301
-//ivl_scope_ports()
-unusedFunction:t-dll-api.cc:2292
-//ivl_scope_sig()
-unusedFunction:t-dll-api.cc:2324
-//ivl_scope_sigs()
-unusedFunction:t-dll-api.cc:2318
-//ivl_scope_switch()
-unusedFunction:t-dll-api.cc:2337
-//ivl_scope_switches()
-unusedFunction:t-dll-api.cc:2331
-//ivl_scope_time_precision()
-unusedFunction:t-dll-api.cc:2344
-//ivl_scope_time_units()
-unusedFunction:t-dll-api.cc:2350
-//ivl_scope_tname()
-unusedFunction:t-dll-api.cc:2362
-//ivl_scope_type()
-unusedFunction:t-dll-api.cc:2356
-
-//ivl_signal_array_addr_swapped()
-unusedFunction:t-dll-api.cc:2380
-//ivl_signal_array_base()
-unusedFunction:t-dll-api.cc:2368
-//ivl_signal_array_count()
-unusedFunction:t-dll-api.cc:2374
-//ivl_signal_attr()
-unusedFunction:t-dll-api.cc:2398
-//ivl_signal_attr_cnt()
-unusedFunction:t-dll-api.cc:2414
-//ivl_signal_attr_val()
-unusedFunction:t-dll-api.cc:2420
-//ivl_signal_basename()
-unusedFunction:t-dll-api.cc:2427
-//ivl_signal_data_type()
-unusedFunction:t-dll-api.cc:2578
-//ivl_signal_dimensions()
-unusedFunction:t-dll-api.cc:2386
-//ivl_signal_discipline()
-unusedFunction:t-dll-api.cc:2392
-//ivl_signal_file()
-unusedFunction:t-dll-api.cc:2555
-//ivl_signal_forced_net()
-unusedFunction:t-dll-api.cc:2549
-//ivl_signal_integer()
-unusedFunction:t-dll-api.cc:2567
-//ivl_signal_lineno()
-unusedFunction:t-dll-api.cc:2561
-//ivl_signal_local()
-unusedFunction:t-dll-api.cc:2536
-//ivl_signal_lsb()
-unusedFunction:t-dll-api.cc:2501
-//ivl_signal_module_port_index()
-unusedFunction:t-dll-api.cc:2530
-//ivl_signal_msb()
-unusedFunction:t-dll-api.cc:2491
-//ivl_signal_name()
-unusedFunction:t-dll-api.cc:2433
-//ivl_signal_nex()
-unusedFunction:t-dll-api.cc:2454
-//ivl_signal_npath()
-unusedFunction:t-dll-api.cc:2591
-//ivl_signal_packed_dimensions()
-unusedFunction:t-dll-api.cc:2471
-//ivl_signal_packed_lsb()
-unusedFunction:t-dll-api.cc:2484
-//ivl_signal_packed_msb()
-unusedFunction:t-dll-api.cc:2477
-//ivl_signal_path()
-unusedFunction:t-dll-api.cc:2597
-//ivl_signal_port()
-unusedFunction:t-dll-api.cc:2524
-//ivl_signal_scope()
-unusedFunction:t-dll-api.cc:2511
-//ivl_signal_signed()
-unusedFunction:t-dll-api.cc:2542
-//ivl_signal_width()
-unusedFunction:t-dll-api.cc:2517
-
-//ivl_statement_type()
-unusedFunction:t-dll-api.cc:2610
-
-//ivl_stmt_block_count()
-unusedFunction:t-dll-api.cc:2643
-//ivl_stmt_block_scope()
-unusedFunction:t-dll-api.cc:2628
-//ivl_stmt_block_stmt()
-unusedFunction:t-dll-api.cc:2658
-//ivl_stmt_call()
-unusedFunction:t-dll-api.cc:2674
-//ivl_stmt_case_count()
-unusedFunction:t-dll-api.cc:2695
-//ivl_stmt_case_expr()
-unusedFunction:t-dll-api.cc:2710
-//ivl_stmt_case_stmt()
-unusedFunction:t-dll-api.cc:2727
-//ivl_stmt_cond_expr()
-unusedFunction:t-dll-api.cc:2744
-//ivl_stmt_cond_false()
-unusedFunction:t-dll-api.cc:2771
-//ivl_stmt_cond_true()
-unusedFunction:t-dll-api.cc:2781
-//ivl_stmt_delay_expr()
-unusedFunction:t-dll-api.cc:2791
-//ivl_stmt_delay_val()
-unusedFunction:t-dll-api.cc:2808
-//ivl_stmt_events()
-unusedFunction:t-dll-api.cc:2834
-//ivl_stmt_file()
-unusedFunction:t-dll-api.cc:2616
-//ivl_stmt_lexp()
-unusedFunction:t-dll-api.cc:2862
-//ivl_stmt_lineno()
-unusedFunction:t-dll-api.cc:2622
-//ivl_stmt_lval()
-unusedFunction:t-dll-api.cc:2874
-//ivl_stmt_lvals()
-unusedFunction:t-dll-api.cc:2893
-//ivl_stmt_lwidth()
-unusedFunction:t-dll-api.cc:2911
-//ivl_stmt_name()
-unusedFunction:t-dll-api.cc:2944
-//ivl_stmt_nevent()
-unusedFunction:t-dll-api.cc:2815
-//ivl_stmt_opcode()
-unusedFunction:t-dll-api.cc:2957
-//ivl_stmt_parm()
-unusedFunction:t-dll-api.cc:2969
-//ivl_stmt_parm_count()
-unusedFunction:t-dll-api.cc:2983
-//ivl_stmt_rval()
-unusedFunction:t-dll-api.cc:2995
-//ivl_stmt_sfunc_as_task()
-unusedFunction:t-dll-api.cc:3013
-//ivl_stmt_sub_stmt()
-unusedFunction:t-dll-api.cc:3026
-
-//ivl_switch_a()
-unusedFunction:t-dll-api.cc:3067
-//ivl_switch_b()
-unusedFunction:t-dll-api.cc:3073
-//ivl_switch_basename()
-unusedFunction:t-dll-api.cc:3049
-//ivl_switch_delay()
-unusedFunction:t-dll-api.cc:3103
-//ivl_switch_enable()
-unusedFunction:t-dll-api.cc:3079
-//ivl_switch_file()
-unusedFunction:t-dll-api.cc:3110
-//ivl_switch_island()
-unusedFunction:t-dll-api.cc:3116
-//ivl_switch_lineno()
-unusedFunction:t-dll-api.cc:3122
-//ivl_switch_offset()
-unusedFunction:t-dll-api.cc:3097
-//ivl_switch_part()
-unusedFunction:t-dll-api.cc:3091
-//ivl_switch_scope()
-unusedFunction:t-dll-api.cc:3055
-//ivl_switch_type()
-unusedFunction:t-dll-api.cc:3061
-//ivl_switch_width()
-unusedFunction:t-dll-api.cc:3085
-
-//ivl_type_base()
-unusedFunction:t-dll-api.cc:3128
-//ivl_type_element()
-unusedFunction:t-dll-api.cc:3134
-//ivl_type_name()
-unusedFunction:t-dll-api.cc:3166
-//ivl_type_packed_dimensions()
-unusedFunction:t-dll-api.cc:3143
-//ivl_type_packed_lsb()
-unusedFunction:t-dll-api.cc:3150
-//ivl_type_packed_msb()
-unusedFunction:t-dll-api.cc:3158
-//ivl_type_prop_type()
-unusedFunction:t-dll-api.cc:3191
-//ivl_type_properties()
-unusedFunction:t-dll-api.cc:3174
-//ivl_type_signed()
-unusedFunction:t-dll-api.cc:3199
-
-//ivl_udp_file()
-unusedFunction:t-dll-api.cc:1036
-//ivl_udp_init()
-unusedFunction:t-dll-api.cc:999
-//ivl_udp_lineno()
-unusedFunction:t-dll-api.cc:1042
-//ivl_udp_name()
-unusedFunction:t-dll-api.cc:1029
-//ivl_udp_nin()
-unusedFunction:t-dll-api.cc:993
-//ivl_udp_port()
-unusedFunction:t-dll-api.cc:1005
-//ivl_udp_row()
-unusedFunction:t-dll-api.cc:1014
-//ivl_udp_rows()
-unusedFunction:t-dll-api.cc:1023
-// ivl_udp_sequ()
-unusedFunction:t-dll-api.cc:987
-

developer-quick-start.txt

@@ -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.

discipline.cc

@@ -1,39 +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  "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()
-{
-}

discipline.h

@@ -1,77 +0,0 @@
-#ifndef IVL_discipline_H
-#define IVL_discipline_H
-/*
- * Copyright (c) 2008-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.
- */
-
-/*
- * 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 */

disciplines.vams

@@ -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

dosify.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2009 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2001 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,12 +14,15 @@
  *
  *    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
- * original. That is, it converts Unix style line ends to DOS
+ * original. That is, it converts unix style line ends to DOS
  * style. This is useful for installing text files.
  *
  * The exact substitution is to replace \n with \r\n. If the line
@@ -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.
+ *
+ */
+

driver-vpi/Makefile.in

@@ -12,9 +12,10 @@
 #
 #    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
+
 SHELL = /bin/sh
 
 suffix = @install_suffix@
@@ -36,80 +37,50 @@ mandir = @mandir@
 dllib=@DLLIB@
 
 CC = @CC@
-HOSTCC := @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@
-CXXFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CXX@ @CXXFLAGS@
+CPPFLAGS = -I. -I$(srcdir)/.. @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 config.h
+	rm -f iverilog-vpi@EXEEXT@
 
 distclean: clean
-	rm -f Makefile config.log
+	rm -f Makefile
 
-cppcheck: main.c
-	cppcheck --enable=all --std=posix --std=c99 --std=c++03 -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 config.h
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/main.c
 
-
-config.h: $(srcdir)/config.h.in Makefile
+config.h: config.h.in
 	sed -e 's;@IVLCC@;@CC@;' -e 's;@IVLCXX@;@CXX@;' \
 	    -e 's;@SUFFIX@;$(suffix);g' \
-	    -e 's;@IVLCFLAGS@;$(CFLAGS);' \
-	    -e 's;@IVLCXXFLAGS@;$(CXXFLAGS);' \
+	    -e 's;@IVLCFLAGS@;@CXXFLAGS@;' \
 	    -e 's;@SHARED@;@shared@;' $< > $@
 
 # Windows specific...
-res.rc: $(srcdir)/res.rc.in ../version.exe
-	sed -e 's;@PRODUCTVERSION@;'`../version.exe '%M,%n,0,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 installfiles
+install: all installdirs $(bindir)/iverilog-vpi$(suffix)@EXEEXT@
 
-F = ./iverilog-vpi@EXEEXT@
+$(bindir)/iverilog-vpi$(suffix)@EXEEXT@: ./iverilog-vpi@EXEEXT@
+	$(INSTALL_PROGRAM) ./iverilog-vpi@EXEEXT@ $(bindir)/iverilog-vpi$(suffix)@EXEEXT@
 
-installfiles: $(F) | installdirs
-	$(INSTALL_PROGRAM) ./iverilog-vpi@EXEEXT@ "$(bindir)/iverilog-vpi$(suffix)@EXEEXT@"
-ifeq (@WIN32@,yes)
-ifneq ($(HOSTCC),$(CC))
-	$(INSTALL_PROGRAM) $(shell $(HOSTCC) --print-file-name=libwinpthread-1.dll) "$(DESTDIR)$(bindir)"
-	$(INSTALL_PROGRAM) $(shell $(HOSTCC) --print-file-name=libgcc_s_sjlj-1.dll) "$(DESTDIR)$(bindir)"
-	$(INSTALL_PROGRAM) $(shell $(HOSTCC) --print-file-name=libstdc++-6.dll) "$(DESTDIR)$(bindir)"
-endif
-endif
-
-installdirs: $(srcdir)/../mkinstalldirs
-	$(srcdir)/../mkinstalldirs "$(bindir)"
+installdirs: ../mkinstalldirs
+	$(srcdir)/../mkinstalldirs $(bindir)
 
 uninstall:
 	rm -f $(bindir)/iverilog-vpi$(suffix)@EXEEXT@

driver-vpi/config.h.in

@@ -4,7 +4,6 @@
 #define IVERILOG_VPI_CC        "@IVLCC@"
 #define IVERILOG_VPI_CXX       "@IVLCXX@"
 #define IVERILOG_VPI_CFLAGS    " @IVLCFLAGS@"
-#define IVERILOG_VPI_CXXFLAGS  " @IVLCXXFLAGS@"
 #define IVERILOG_VPI_LDFLAGS   "@SHARED@"
 #define IVERILOG_VPI_LDLIBS    "-lveriuser@SUFFIX@ -lvpi@SUFFIX@"
 #define IVERILOG_SUFFIX        "@SUFFIX@"

driver-vpi/main.c

@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2002 Gus Baldauf (gus@picturel.com)
- * Copyright (c) 2015 Martin Whitaker
  *
  *    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,13 +14,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
  */
 
 /*
  *	iverilog-vpi.c
  *
- *	this program provides the functionality of iverilog-vpi.sh under Windows
+ *	this program provides the functionality of iverilog-vpi.sh under Win32
  */
 
 #include <stdio.h>
@@ -33,7 +32,7 @@
 
 #include <windows.h>
 
-static void setup_ivl_environment(void);
+static void setup_ivl_environment();
 static void assign(char **ptr, char *str);
 
 /* The compile options: compiler, flags, etc. are in here */
@@ -44,17 +43,16 @@ static void assign(char **ptr, char *str);
 static struct global_strings {
 	char *pCCSRC;		/* list of C source files (*.c) */
 	char *pCXSRC;		/* list of C++ source files (*.cc, *.cpp) */
-	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 *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 *pCCFLAGS;		/* compiler flags for compiling C source files */
-	char *pCXFLAGS;		/* compiler flags for compiling C++ source files */
-	char *pLDLIBS;		/* linker flags for final linking stage */
-	char *pCCNAME;		/* base name of compiler */
+	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;
 
@@ -77,21 +75,21 @@ static void myExit(int exitVal)
 	deInitDynString(gstr.pOUT);
 	deInitDynString(gstr.pMINGW);
 	deInitDynString(gstr.pIVL);
-	deInitDynString(gstr.pCCFLAGS);
-	deInitDynString(gstr.pCXFLAGS);
+	deInitDynString(gstr.pCFLAGS);
 	deInitDynString(gstr.pLDLIBS);
-	deInitDynString(gstr.pCCNAME);
-	deInitDynString(gstr.pLD);
+	deInitDynString(gstr.pNewPath);
+	free(gstr.pLD);
 
 	exit(exitVal);
 }
 
 /* display usage summary and exit */
 
-static void usage(void)
+static void usage()
 {
-	fprintf(stderr, "usage: iverilog-vpi" IVERILOG_SUFFIX " [options] [src and obj files]...\n");
-	fprintf(stderr, "   or  iverilog-vpi" IVERILOG_SUFFIX " -mingw=dir\n");
+	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");
 	myExit(1);
 }
 
@@ -100,7 +98,7 @@ static void initDynString(char **str)
 	*str = (char *) malloc(1);
 
 	if (!*str) {
-		fprintf(stderr, "error: out of memory\n");
+		fprintf(stderr,"error: out of memory\n");
 		myExit(4);
 	}
 
@@ -109,10 +107,8 @@ static void initDynString(char **str)
 
 /* initialize dynamic memory buffers */
 
-static void init(void)
+static void init()
 {
-	char *ptr;
-
 	initDynString(&gstr.pCCSRC);
 	initDynString(&gstr.pCXSRC);
 	initDynString(&gstr.pOBJ);
@@ -122,17 +118,9 @@ static void init(void)
 	initDynString(&gstr.pOUT);
 	initDynString(&gstr.pMINGW);
 	initDynString(&gstr.pIVL);
-	initDynString(&gstr.pCCFLAGS);
-	initDynString(&gstr.pCXFLAGS);
+	initDynString(&gstr.pCFLAGS);
 	initDynString(&gstr.pLDLIBS);
-	initDynString(&gstr.pCCNAME);
-	initDynString(&gstr.pLD);
-
-	  /* Get the base name of the C compiler. */
-	assign(&gstr.pCCNAME, IVERILOG_VPI_CC);
-	ptr = strchr(gstr.pCCNAME, ' ');
-	if (ptr != NULL) *ptr = '\0';
-
+	initDynString(&gstr.pNewPath);
 	  /* By default use the C compiler to link the programs. */
 	assign(&gstr.pLD, IVERILOG_VPI_CC);
 }
@@ -148,7 +136,7 @@ static int endsIn (char *end, char *str)
 
 	ext = str + (strlen(str) - strlen(end));
 
-	return stricmp(end, ext) ? 0 : 1;
+	return stricmp(end,ext) ? 0 : 1;
 }
 
 /* return true if "str" begins with "prefix", case insensitive */
@@ -158,35 +146,32 @@ static int startsWith (char *prefix, char *str)
 	if (strlen(prefix) >= strlen(str))
 		return 0;
 
-	return strnicmp(prefix, str, strlen(prefix)) ? 0 : 1;
+	return strnicmp(prefix,str,strlen(prefix)) ? 0 : 1;
 }
 
 /* append "app" to "ptr", allocating memory as needed    */
 /*   if count is zero, then copy all characters of "app" */
 
-static void appendn (char **ptr, char *app, size_t count)
+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) {
-		fprintf(stderr, "error: out of memory\n");
-		free(*ptr);
+	if (*ptr == NULL) {
+		fprintf(stderr,"error: out of memory\n");
 		myExit(4);
 	}
-	*ptr = nptr;
 
 	if (count)
-		strncat(*ptr, app, count);
+		strncat(*ptr,app,count);
 	else
-		strcat(*ptr, app);
+		strcat(*ptr,app);
 }
 
 /* append "app" to "ptr", allocating memory as needed    */
 
 static void append (char **ptr, char *app)
 {
-	appendn(ptr, app, 0);
+	appendn(ptr,app,0);
 }
 
 /* if the string does not end with a backslash, add one */
@@ -194,36 +179,34 @@ static void append (char **ptr, char *app)
 static void appendBackSlash(char **str)
 {
 	if ((*str)[strlen(*str)-1] != '\\')
-		append(str, "\\");
+		append(str,"\\");
 }
 
 /* copy count characters of "str" to "ptr", allocating memory as needed */
 /*   if count is zero, then copy all characters of "str"                */
 
-static void assignn (char **ptr, char *str, size_t count)
+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) {
-		fprintf(stderr, "error: out of memory\n");
-		free(*ptr);
+	if (*ptr == NULL) {
+		fprintf(stderr,"error: out of memory\n");
 		myExit(4);
 	}
-	*ptr = nptr;
 
 	if (count) {
-		strncpy(*ptr, str, count);
+		strncpy(*ptr,str,count);
 		(*ptr)[count] = 0;
 	}
 	else
-		strcpy(*ptr, str);
+		strcpy(*ptr,str);
 }
 
 /* copy count characters of "str" to "ptr", allocating memory as needed */
 
 static void assign (char **ptr, char *str)
 {
-	assignn(ptr, str, 0);
+	assignn(ptr,str,0);
 }
 
 /* get a copy of a Icarus Verilog registry string key */
@@ -235,11 +218,11 @@ static int GetRegistryKey(char *key, char **value)
 	char *regKeyBuffer;
 	DWORD regKeyType, regKeySize;
 
-	lrv = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "Software\\Icarus Verilog", 0, KEY_QUERY_VALUE, &hkKey);
+	lrv = RegOpenKeyEx(HKEY_LOCAL_MACHINE,"Software\\Icarus Verilog",0,KEY_QUERY_VALUE,&hkKey);
 	if (lrv != ERROR_SUCCESS)
 		return 0;
 
-	lrv = RegQueryValueEx(hkKey, key, NULL, &regKeyType, NULL, &regKeySize);
+	lrv = RegQueryValueEx(hkKey,key,NULL,&regKeyType,NULL,&regKeySize);
 	if ((lrv != ERROR_SUCCESS) || (regKeyType != REG_SZ) || (!regKeySize)) {
 		lrv = RegCloseKey(hkKey);
 		return 0;
@@ -248,14 +231,12 @@ static int GetRegistryKey(char *key, char **value)
 	regKeyBuffer = (char *) malloc(regKeySize+1);
 	if (!regKeyBuffer) {
 		lrv = RegCloseKey(hkKey);
-		fprintf(stderr, "error: out of memory\n");
+		fprintf(stderr,"error: out of memory\n");
 		myExit(4);
 	}
 	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);
@@ -264,7 +245,7 @@ static int GetRegistryKey(char *key, char **value)
 
 	RegCloseKey(hkKey);
 
-	assign(value, regKeyBuffer);
+	assign(value,regKeyBuffer);
 	free(regKeyBuffer);
 
 	return 1;
@@ -274,30 +255,25 @@ static int GetRegistryKey(char *key, char **value)
 
 static void SetRegistryKey(char *key, char *value)
 {
-	long lrv;
 	HKEY hkKey;
 	DWORD res;
 
-	lrv = RegCreateKeyEx(HKEY_LOCAL_MACHINE, "Software\\Icarus Verilog", 0, "",
-			     REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hkKey, &res);
-	if (lrv != ERROR_SUCCESS) {
-		char message[1024];
-		FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, lrv, LANG_USER_DEFAULT,
-			      message, sizeof(message), NULL);
-		fprintf(stderr, "error: couldn't write to registry - %s\n", message);
-		if (lrv == ERROR_ACCESS_DENIED) {
-			fprintf(stderr, "       try running as administrator\n");
-		}
-		return;
-	}
+	if (RegCreateKeyEx(
+		HKEY_LOCAL_MACHINE,
+		"Software\\Icarus Verilog",
+		0,
+		"",
+		REG_OPTION_NON_VOLATILE,
+		KEY_ALL_ACCESS,NULL,
+		&hkKey,
+		&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);
-	printf("       HKEY_LOCAL_MACHINE\\Software\\Icarus Verilog\\%s\n", key);
+	printf("info:  storing %s in Windows' registry entry\n",value);
+	printf("       HKEY_LOCAL_MACHINE\\Software\\Icarus Verilog\\%s\n",key);
 }
 
 /* parse the command line, assign results to global variable strings */
@@ -314,6 +290,7 @@ static int parse(int argc, char *argv[])
 	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;
@@ -353,7 +330,7 @@ static int parse(int argc, char *argv[])
 		  /* Check for compiled object files */
 		else if (endsIn(dot_o_ext, argv[idx])) {
 			++srcFileCnt;
-			append(&gstr.pOBJ, " ");
+			append(&gstr.pOBJ," ");
 			append(&gstr.pOBJ, argv[idx]);
 			if (!*gstr.pOUT)
 			   assignn(&gstr.pOUT, argv[idx],
@@ -363,6 +340,10 @@ static int parse(int argc, char *argv[])
 		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,
@@ -386,7 +367,7 @@ static int parse(int argc, char *argv[])
 		  /* Check for the --cflags option */
 		else if (stricmp("--cflags", argv[idx]) == 0) {
 			setup_ivl_environment();
-			printf("%s\n", gstr.pCCFLAGS);
+			printf("%s\n", gstr.pCFLAGS);
 			myExit(0);
 		}
 		  /* Check for the --ldflags option */
@@ -403,7 +384,7 @@ static int parse(int argc, char *argv[])
 		  /* 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);
+			printf("%s\\\\lib\\\\ivl" IVERILOG_SUFFIX "\\\\.\n", gstr.pIVL);
 			myExit(0);
 		}
 		  /* This is different than iverilog-vpi.sh, we don't
@@ -412,16 +393,15 @@ static int parse(int argc, char *argv[])
 	}
 
 	  /* In case there is a --name without source/object files */
-	if (0 == srcFileCnt) assign(&gstr.pOUT, "");
+	if (0 == srcFileCnt) assign(&gstr.pOUT,"");
 
-	if (*gstr.pOUT) {
+	  /* 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");
-	} else {
-		  /* Unless we are setting the MinGW registry entry, it's
-		     an error if there are no source or object files */
-		if (!*gstr.pMINGW) return 0;
-	}
 
 	return 1;
 }
@@ -432,126 +412,120 @@ static void checkMingwDir(char *root)
 {
 	int irv;
 	struct _stat stat_buf;
-	char *path;
 
+	char *path;
 	initDynString(&path);
-	assign(&path, gstr.pMINGW);
+	assign(&path,gstr.pMINGW);
 	appendBackSlash(&path);
-	append(&path, "bin\\");
-        append(&path, gstr.pCCNAME);
-	append(&path, ".exe");
+	append(&path,"bin\\" IVERILOG_VPI_CC ".exe");
 
 	irv = _stat(path,&stat_buf);
 	deInitDynString(path);
 
 	if (irv) {
-		fprintf(stderr, "error: %s\n", root);
-		fprintf(stderr, "       does not appear to be the valid root directory of\n");
-		fprintf(stderr, "       MinGW.  Use the -mingw option of iverilog-vpi.exe to\n");
-		fprintf(stderr, "       point to the MinGW root directory.  For a Windows command\n");
-		fprintf(stderr, "       shell the option would be something like -mingw=c:\\mingw\n");
-		fprintf(stderr, "       For a Cygwin shell the option would be something like\n");
-		fprintf(stderr, "       -mingw=c:\\\\mingw\n");
+		fprintf(stderr,"error: %s does not appear to be the valid root directory\n",root);
+		fprintf(stderr,"       of MinGW.  Use the -mingw option of iverilog-vpi.exe to\n");
+		fprintf(stderr,"       point to the MinGW root directory.  For a Windows command\n");
+		fprintf(stderr,"       shell the option would be something like -mingw=c:\\mingw\n");
+		fprintf(stderr,"       For a Cygwin shell the option would be something like\n");
+		fprintf(stderr,"       -mingw=c:\\\\mingw\n");
 		myExit(5);
 	}
 }
 
+/* do minimal check that the Icarus Verilog root directory looks valid */
+
+static void checkIvlDir(char *root)
+{
+	int irv;
+	struct _stat stat_buf;
+
+	char *path;
+	initDynString(&path);
+	assign(&path,gstr.pIVL);
+	appendBackSlash(&path);
+	append(&path,"bin\\vvp" IVERILOG_SUFFIX ".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,"       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");
+		fprintf(stderr,"       -ivl=c:\\\\iverilog\n");
+		myExit(6);
+	}
+}
+
 /* see if we can find mingw root */
 
 #define IVL_REGKEY_MINGW "MingwDir"
 
-static void setup_mingw_environment(void)
+static void setup_mingw_environment()
 {
-	char buffer[1];		/* doesn't matter how big this is, as we don't use the result */
-	char *path;
+	char *pOldPATH = getenv("PATH");		/* get current path */
 
 	if (*gstr.pMINGW) {
 		checkMingwDir(gstr.pMINGW);
-		if (!*gstr.pOUT) SetRegistryKey(IVL_REGKEY_MINGW, gstr.pMINGW);
-
-	} else if (GetRegistryKey(IVL_REGKEY_MINGW, &gstr.pMINGW)) {
-		checkMingwDir(gstr.pMINGW);
-
-	} else if (SearchPath(NULL, gstr.pCCNAME, ".exe", sizeof(buffer), buffer, NULL)) {
-		return;
-
-	} else {
-		fprintf(stderr, "error: cannot locate the MinGW C compiler - either add its location\n");
-		fprintf(stderr, "       to the PATH environment variable or 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");
-		fprintf(stderr, "       -mingw=c:\\mingw  For a Cygwin shell the option would be\n");
-		fprintf(stderr, "       something like -mingw=c:\\\\mingw\n");
-		myExit(5);
-	}
+		SetRegistryKey(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");
+			fprintf(stderr,"       -mingw=c:\\mingw  For a Cygwin shell the option would be\n");
+			fprintf(stderr,"       something like -mingw=c:\\\\mingw\n");
+			myExit(5);
+		}
 
 	  /* Create new path with MinGW in it */
-	initDynString(&path);
-	assign(&path, "PATH=");
-	append(&path, gstr.pMINGW);
-	appendBackSlash(&path);
-	append(&path, "bin;");
-	append(&path, getenv("PATH"));
+	assign(&gstr.pNewPath,"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(path);
-	deInitDynString(path);
+	_putenv(gstr.pNewPath);
 }
 
-/* find the iverilog root and initialise the compiler options */
+/* see if we can find iverilog root */
 
-static void setup_ivl_environment(void)
+#define IVL_REGKEY_IVL   "InstallDir"
+
+static void setup_ivl_environment()
 {
-	char path[4096];
-	char *ptr;
+	if (*gstr.pIVL) {
+		checkIvlDir(gstr.pIVL);
+		SetRegistryKey(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,"       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);
+		}
 
-	  /* Extract the Icarus Verilog root directory from the path to the
-	     command. The command path will look something like this:
-
-		C:\iverilog\bin\iverilog-vpi.exe
-
-	     The corresponding root directory is
-
-		C:\iverilog
-
-	     so we chop off the file name and the last directory. */
-	GetModuleFileName(NULL, path, sizeof(path));
-	ptr = strrchr(path, '\\');
-	if (!ptr) {
-		fprintf(stderr, "error: couldn't find start of program name in command path '%s'\n", path);
-		myExit(6);
-	}
-	*ptr = 0;
-	ptr = strrchr(path, '\\');
-	if (!ptr) {
-		fprintf(stderr, "error: couldn't find start of bin directory in command path '%s'\n", path);
-		myExit(6);
-	}
-	*ptr = 0;
-	assign(&gstr.pIVL, path);
-
-	  /* Build up the CCFLAGS option string */
-	assign(&gstr.pCCFLAGS, IVERILOG_VPI_CFLAGS " -I\"");
-	append(&gstr.pCCFLAGS, gstr.pIVL);
-	appendBackSlash(&gstr.pCCFLAGS);
-	append(&gstr.pCCFLAGS, "include\\iverilog\"" IVERILOG_SUFFIX);
-
-	  /* Build up the CXFLAGS option string */
-	assign(&gstr.pCXFLAGS, IVERILOG_VPI_CXXFLAGS " -I\"");
-	append(&gstr.pCXFLAGS, gstr.pIVL);
-	appendBackSlash(&gstr.pCXFLAGS);
-	append(&gstr.pCXFLAGS, "include\\iverilog\"" IVERILOG_SUFFIX);
+	  /* Build up the CFLAGS option string */
+	assign(&gstr.pCFLAGS,IVERILOG_VPI_CFLAGS " -I");
+	append(&gstr.pCFLAGS,gstr.pIVL);
+	appendBackSlash(&gstr.pCFLAGS);
+	append(&gstr.pCFLAGS,"\\include\\\\iverilog" IVERILOG_SUFFIX);
 
 	  /* Build up the LDFLAGS option string */
-	assign(&gstr.pLDLIBS, "-L\"");
-	append(&gstr.pLDLIBS, gstr.pIVL);
+	assign(&gstr.pLDLIBS,"-L");
+	append(&gstr.pLDLIBS,gstr.pIVL);
 	appendBackSlash(&gstr.pLDLIBS);
-	append(&gstr.pLDLIBS, "lib\" " IVERILOG_VPI_LDLIBS);
+	append(&gstr.pLDLIBS,"\\lib " IVERILOG_VPI_LDLIBS);
 }
 
 /* compile source modules */
 
-static void compile(char *pSource, char *pFlags, char **pObject, int *compile_errors, char *compiler)
+static void compile(char *pSource, char **pObject, int *compile_errors, char *compiler)
 {
 	char *ptr1 = pSource;
 	char *ptr2 = strchr(ptr1, ' ');
@@ -578,7 +552,7 @@ static void compile(char *pSource, char *pFlags, char **pObject, int *compile_er
 		append(&buf, " ");
 		append(&buf, gstr.pDEFS);
 		append(&buf, " ");
-		append(&buf, pFlags);
+		append(&buf, gstr.pCFLAGS);
 		append(&buf, " ");
 		append(&buf, gstr.pINCS);
 		append(&buf, " ");
@@ -603,22 +577,27 @@ static void compile(char *pSource, char *pFlags, char **pObject, int *compile_er
 
 /* using the global strings, compile and link */
 
-static void compile_and_link(void)
+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 */
+
 //	printf("MinGW root directory:  %s.\n", gstr.pMINGW);
+	checkMingwDir(gstr.pMINGW);
+
+//	printf("Icarus Verilog root directory:  %s.\n", gstr.pIVL);
+	checkIvlDir(gstr.pIVL);
 
 	  /* compile the C source files (*.c) */
-	compile(gstr.pCCSRC, gstr.pCCFLAGS, &gstr.pOBJ, &compile_errors, IVERILOG_VPI_CC );
+	compile(gstr.pCCSRC, &gstr.pOBJ, &compile_errors, IVERILOG_VPI_CC );
 	  /* compile the C++ source files (*.cc, *.cpp) */
-	compile(gstr.pCXSRC, gstr.pCXFLAGS, &gstr.pOBJ, &compile_errors, IVERILOG_VPI_CXX);
+	compile(gstr.pCXSRC, &gstr.pOBJ, &compile_errors, IVERILOG_VPI_CXX);
 
 	if (compile_errors) {
-		fprintf(stderr, "iverilog-vpi: %d file(s) failed to compile.\n",
+		fprintf(stderr,"iverilog-vpi: %d file(s) failed to compile.\n",
 		        compile_errors);
 		myExit(2);
 	}
@@ -649,7 +628,7 @@ int main(int argc, char *argv[])
 {
 	init();
 
-	if (!parse(argc, argv)) usage();
+	if (!parse(argc,argv)) usage();
 
 	setup_mingw_environment();
 	setup_ivl_environment();

driver-vpi/res.rc

@@ -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"

driver/Makefile.in

@@ -12,9 +12,10 @@
 #
 #    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
+
 SHELL = /bin/sh
 
 suffix = @install_suffix@
@@ -37,114 +38,82 @@ 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 = -I. -I.. -I$(srcdir)/.. -I$(srcdir) @CPPFLAGS@ @DEFS@
+CFLAGS = @WARNING_CFLAGS@ @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.ps iverilog.pdf
+	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 --std=posix --std=c99 --std=c++03 -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
 
-# Use pattern rules to avoid parallel build issues (see pr3462585)
-cfparse%c cfparse%h: $(srcdir)/cfparse%y
-	$(YACC) --verbose -t -p cf -d -o 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$(suffix)"'  -DIVL_INC='"@includedir@"' -DIVL_LIB='"@libdir@"' -DDLLIB='"@DLLIB@"' $(DEBUGFLAGS) $(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 = installman
+INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1
 else
 ifeq ($(PS2PDF),none)
-INSTALL_DOC = installman
+INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1
 else
-INSTALL_DOC = installpdf installman
+INSTALL_DOC = $(prefix)/iverilog$(suffix).pdf $(mandir)/man1/iverilog$(suffix).1
 all: iverilog.pdf
 endif
 endif
 INSTALL_DOCDIR = $(mandir)/man1
 else
-INSTALL_DOC = installman
+INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1
 INSTALL_DOCDIR = $(mandir)/man1
 endif
 
-install: all installdirs installfiles
+install: all installdirs $(bindir)/iverilog$(suffix)@EXEEXT@ $(INSTALL_DOC)
 
-F = ./iverilog@EXEEXT@ \
-	$(INSTALL_DOC)
+$(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@: ./iverilog@EXEEXT@
+	$(INSTALL_PROGRAM) ./iverilog@EXEEXT@ $(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@
 
-installman: iverilog.man installdirs
-	$(INSTALL_DATA) iverilog.man "$(DESTDIR)$(mandir)/man1/iverilog$(suffix).1"
+$(DESTDIR)$(mandir)/man1/iverilog$(suffix).1: $(srcdir)/iverilog.man
+	$(INSTALL_DATA) $(srcdir)/iverilog.man $(DESTDIR)$(mandir)/man1/iverilog$(suffix).1
 
-installpdf: iverilog.pdf installdirs
-	$(INSTALL_DATA) iverilog.pdf "$(DESTDIR)$(prefix)/iverilog$(suffix).pdf"
+$(DESTDIR)$(prefix)/iverilog$(suffix).pdf: iverilog.pdf
+	$(INSTALL_DATA) iverilog.pdf $(DESTDIR)$(prefix)/iverilog$(suffix).pdf
 
-installfiles: $(F) | installdirs
-	$(INSTALL_PROGRAM) ./iverilog@EXEEXT@ "$(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@"
-
-installdirs: $(srcdir)/../mkinstalldirs
-	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(INSTALL_DOCDIR)"
+installdirs: ../mkinstalldirs
+	$(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(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 $(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@
+	rm -f $(DESTDIR)$(mandir)/man1/iverilog$(suffix).1
+	rm -f $(DESTDIR)$(prefix)/iverilog$(suffix).pdf

driver/cflexor.lex

@@ -1,10 +1,10 @@
-%option prefix="cf"
+
 %option nounput
 %option noinput
 
 %{
 /*
- * Copyright (c) 2001-2017 Stephen Williams ([email protected])
+ * Copyright (c) 2001-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
@@ -19,50 +19,42 @@
  *
  *    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
  */
 
-# include  "cfparse_misc.h"
 # include  "cfparse.h"
+# include  "cfparse_misc.h"
 # include  "globals.h"
 # include  <string.h>
 
-char *current_file = NULL;
+/*
+ * 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.
+ */
+YYLTYPE yylloc;
 
 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.
- */
-#define MAX_CMDFILE_DEPTH 15
-
-typedef struct t_cmdfile {
-      char *cmdfile;
-      YY_BUFFER_STATE buffer;
-} s_cmdfile;
-s_cmdfile cmdfile_stack[MAX_CMDFILE_DEPTH];
-int cmdfile_stack_ptr = 0;
 
 %}
 
 %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. */
@@ -71,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+]* {
@@ -116,18 +97,13 @@ 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 -l or -v flag. */
-"-l" { return TOK_Dv; }
+  /* Notice the -v flag. */
 "-v" { return TOK_Dv; }
 
   /* Notice the -y flag. */
@@ -136,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 YY_FLEX_MINOR_VERSION > 5 || defined(YY_FLEX_SUBMINOR_VERSION) && YY_FLEX_SUBMINOR_VERSION >= 9
-    yylex_destroy();
-#     endif
-#   endif
-# endif
+      yylloc.first_line = 1;
+      yylloc.text = (char*)path;
 }

driver/cfparse.y

@@ -1,6 +1,6 @@
 %{
 /*
- * Copyright (c) 2001-2014 Stephen Williams ([email protected])
+ * Copyright (c) 2001-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
@@ -15,16 +15,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
  */
 
 # 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 +37,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 +56,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 +79,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 +88,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 +126,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 +141,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 +161,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 +206,5 @@ skip_arg : TOK_PLUSARG
 
 int yyerror(const char*msg)
 {
-	(void)msg; /* Parameter is not used. */
 	return 0;
 }

driver/cfparse_misc.h

@@ -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-2010 Picture Elements, Inc.
  *    Stephen Williams (steve@picturel.com)
  *
  *    This source code is free software; you can redistribute it
@@ -17,7 +17,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
  */
 
 /*
@@ -33,12 +33,10 @@ 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);
-extern char *current_file;
 
-#endif /* IVL_cfparse_misc_H */
+#endif

driver/globals.h

@@ -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-2010 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,41 @@
  *
  *    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
  */
 
 # 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;
+  /* This is the optional -M<dependfile> value, if one was supplied. */
+extern const char*depfile;
+
+  /* This 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 +63,13 @@ 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;
+
+#endif

driver/iverilog.man

@@ -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 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 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

driver/iverilog.man.in

@@ -1,639 +0,0 @@
-.TH iverilog 1 "Aug 10th, 2020" "" "Version %M.%n%E"
-.SH NAME
-iverilog - Icarus Verilog compiler
-
-.SH SYNOPSIS
-.B iverilog
-[\-EiSuVv] [\-Bpath] [\-ccmdfile|\-fcmdfile] [\-Dmacro[=defn]]
-[\-Pparameter=value] [\-pflag=value] [\-dname]
-[\-g1995\:|\-g2001\:|\-g2005\:|\-g2005-sv\:|\-g2009\:|\-g2012\:|\-g<feature>]
-[\-Iincludedir] [\-Lmoduledir] [\-mmodule] [\-M[mode=]file] [\-Nfile]
-[\-ooutputfilename] [\-stopmodule] [\-ttype] [\-Tmin/typ/max] [\-Wclass]
-[\-ypath] [\-lfile]
-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 specify 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 -gassertions\fI|\fP-gsupported-assertions\fI|\fP-gno-assertions
-Enable (default) or disable SystemVerilog assertions. When enabled,
-assertion statements are elaborated. When disabled, assertion statements
-are parsed but ignored. The \fB\-gsupported-assertions\fP option only
-enables assertions that are currently supported by the compiler.
-.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 \fB\-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 -gshared-loop-index\fI|\fP-gno-shared-loop-index
-Enable (default) or disable the exclusion of for-loop control variables
-from implicit event_expression lists. When enabled, if a for-loop control
-variable (loop index) is only used inside the for-loop statement, the
-compiler will not include it in an implicit event_expression list it
-calculates for that statement or any enclosing statement. This allows
-the same control variable to be used in multiple processes without risk
-of entering an infinite loop caused by each process triggering all other
-processes that use the same varaible. For strict compliance with the
-standards, this behaviour should be disabled.
-.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 -i
-Ignore missing modules. Normally it is an error if a module instantiation
-refers to an undefined module. This option causes the compiler to skip
-over that instantiation. It will also stop the compiler returning an
-error if there are no top level modules. This allows the compiler to be
-used to check incomplete designs for errors.
-.TP 8
-.B -L\fIpath\fP
-This flag adds a directory to the path list used to locate VPI
-modules. The default path includes only the install directory for the
-system.vpi module, but this flag can add other directories. Multiple
-paths are allowed, and the paths will be searched in order.
-.TP 8
-.B -l\fIfile\fP
-Add the specified file to the list of source files to be compiled,
-but mark it as a library file. All modules contained within that
-file will be treated as library modules, and only elaborated if
-they are instantiated by other modules in the design.
-.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
-(and loaded last).
-
-If the specified name includes at least one directory character, it is
-assumed to be prefixed by the path to the module, otherwise the module
-is searched for in the paths specified by preceding \fB-L\fP options,
-and if not found there, in the \fIiverilog\fP base directory.
-.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 -u
-Treat each source file as a separate compilation unit (as defined in
-SystemVerilog). If compiling for an \fIIEEE1364\fP generation, this
-will just reset all compiler directives (including macro definitions)
-before each new file is processed.
-.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.
-
-If the selected target is \fIvvp\fP, the \fB\-v\fP switch is appended
-to the shebang line in the compiler output file, so directly executing
-the compiler output file will turn on verbose messages in \fIvvp\fP.
-This extra verbosity can be avoided by using the \fIvvp\fP command to
-indirectly execute the compiler output file.
-.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, then 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. These opcodes are also used to generate file and
-line information for procedural warning/error messages. To enable
-the debug command tracing us the trace command (trace on) from
-the vvp interactive prompt.
-.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 anachronisms, implicit, macro-replacement, portbind,
-select\-range, timescale, and sensitivity\-entire\-array warning
-categories.
-
-.TP 8
-.B anachronisms
-This enables warnings for use of features that have been deprecated
-or removed in the selected generation of the Verilog language.
-
-.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 macro-redefinition\fI | \fPmacro-replacement
-This enables preprocessor warnings when a macro is being redefined.
-The first variant prints a warning any time a macro is redefined.
-The second variant only prints a warning if the macro text changes.
-Use \fBno-macro-redefinition\fP to turn off all warnings of this type.
-
-.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 "VPI MODULES"
-If the source file name has a \fB.vpi\fP or \fB.vpl\fP suffix, then it
-is taken to be a VPI module. VPI modules supplied by the user are scanned
-to determine the return types of any system functions they provide. This
-is necessary because the compiler needs this information to elaborate
-expressions that contain these system functions. The module path/name is
-passed on to the target to allow the VPI module to be automatically loaded
-at the start of simulation.
-
-VPI modules may also be supplied using the \fB-L\fP and \fB-m\fP options.
-
-.SH "SYSTEM FUNCTION TABLE FILES [deprecated]"
-If the source file name has a \fB.sft\fP suffix, then it is taken to be a
-system function table file. A system function table file is the old method
-used to describe to the compiler the return types for system functions.
-Users are encouraged to switch to the new method of simply supplying the
-VPI module.
-
-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.
-
-.TP 8
-.B vpiSysFuncString
-The function returns a string. This is an Icarus-specific extension, not
-available in the VPI standard.
-
-.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 -l\ \fIfile\fP -v\ \fIfile\fP
-A \fB\-l\fP token prefixes a library file in the command file,
-exactly like it does on the command line. The parameter to the \fB\-l\fP
-flag may be on the same line or the next non-comment line. \fB\-v\fP is
-an alias for \fB\-l\fP, provided for compatibility with other simulators.
-
-Variables in the \fIfile\fP are substituted.
-
-.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 lists 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 ENVIRONMENT
-.PP
-\fIiverilog\fP also accepts some environment variables that control
-its behavior. These can be used to make semi-permanent changes.
-
-.TP 8
-.B IVERILOG_ICONFIG=\fIfile-name\fP
-This sets the name used for the temporary file that passes parameters
-to the compiler proper, and prevents that file being deleted after the
-compiler has exited.
-
-.TP 8
-.B IVERILOG_VPI_MODULE_PATH=\fI/some/path:/some/other/path\fP
-This adds additional components to the VPI module search path. Paths
-specified in this way are searched after paths specified with \fB-L\fP,
-but before the default search path. Multiple paths can be separated with
-colons (semicolons if using Windows).
-
-.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://iverilog.icarus.com/>"
-
-Tips on using, debugging, and developing the compiler can be found at
-.BR "<http://iverilog.wikia.com/>"
-
-.SH COPYRIGHT
-.nf
-Copyright \(co  2002\-2020 Stephen Williams
-
-This document can be freely redistributed according to the terms of the
-GNU General Public License version 2.0

driver/substit.c

@@ -14,14 +14,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
  */
 
 # 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 +32,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 +48,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;

dup_expr.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2019 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1999-2010 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,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
  */
 
 # 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());
+      result->set_line(*this);
+      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 +40,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 +47,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(), is_overridden_);
-      ivl_assert(*this, tmp);
+      NetESFunc*tmp = new NetESFunc(name_, type_, expr_width(), nparms());
+      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 +96,47 @@ 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);
+      assert(tmp);
       tmp->set_line(*this);
       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;
 }

elab_anet.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2003 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2000-2010 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,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
  */
 
 # include "config.h"
@@ -86,13 +86,10 @@ NetNet* PEConcat::elaborate_anet(Design*des, NetScope*scope) const
 
       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 +106,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) {
@@ -163,4 +161,3 @@ NetNet* PEIdent::elaborate_anet(Design*des, NetScope*scope) const
 
       return sig;
 }
-

elab_pexpr.cc

@@ -0,0 +1,227 @@
+/*
+ * Copyright (c) 2000-2010 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
+ */
+
+# 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;
+      }
+
+      NetExpr*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;
+}

elab_type.cc

@@ -1,276 +0,0 @@
-/*
- * Copyright (c) 2012-2020 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  "PExpr.h"
-# include  "pform_types.h"
-# include  "netlist.h"
-# include  "netclass.h"
-# include  "netdarray.h"
-# include  "netenum.h"
-# include  "netqueue.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;
-
-/*
- * Some types have a list of ranges that need to be elaborated. This
- * function elaborates the ranges referenced by "dims" into the vector
- * "ranges".
- */
-static void elaborate_array_ranges(Design*des, NetScope*scope,
-				   vector<netrange_t>&ranges,
-				   const list<pform_range_t>*dims)
-{
-      if (dims == 0)
-	    return;
-
-      for (list<pform_range_t>::const_iterator cur = dims->begin()
-		 ; cur != dims->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;
-	    }
-
-	    ranges.push_back(netrange_t(mnum, lnum));
-      }
-}
-
-/*
- * 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)
-{
-	// User-defined types must be elaborated in the context
-	// where they were defined.
-      if (!name.nil())
-	    scope = scope->find_typedef_scope(des, this);
-
-      ivl_assert(*this, scope);
-      Definitions*use_definitions = scope;
-
-      map<Definitions*,ivl_type_s*>::iterator pos = cache_type_elaborate_.lower_bound(use_definitions);
-	  if (pos != cache_type_elaborate_.end() && 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*, NetScope*scope) const
-{
-      ivl_assert(*this, scope);
-      ivl_type_s*tmp = scope->enumeration_for_key(this);
-      if (tmp == 0 && scope->unit()) {
-	    tmp = scope->unit()->enumeration_for_key(this);
-}
-      return tmp;
-}
-
-ivl_type_s* vector_type_t::elaborate_type_raw(Design*des, NetScope*scope) const
-{
-      vector<netrange_t> packed;
-      elaborate_array_ranges(des, scope, packed, pdims.get());
-
-      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*scope) const
-{
-      vector<netrange_t>packed;
-      elaborate_array_ranges(des, scope, packed, dims.get());
-
-      ivl_type_t etype = base_type->elaborate_type(des, scope);
-
-      return new netparray_t(packed, etype);
-}
-
-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 cur_name = curp->names->begin()
-		       ; cur_name != curp->names->end() ;  ++ cur_name) {
-		  decl_assignment_t*namep = *cur_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;
-      }
-
-	// Special case: if the dimension is null:nil. this is a queue.
-      if (dynamic_cast<PENull*>(cur->first)) {
-	    cerr << get_fileline() << ": sorry: "
-		 << "SV queues inside classes are not yet supported." << endl;
-	    des->errors += 1;
-
-	      // FIXME: Need to set the max size if cur->second is defined
-	    ivl_type_s*res = new netqueue_t(btype, -1);
-	    return res;
-      }
-
-      vector<netrange_t> dimensions;
-      bool dimensions_ok = evaluate_ranges(des, scope, this, dimensions, *dims);
-
-      if (!dimensions_ok) {
-	    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;
-}

elaborate_analog.cc

@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2008-2012 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  "netlist.h"
-# include  "netmisc.h"
-# include  "util.h"
-
-# include  <typeinfo>
-
-NetProc* AContrib::elaborate(Design*des, NetScope*scope) const
-{
-      NetExpr*lval = elab_and_eval(des, scope, lval_, -1);
-      NetExpr*rval = elab_and_eval(des, scope, rval_, -1);
-
-      NetEAccess*lacc = dynamic_cast<NetEAccess*> (lval);
-      if (lacc == 0) {
-	    cerr << get_fileline() << ": error: The l-value of a contribution"
-		 << " statement must be a branch probe access function." << endl;
-	    des->errors += 1;
-	    return 0;
-      }
-
-      NetContribution*st = new NetContribution(lacc, rval);
-      st->set_line(*this);
-      return st;
-}
-
-bool AProcess::elaborate(Design*des, NetScope*scope) const
-{
-      NetProc*estatement = statement_->elaborate(des, scope);
-      if (estatement == 0)
-	    return false;
-
-      NetAnalogTop*top = new NetAnalogTop(scope, type_, estatement);
-
-	// Evaluate the attributes for this process, if there
-	// are any. These attributes are to be attached to the
-	// NetProcTop object.
-      struct attrib_list_t*attrib_list;
-      unsigned attrib_list_n = 0;
-      attrib_list = evaluate_attributes(attributes, attrib_list_n, des, scope);
-
-      for (unsigned adx = 0 ;  adx < attrib_list_n ;  adx += 1)
-	    top->attribute(attrib_list[adx].key,
-			   attrib_list[adx].val);
-
-      delete[]attrib_list;
-
-      top->set_line(*this);
-      des->add_process(top);
-
-      return true;
-}