update to covered-0.4.7.

    * 08/30/2006

Stable release covered-0.4.7 made.  This release is mostly a bug fix release with two feature
additions.  The new feature is the global -B option was performs name obfuscation on all identifying,
design-sensitive names from all output (with the exception of CDD file output).  This option is
mostly useful as a way to share debugging information with the maintainer(s) of Covered without giving
away sensitive information.  Additionally, the -rI score option was added to allow user's to completely
skip the race condition checking phase.  This allows users to force Covered to consider all code for
coverage (if race condition checking is performed, all code considered to be potential race conditions
are automatically excluded from coverage consideration).  User documentation has been updated for these
changes.  The following lists the changes in this release.

  - Fixed bug 1535412.  Implicit event expressions (i.e., "always @*") now traverse named begin/end
    blocks correctly to search for RHS variables.
  - Fixed bugs related to segmentation faults and memory leak issues
  - Fixed hierarchical reference search to match Verilog-1995 LRM
  - Fixed bug 1538922.  If -vcd or -lxt option was specified twice, an incorrect error message was
    displayed to the user.
  - Added -rI option to allow user's to bypass the race condition checking step in the score command.
  - Fixed bug 1538920.  Handling of any-edge triggered events (i.e., "@(b)") was incorrectly handled
    by Covered.  Additionally, fixed the event trigger operator (->) to work correctly with the new
    changes.
  - Fixed bug 1541944.  Command options that require a value are now checked to make sure that a value
    exists, and an appropriate error message is output if this is not achieved.
  - Fixed bug 1542454.  Command options that must only be allowed once on a command-line are now
    checked and handled appropriately (caused a segmentation fault previously).
  - Fixed bug 1544322.  When an AND- or OR-type expression has either a left or right expression evaluate
    to 0 or 1, respectively, Covered now outputs correct coverage information when the opposite expression
    evaluates to an X or Z value, simultaneously.
  - Fixed bug 1544325.  Multi-variable expressions are now always output as such in report files.
  - Fixed bug 1544169.  Avoiding consideration of named begin/end block keywords in line coverage.
  - Fixed bug 1546059.  Covered now properly handles the removal of statement blocks that cannot be
    considered for coverage which also contain parameters from another functional unit block.
  - Fixed bug with connection of statements in a statement block.
  - Updated documentation to match new features added in this release.

    * 07/22/2006

Stable release covered-0.4.6 made.  This release contains several bug fixes that are listed below.

  - Fixed segmentation fault bug which occurs when a multi-bit select on the LHS contains any
    expression besides static values.
  - Fixed several memory leaks found with valgrind
  - Fixed bug 1520159 - arrays of instances incorrectly always started at index 0.
  - Fixed bug 1521598 having to do with reduction unary invert and logical not operators not
    calculating correctly.
  - Fixed bug in db_read when a functional unit is being merged to point to the used module.
  - Fixed assertion in link.c such that no segmentation fault occurs if a string is not found
    in a str_link list for deletion.
  - Fixed bug pertaining to embedded concatenations within function/task parameter lists.
  - Fixed bug pertaining to empty named begin-end blocks.
  - Fixed bug in the db_read function that would cause Covered to flag an internal assertion
    error if an error occurred while reading the CDD file and the global -D option was specified.
  - Fixed upwards name referencing bug (1524705).
  - Enhanced regression suite to verify that all of these bugs are properly fixed.

    * 07/08/2006

Stable release covered-0.4.5 made.  This release contains a bug fix to properly handle cases
where two or more signals are declared with a parameter in their range field (i.e., reg [FOO:0] a, b;)
This caused Covered to segfault due to attempting to free the same address twice.  Bug 1518932.
Also contains a bug fix to properly remove statement blocks that contain case, casex or casez
expressions and unbindable expressions.

    * 5/28/2006

Stable release covered-0.4.4 made.  This release contains a bug fix to proper handle hierarchical
referencing of parameter values.  This feature was technically not supported in the past but caused
an internal assertion error when this was performed.  The feature is now fully supported.

    * 4/21/2006

Stable release covered-0.4.3 made.  This release contains a bug fix to the statement connection function that
caused segmentation faults during the score command.  Also added support for big endian wires/regs.  This
information was being ignored by the parser and, consequently, was not being handled correctly by Covered's
internal simulator, leading to incorrect coverage information.  The lack of this support was also causing
an internal error in the memory allocation routine when scoring the dumpfile.

    * 4/17/2006

Stable release covered-0.4.2 made.  This release contains a bug fix that caused an assertion error in the
binding.c source file to occur.  The reason for this assertion was a syntax error in the parser that caused
problems when more than one task call was made in a statement block.  Also added support for multi-line
definitions (i.e., a '\' character used at the end of a definition line).  This was missing but was not meant
to be missing.

    * 4/4/2006

Stable release covered-0.4.1 made.  This release contains one bug fix that causes an assertion error when
compiling designs that use a concatenation operation on the left-hand-side of assignment statements.  If
you are experiencing this problem with the 0.4 release, it is recommended that you use this new release
instead.

    * 3/29/2006

Stable release covered-0.4 made.  In addition to all of the features, optimizations and bug fixes
that have gone into the development releases from the 0.3 stable release, the following features, updates
and bug fixes have been added.

  - Fixed bug with a statement connection issue that causes lines of code to be not considered for
    coverage that should have been.
  - Fixed bug in report command where combinational expressions were not being output to match the original
    Verilog code.
  - Added CDD file viewer window to GUI to allow the user to see which CDD files are currently loaded/merged.
  - Fixed bug in combinational logic verbose viewer which caused the window to resize dependent upon
    the location of the cursor (this was an annoyance)
  - Changed the output of simple combinational logic to change to unary combinational logic output if either
    the left or the right expression was a constant value (eliminates unachievable combinational logic cases
    from being output leading to more accurate coverage results).
  - Removed combinational expressions that contain only constant values from being considered for coverage.
  - Updated simple combinational logic output in reports to be as concise as possible for AND and OR type
    expressions.
  - Removed duplication of information in CDD files for race conditions.
  - Fixed bug in GUI dealing with showing race conditions
  - Fixing bug in GUI pertaining to the next/previous buttons in the combinational logic detail viewer.  Previously,
    clicking on one of these buttons would only advance you to the next uncovered line.  Now it will advance
    you to the next uncovered statement.
  - Updated development, user and GUI documentation to reflect the above changes and to bring them up-to-date
    with the rest of the tool.

Please see the ChangeLog file for all changes made from the 0.3 stable release to the 0.4 stable release.
Lots of enhancements, features, optimizations, bug fixes, performance improvements and documentation improvements
are contained in this stable release, making it very worth while for any Covered users to get their hands on
it.

19 files changed, 107 insertions, 567 deletions

diff --git a/cad/covered/Makefile b/cad/covered/Makefile
index 4f6b271c430..f999dda3504 100644
--- a/cad/covered/Makefile
+++ b/cad/covered/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:08:20 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/10/12 03:11:18 dmcmahill Exp $
 #
 
-DISTNAME=	covered-0.3
-PKGREVISION=	1
+DISTNAME=	covered-0.4.7
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=covered/}
 
@@ -12,23 +11,22 @@ COMMENT=	Verilog code coverage analyzer (stable release version)
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 DEPENDS+=	verilog{,-current}-[0-9]*:../../cad/verilog
 
 CONFLICTS+=	covered-current-[0-9]*
 
-REPLACE_PERL=	diags/verilog/check_test
 GNU_CONFIGURE=	YES
-USE_TOOLS+=	gmake perl:run
-TEST_DIRS=	${WRKSRC}/diags/regress
-TEST_TARGET=	iverilog
+USE_TOOLS+=	bison gmake
 
-post-patch:
-	${CHMOD} 755 ${WRKSRC}/missing
-
-pre-install:
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
-	${INSTALL_MAN_DIR} ${PREFIX}/man/man1
+# we use this hack of setting a cache variable because
+# the configure script uses AC_PATH_PROG to try and find
+# the *Config.sh scripts but these are not installed with
+# the execute bit set.
+CONFIGURE_ENV+=	r_cv_path_TCL_CONFIG=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
+CONFIGURE_ENV+=	r_cv_path_TK_CONFIG=${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
 
 .include "../../devel/gperf/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/covered/PLIST b/cad/covered/PLIST
index 0d7fdaee7cd..acc53ca0718 100644
--- a/cad/covered/PLIST
+++ b/cad/covered/PLIST
@@ -1,3 +1,93 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/08/24 18:38:06 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/10/12 03:11:18 dmcmahill Exp $
 bin/covered
 man/man1/covered.1
+share/covered/.coveredrc
+share/covered/doc/gui/comb.html
+share/covered/doc/gui/cov_bar.html
+share/covered/doc/gui/cov_view.html
+share/covered/doc/gui/file_menu.html
+share/covered/doc/gui/help_menu.html
+share/covered/doc/gui/images/banner.gif
+share/covered/doc/gui/images/color.png
+share/covered/doc/gui/images/comb_complex.png
+share/covered/doc/gui/images/comb_event.png
+share/covered/doc/gui/images/comb_simple.png
+share/covered/doc/gui/images/comb_simple_and.png
+share/covered/doc/gui/images/comb_simple_or.png
+share/covered/doc/gui/images/comb_unary.png
+share/covered/doc/gui/images/dn_button.png
+share/covered/doc/gui/images/file_menu.png
+share/covered/doc/gui/images/help_menu.png
+share/covered/doc/gui/images/main_cov.png
+share/covered/doc/gui/images/main_info.png
+share/covered/doc/gui/images/main_lb.png
+share/covered/doc/gui/images/main_menu.png
+share/covered/doc/gui/images/main_summary.png
+share/covered/doc/gui/images/main_viewer.png
+share/covered/doc/gui/images/main_window.png
+share/covered/doc/gui/images/open_cdd.png
+share/covered/doc/gui/images/populated_lb.png
+share/covered/doc/gui/images/pref_window.png
+share/covered/doc/gui/images/report_menu.png
+share/covered/doc/gui/images/summary_window.png
+share/covered/doc/gui/images/toggle_full.png
+share/covered/doc/gui/images/up_button.png
+share/covered/doc/gui/images/view_menu.png
+share/covered/doc/gui/info_bar.html
+share/covered/doc/gui/intro.html
+share/covered/doc/gui/line.html
+share/covered/doc/gui/main.html
+share/covered/doc/gui/main_menu.html
+share/covered/doc/gui/mod_inst_lb.html
+share/covered/doc/gui/preferences.html
+share/covered/doc/gui/report_menu.html
+share/covered/doc/gui/summary.html
+share/covered/doc/gui/summary_bar.html
+share/covered/doc/gui/toggle.html
+share/covered/doc/gui/view_menu.html
+share/covered/doc/gui/welcome.html
+share/covered/doc/user/001.html
+share/covered/doc/user/002.html
+share/covered/doc/user/003.html
+share/covered/doc/user/004.html
+share/covered/doc/user/005.html
+share/covered/doc/user/006.html
+share/covered/doc/user/007.html
+share/covered/doc/user/008.html
+share/covered/doc/user/009.html
+share/covered/doc/user/010.html
+share/covered/doc/user/011.html
+share/covered/doc/user/012.html
+share/covered/doc/user/013.html
+share/covered/doc/user/014.html
+share/covered/doc/user/015.html
+share/covered/doc/user/016.html
+share/covered/doc/user/017.html
+share/covered/doc/user/018.html
+share/covered/doc/user/019.html
+share/covered/doc/user/020.html
+share/covered/doc/user/021.html
+share/covered/doc/user/022.html
+share/covered/doc/user/banner.gif
+share/covered/doc/user/example.rptI.html
+share/covered/doc/user/example.rptM.html
+share/covered/doc/user/example.v.html
+share/covered/doc/user/index.html
+share/covered/doc/user/styles.css
+share/covered/scripts/banner.gif
+share/covered/scripts/cdd_view.tcl
+share/covered/scripts/comb.tcl
+share/covered/scripts/cov_create.tcl
+share/covered/scripts/help.tcl
+share/covered/scripts/main_view.tcl
+share/covered/scripts/menu_create.tcl
+share/covered/scripts/preferences.tcl
+share/covered/scripts/process_file.tcl
+share/covered/scripts/summary.tcl
+share/covered/scripts/toggle.tcl
+@dirrm share/covered/scripts
+@dirrm share/covered/doc/user
+@dirrm share/covered/doc/gui/images
+@dirrm share/covered/doc/gui
+@dirrm share/covered/doc
+@dirrm share/covered
diff --git a/cad/covered/distinfo b/cad/covered/distinfo
index 5cce57cdf45..3ca1c0baede 100644
--- a/cad/covered/distinfo
+++ b/cad/covered/distinfo
@@ -1,21 +1,5 @@
-$NetBSD: distinfo,v 1.9 2006/08/31 17:26:42 rillig Exp $
+$NetBSD: distinfo,v 1.10 2006/10/12 03:11:18 dmcmahill Exp $
 
-SHA1 (covered-0.3.tar.gz) = 10c9231dd4cb2bf8cc28403d28b654c958b3b24e
-RMD160 (covered-0.3.tar.gz) = a9a0e82ca790a82934d3e07cf16fb401c09f8f7f
-Size (covered-0.3.tar.gz) = 758152 bytes
-SHA1 (patch-aa) = 77c21638506a2a20bf1003994a71fb4d27eee118
-SHA1 (patch-ab) = 5cb1af8100cb78bfef1cda3bde9ea6f1b0756878
-SHA1 (patch-ac) = b934c13b174cb7adb80b5f90a440e0644f6d11c6
-SHA1 (patch-ad) = de075fa6bc90ae4a06ee1353b7d0b2cd5a3e5dae
-SHA1 (patch-ae) = 432911dccba1ae8158900f7456ad16851a369a37
-SHA1 (patch-af) = 63b86f7d21e121df6d318fc9e2e629f2a4eee940
-SHA1 (patch-ag) = 1d6cc251fa25d725791a60cbcfdf0f7ecaaf81d0
-SHA1 (patch-ah) = c3a8c2f6de25619f93e66f2fc5d26a92c17e58d4
-SHA1 (patch-ai) = 7bec529bd6a4fbc2ce09c9b1961b24ff79d3a661
-SHA1 (patch-aj) = 3e390b1c4ab2411500fd1769e48da3a97cdc7077
-SHA1 (patch-ak) = b2e2e56cd67cb4fb92bba697ec1584628bf62862
-SHA1 (patch-al) = 3d1a8610d4ff21c7a33094f99752c86658656a4d
-SHA1 (patch-am) = 84d78caa1aa5500f2281f0958f6af17ef03bc112
-SHA1 (patch-an) = 53ebebce8e20f66a1f31d70187cfa210dd91d223
-SHA1 (patch-ao) = e29d5413cabb01c52af75b52fda204a45e5459fd
-SHA1 (patch-ap) = 5dda0a364742514784d14893c4ce0d82388d3524
+SHA1 (covered-0.4.7.tar.gz) = 9dd9da4d739db15e5e2ea36f2767136a825a4728
+RMD160 (covered-0.4.7.tar.gz) = 63720610a24e6e71b9622586d561e3eb92a606f5
+Size (covered-0.4.7.tar.gz) = 1077912 bytes
diff --git a/cad/covered/patches/patch-aa b/cad/covered/patches/patch-aa
deleted file mode 100644
index de35ae2ce22..00000000000
--- a/cad/covered/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/08/22 17:00:24 joerg Exp $
-
---- doc/Makefile.orig	2003-08-17 03:13:41.000000000 +0000
-+++ doc/Makefile
-@@ -1,13 +1,12 @@
- all:
--	- doxygen covered.dox
--	- cd ./user; make all
-+	- cd ./user; ${MAKE} all
- 
- install:
--	- cd ./user; make install
-+	- cd ./user; ${MAKE} install
- 
- uninstall:
--	- cd ./user; make uninstall
-+	- cd ./user; ${MAKE} uninstall
- 
- clean:
- 	rm -rf ./devel/html ./devel/latex
--	- cd ./user; make clean
-+	- cd ./user; ${MAKE} clean
diff --git a/cad/covered/patches/patch-ab b/cad/covered/patches/patch-ab
deleted file mode 100644
index 72d2a598439..00000000000
--- a/cad/covered/patches/patch-ab
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/08/22 17:00:24 joerg Exp $
-
---- src/parser.y.orig	2004-03-16 05:45:43.000000000 +0000
-+++ src/parser.y
-@@ -61,12 +61,26 @@ int yydebug = 1; 
-    YYLLOC_DEFAULT macro that makes up a yylloc value from existing
-    values. I need to supply an explicit version to account for the
-    text field, that otherwise won't be copied. */
--# define YYLLOC_DEFAULT(Current, Rhs, N)         \
--  Current.first_line   = Rhs[1].first_line;      \
--  Current.first_column = Rhs[1].first_column;    \
--  Current.last_line    = Rhs[N].last_line;       \
--  Current.last_column  = Rhs[N].last_column;     \
--  Current.text         = Rhs[1].text;
-+
-+# define YYLLOC_DEFAULT(Current, Rhs, N)                                \
-+    do                                                                  \
-+      if (N)                                                            \
-+        {                                                               \
-+          (Current).first_line   = YYRHSLOC(Rhs, 1).first_line;         \
-+          (Current).first_column = YYRHSLOC(Rhs, 1).first_column;       \
-+          (Current).last_line    = YYRHSLOC(Rhs, N).last_line;          \
-+          (Current).last_column  = YYRHSLOC(Rhs, N).last_column;        \
-+          (Current).text         = YYRHSLOC(Rhs, 1).text;               \
-+        }                                                               \
-+      else                                                              \
-+        {                                                               \
-+          (Current).first_line   = (Current).last_line   =              \
-+            YYRHSLOC(Rhs, 0).last_line;                                 \
-+          (Current).first_column = (Current).last_column =              \
-+            YYRHSLOC(Rhs, 0).last_column;                               \
-+          (Current).text         = YYRHSLOC(Rhs, 0).text;               \
-+        }                                                               \
-+    while (0)
- 
- %}
- 
-@@ -75,7 +89,7 @@ int yydebug = 1; 
-   int	          integer;
-   vector*         number;
-   double          realtime;
--  signal*         sig;
-+  signal_s*         sig;
-   expression*     expr;
-   statement*      state;
-   static_expr*    statexp;
-@@ -3025,7 +3039,7 @@ dr_strength1
- event_control
-   : '@' IDENTIFIER
-     {
--      signal*     sig;
-+      signal_s*     sig;
-       expression* tmp;
-       if( ignore_mode == 0 ) {
-         sig = db_find_signal( $2 );
diff --git a/cad/covered/patches/patch-ac b/cad/covered/patches/patch-ac
deleted file mode 100644
index 8a4be8932ec..00000000000
--- a/cad/covered/patches/patch-ac
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/08/22 17:00:24 joerg Exp $
-
---- src/defines.h.orig	2006-08-22 18:38:23.000000000 +0000
-+++ src/defines.h
-@@ -1061,7 +1061,7 @@ typedef struct expression_s expression;
- /*!
-  Renaming signal structure for convenience.
- */
--typedef struct signal_s     signal;
-+typedef struct signal_s     signal_s;
- 
- /*!
-  Renaming FSM structure for convenience.
-@@ -1074,7 +1074,7 @@ struct expression_s {
-   int         id;          /*!< Specifies unique ID for this expression in the parent          */
-   int         ulid;        /*!< Specifies underline ID for reporting purposes                  */
-   int         line;        /*!< Specified line in file that this expression is found on        */
--  signal*     sig;         /*!< Pointer to signal.  If NULL then no signal is attached         */
-+  signal_s*   sig;         /*!< Pointer to signal.  If NULL then no signal is attached         */
-   expr_stmt*  parent;      /*!< Parent expression/statement                                    */
-   expression* right;       /*!< Pointer to expression on right                                 */
-   expression* left;        /*!< Pointer to expression on left                                  */
-@@ -1205,7 +1205,7 @@ struct signal_s {
- 
- /*------------------------------------------------------------------------------*/
- struct sig_link_s {
--  signal*   sig;   /*!< Pointer to signal in list                   */
-+  signal_s* sig;   /*!< Pointer to signal in list                   */
-   sig_link* next;  /*!< Pointer to next signal link element in list */
- };
- 
-@@ -1252,7 +1252,7 @@ struct mod_parm_s {
-   unsigned int suppl;    /*!< Supplemental field containing type and order number */
-   exp_link*    exp_head; /*!< Pointer to head of expression list for dependents   */
-   exp_link*    exp_tail; /*!< Pointer to tail of expression list for dependents   */
--  signal*      sig;      /*!< Pointer to associated signal (if one is available)  */
-+  signal_s*    sig;      /*!< Pointer to associated signal (if one is available)  */
-   mod_parm*    next;     /*!< Pointer to next module parameter in list            */
- };
- 
-@@ -1370,7 +1370,7 @@ struct sym_sig_s;
- typedef struct sym_sig_s sym_sig;
- 
- struct sym_sig_s {
--  signal*  sig;   /*!< Pointer to signal that this symtable entry refers to */
-+  signal_s*sig;   /*!< Pointer to signal that this symtable entry refers to */
-   int      msb;   /*!< Most significant bit of value to set                 */
-   int      lsb;   /*!< Least significant bit of value to set                */
-   sym_sig* next;  /*!< Pointer to next sym_sig link in list                 */
-@@ -1536,7 +1536,7 @@ struct fsm_var_s {
-   char*       name;   /*!< Name associated with this FSM variable     */
-   expression* ivar;   /*!< Pointer to input state expression          */
-   expression* ovar;   /*!< Pointer to output state expression         */
--  signal*     iexp;   /*!< Pointer to input signal matching ovar name */
-+  signal_s*   iexp;   /*!< Pointer to input signal matching ovar name */
-   fsm*        table;  /*!< Pointer to FSM containing signal from ovar */
-   fsm_var*    next;   /*!< Pointer to next fsm_var element in list    */
- };
diff --git a/cad/covered/patches/patch-ad b/cad/covered/patches/patch-ad
deleted file mode 100644
index dbbc29122ef..00000000000
--- a/cad/covered/patches/patch-ad
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/08/22 17:00:24 joerg Exp $
-
---- src/signal.h.orig	2006-08-22 18:42:16.000000000 +0000
-+++ src/signal.h
-@@ -14,40 +14,40 @@
- 
- 
- /*! \brief Initializes specified signal with specified values. */
--void signal_init( signal* sig, char* name, vector* value, int lsb );
-+void signal_init( signal_s* sig, char* name, vector* value, int lsb );
- 
- /*! \brief Creates a new signal based on the information passed to this function. */
--signal* signal_create( char* name, int width, int lsb );
-+signal_s* signal_create( char* name, int width, int lsb );
- 
- /*! \brief Outputs this signal information to specified file. */
--void signal_db_write( signal* sig, FILE* file );
-+void signal_db_write( signal_s* sig, FILE* file );
- 
- /*! \brief Reads signal information from specified file. */
- bool signal_db_read( char** line, module* curr_mod );
- 
- /*! \brief Reads and merges two signals, placing result into base signal. */
--bool signal_db_merge( signal* base, char** line, bool same );
-+bool signal_db_merge( signal_s* base, char** line, bool same );
- 
- /*! \brief Sets value of currently waiting bit of signal to specified value. */
--void signal_set_wait_bit( signal* sig, int val );
-+void signal_set_wait_bit( signal_s* sig, int val );
- 
- /*! \brief Gets value of currently waiting bit of signal. */
--int signal_get_wait_bit( signal* sig );
-+int signal_get_wait_bit( signal_s* sig );
- 
- /*! \brief Assigns specified VCD value to specified signal. */
--void signal_vcd_assign( signal* sig, char* value, int msb, int lsb );
-+void signal_vcd_assign( signal_s* sig, char* value, int msb, int lsb );
- 
- /*! \brief Adds an expression to the signal list. */
--void signal_add_expression( signal* sig, expression* expr );
-+void signal_add_expression( signal_s* sig, expression* expr );
- 
- /*! \brief Displays signal contents to standard output. */
--void signal_display( signal* sig );
-+void signal_display( signal_s* sig );
- 
- /*! \brief Converts a string to a signal. */
--signal* signal_from_string( char** str );
-+signal_s* signal_from_string( char** str );
- 
- /*! \brief Deallocates the memory used for this signal. */
--void signal_dealloc( signal* sig );
-+void signal_dealloc( signal_s* sig );
- 
- 
- /*
diff --git a/cad/covered/patches/patch-ae b/cad/covered/patches/patch-ae
deleted file mode 100644
index 4fdbbd79cc8..00000000000
--- a/cad/covered/patches/patch-ae
+++ /dev/null
@@ -1,121 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2006/08/31 17:26:42 rillig Exp $
-
---- src/signal.c.orig	2004-03-16 06:45:43.000000000 +0100
-+++ src/signal.c	2006-08-31 19:22:06.000000000 +0200
-@@ -40,7 +40,7 @@ extern char   user_msg[USER_MSG_LENGTH];
-  creating temporary signals (reduces the need for dynamic memory allocation).
-  for performance enhancing purposes.
- */
--void signal_init( signal* sig, char* name, vector* value, int lsb ) {
-+void signal_init( signal_s* sig, char* name, vector* value, int lsb ) {
- 
-   sig->name     = name;
-   sig->value    = value;
-@@ -62,11 +62,11 @@ void signal_init( signal* sig, char* nam
-  values for a signal and returns a pointer to this newly created
-  signal.
- */
--signal* signal_create( char* name, int width, int lsb ) {
-+signal_s* signal_create( char* name, int width, int lsb ) {
- 
--  signal* new_sig;       /* Pointer to newly created signal */
-+  signal_s* new_sig;       /* Pointer to newly created signal */
- 
--  new_sig = (signal*)malloc_safe( sizeof( signal ), __FILE__, __LINE__ );
-+  new_sig = (signal_s*)malloc_safe( sizeof( signal_s ), __FILE__, __LINE__ );
- 
-   signal_init( new_sig, strdup_safe( name, __FILE__, __LINE__ ), vector_create( width, TRUE ), lsb );
- 
-@@ -82,7 +82,7 @@ signal* signal_create( char* name, int w
-  specified file.  This file will be the database coverage file
-  for this design.
- */
--void signal_db_write( signal* sig, FILE* file ) {
-+void signal_db_write( signal_s* sig, FILE* file ) {
- 
-   exp_link* curr;      /* Pointer to current expression link element */
- 
-@@ -125,7 +125,7 @@ bool signal_db_read( char** line, module
- 
-   bool       retval = TRUE;  /* Return value for this function                   */
-   char       name[256];      /* Name of current signal                           */
--  signal*    sig;            /* Pointer to the newly created signal              */
-+  signal_s*    sig;            /* Pointer to the newly created signal              */
-   vector*    vec;            /* Vector value for this signal                     */
-   int        lsb;            /* Least-significant bit of this signal             */
-   int        exp_id;         /* Expression ID                                    */
-@@ -226,7 +226,7 @@ bool signal_db_read( char** line, module
-  If both signals are the same, perform the merge on the signal's 
-  vectors.
- */
--bool signal_db_merge( signal* base, char** line, bool same ) {
-+bool signal_db_merge( signal_s* base, char** line, bool same ) {
-  
-   bool retval;         /* Return value of this function        */
-   char name[256];      /* Name of current signal               */
-@@ -269,7 +269,7 @@ bool signal_db_merge( signal* base, char
- 
-  Sets the wait bit in the specified signal to the specified value.
- */
--void signal_set_wait_bit( signal* sig, int val ) {
-+void signal_set_wait_bit( signal_s* sig, int val ) {
- 
-   assert( sig != NULL );
-   assert( sig->value != NULL );
-@@ -286,7 +286,7 @@ void signal_set_wait_bit( signal* sig, i
- 
-  Gets the value of the wait bit from the specified signal.
- */
--int signal_get_wait_bit( signal* sig ) {
-+int signal_get_wait_bit( signal_s* sig ) {
- 
-   assert( sig != NULL );
-   assert( sig->value != NULL );
-@@ -306,7 +306,7 @@ int signal_get_wait_bit( signal* sig ) {
-  iterates through its expression list, setting the TRUE and FALSE bits accordingly.
-  Finally, calls the simulator expr_changed function for each expression.
- */
--void signal_vcd_assign( signal* sig, char* value, int msb, int lsb ) {
-+void signal_vcd_assign( signal_s* sig, char* value, int msb, int lsb ) {
- 
-   exp_link* curr_expr;  /* Pointer to current expression link under evaluation      */
- 
-@@ -344,7 +344,7 @@ void signal_vcd_assign( signal* sig, cha
-  Adds the specified expression to the end of this signal's expression
-  list.
- */
--void signal_add_expression( signal* sig, expression* expr ) {
-+void signal_add_expression( signal_s* sig, expression* expr ) {
- 
-   exp_link_add( expr, &(sig->exp_head), &(sig->exp_tail) );
- 
-@@ -355,7 +355,7 @@ void signal_add_expression( signal* sig,
- 
-  Displays signal's name, width, lsb and value vector to the standard output.
- */
--void signal_display( signal* sig ) {
-+void signal_display( signal_s* sig ) {
- 
-   assert( sig != NULL );
- 
-@@ -375,9 +375,9 @@ void signal_display( signal* sig ) {
-  signal may be a standard signal name, a single bit select signal or a
-  multi-bit select signal.
- */
--signal* signal_from_string( char** str ) {
-+signal_s* signal_from_string( char** str ) {
- 
--  signal* sig;         /* Pointer to newly created signal       */
-+  signal_s* sig;         /* Pointer to newly created signal       */
-   char    name[4096];  /* Signal name                           */
-   int     msb;         /* MSB of signal                         */
-   int     lsb;         /* LSB of signal                         */
-@@ -408,7 +408,7 @@ signal* signal_from_string( char** str )
-  Deallocates all malloc'ed memory back to the heap for the specified
-  signal.
- */
--void signal_dealloc( signal* sig ) {
-+void signal_dealloc( signal_s* sig ) {
- 
-   exp_link* curr_expl;   /* Pointer to current expression link to set to NULL */
- 
diff --git a/cad/covered/patches/patch-af b/cad/covered/patches/patch-af
deleted file mode 100644
index cb3ae488878..00000000000
--- a/cad/covered/patches/patch-af
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-af,v 1.2 2006/08/28 10:07:00 joerg Exp $
-
---- src/db.c.orig	2004-03-16 05:45:43.000000000 +0000
-+++ src/db.c
-@@ -543,7 +543,7 @@ void db_add_override_param( char* inst_n
-  Creates a vector parameter for the specified signal or expression with the specified
-  parameter expression.  This function is called by the parser.
- */
--void db_add_vector_param( signal* sig, expression* parm_exp, int type ) {
-+void db_add_vector_param( signal_s* sig, expression* parm_exp, int type ) {
- 
-   mod_parm* mparm;   /* Holds newly created module parameter                        */
-   mod_inst* inst;    /* Pointer to instance that is found to contain current module */
-@@ -607,8 +607,8 @@ void db_add_defparam( char* name, expres
- */
- void db_add_signal( char* name, static_expr* left, static_expr* right ) {
- 
--  signal   tmpsig;  /* Temporary signal for signal searching */
--  signal*  sig;     /* Container for newly created signal    */
-+  signal_s   tmpsig;  /* Temporary signal for signal searching */
-+  signal_s*  sig;     /* Container for newly created signal    */
-   int      lsb;     /* Signal LSB                            */
-   int      width;   /* Signal width                          */
- 
-@@ -634,7 +634,7 @@ void db_add_signal( char* name, static_e
-     if( (lsb != -1) && (width != -1) ) { 
-       sig = signal_create( name, width, lsb );
-     } else {
--      sig = (signal*)malloc_safe( sizeof( signal ), __FILE__, __LINE__ );
-+      sig = (signal_s*)malloc_safe( sizeof( signal_s ), __FILE__, __LINE__ );
-       signal_init( sig, strdup_safe( name, __FILE__, __LINE__ ), (vector*)malloc_safe( sizeof( vector ), __FILE__, __LINE__ ), lsb );
-       sig->value->width = width;      
-       sig->value->value = NULL;
-@@ -661,9 +661,9 @@ void db_add_signal( char* name, static_e
-  Searches current module for signal matching the specified name.  If the signal is
-  found, returns a pointer to the calling function for that signal.
- */
--signal* db_find_signal( char* name ) {
-+signal_s* db_find_signal( char* name ) {
- 
--  signal    sig;   /* Temporary signal for comparison purposes */
-+  signal_s  sig;   /* Temporary signal for comparison purposes */
-   sig_link* sigl;  /* Temporary pointer to signal link element */
- 
-   snprintf( user_msg, USER_MSG_LENGTH, "In db_find_signal, searching for signal %s", name );
-@@ -1158,7 +1158,7 @@ void db_vcd_upscope() {
- void db_assign_symbol( char* name, char* symbol, int msb, int lsb ) {
- 
-   sig_link* slink;   /* Pointer to signal containing this symbol */
--  signal    tmpsig;  /* Temporary signal to search for           */
-+  signal_s  tmpsig;  /* Temporary signal to search for           */
- 
-   snprintf( user_msg, USER_MSG_LENGTH, "In db_assign_symbol, name: %s, symbol: %s, curr_inst_scope: %s, msb: %d, lsb: %d",
-             name, symbol, curr_inst_scope, msb, lsb );
diff --git a/cad/covered/patches/patch-ag b/cad/covered/patches/patch-ag
deleted file mode 100644
index e67ab7e047d..00000000000
--- a/cad/covered/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/08/22 17:00:24 joerg Exp $
-
---- src/db.h.orig	2006-08-22 18:50:14.000000000 +0000
-+++ src/db.h
-@@ -30,7 +30,7 @@ void db_add_declared_param( char* name, 
- void db_add_override_param( char* inst_name, expression* expr );
- 
- /*! \brief Adds signal/expression vector parameter to parameter list. */
--void db_add_vector_param( signal* sig, expression* parm_exp, int type );
-+void db_add_vector_param( signal_s* sig, expression* parm_exp, int type );
- 
- /*! \brief Adds specified defparam to parameter override list.  Called by parser. */
- void db_add_defparam( char* name, expression* expr );
-@@ -42,7 +42,7 @@ void db_add_signal( char* name, static_e
- void db_end_module( int end_line );
- 
- /*! \brief Finds specified signal in module and returns pointer to the signal structure.  Called by parser. */
--signal* db_find_signal( char* name );
-+signal_s* db_find_signal( char* name );
- 
- /*! \brief Creates new expression from specified information.  Called by parser and db_add_expression. */
- expression* db_create_expression( expression* right, expression* left, int op, bool lhs, int line, char* sig_name );
diff --git a/cad/covered/patches/patch-ah b/cad/covered/patches/patch-ah
deleted file mode 100644
index 521fefa7f47..00000000000
--- a/cad/covered/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/08/22 17:00:24 joerg Exp $
-
---- src/fsm_arg.c.orig	2006-08-22 18:50:28.000000000 +0000
-+++ src/fsm_arg.c
-@@ -37,7 +37,7 @@ extern char user_msg[USER_MSG_LENGTH];
- expression* fsm_arg_parse_state( char** arg, char* mod_name ) {
- 
-   bool        error = FALSE;  /* Specifies if a parsing error has beenf found   */
--  signal*     sig;            /* Pointer to read-in signal                      */
-+  signal_s*     sig;            /* Pointer to read-in signal                      */
-   expression* expl  = NULL;   /* Pointer to left expression                     */
-   expression* expr  = NULL;   /* Pointer to right expression                    */
-   expression* expt  = NULL;   /* Pointer to temporary expression                */
diff --git a/cad/covered/patches/patch-ai b/cad/covered/patches/patch-ai
deleted file mode 100644
index 5926906e436..00000000000
--- a/cad/covered/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/08/22 17:00:24 joerg Exp $
-
---- src/link.c.orig	2006-08-22 18:50:42.000000000 +0000
-+++ src/link.c
-@@ -145,7 +145,7 @@ void exp_link_add( expression* expr, exp
-  Sets next pointer of element to NULL, sets the tail element to point
-  to the new element and sets the tail value to the new element.
- */
--void sig_link_add( signal* sig, sig_link** head, sig_link** tail ) {
-+void sig_link_add( signal_s* sig, sig_link** head, sig_link** tail ) {
- 
-   sig_link* tmp;   /* Temporary pointer to newly created sig_link element */
- 
-@@ -396,7 +396,7 @@ exp_link* exp_link_find( expression* exp
-  a matching signal is found, the pointer to this element is returned.  If the specified
-  signal could not be matched, the value of NULL is returned.
- */
--sig_link* sig_link_find( signal* sig, sig_link* head ) {
-+sig_link* sig_link_find( signal_s* sig, sig_link* head ) {
- 
-   sig_link* curr;    /* Pointer to current sig_link link */
- 
diff --git a/cad/covered/patches/patch-aj b/cad/covered/patches/patch-aj
deleted file mode 100644
index 5d9ade985f0..00000000000
--- a/cad/covered/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/08/22 17:00:24 joerg Exp $
-
---- src/link.h.orig	2006-08-22 18:50:51.000000000 +0000
-+++ src/link.h
-@@ -24,7 +24,7 @@ void stmt_link_add_tail( statement* stmt
- void exp_link_add( expression* expr, exp_link** head, exp_link** tail );
- 
- /*! \brief Adds specified signal to sig_link element at the end of the list. */
--void sig_link_add( signal* sig, sig_link** head, sig_link** tail );
-+void sig_link_add( signal_s* sig, sig_link** head, sig_link** tail );
- 
- /*! \brief Adds specified FSM to fsm_link element at the end of the list. */
- void fsm_link_add( fsm* table, fsm_link** head, fsm_link** tail );
-@@ -59,7 +59,7 @@ stmt_link* stmt_link_find( int id, stmt_
- exp_link* exp_link_find( expression* exp, exp_link* head );
- 
- /*! \brief Finds specified signal in given sig_link list. */
--sig_link* sig_link_find( signal* sig, sig_link* head );
-+sig_link* sig_link_find( signal_s* sig, sig_link* head );
- 
- /*! \brief Finds specified FSM structure in fsm_link list. */
- fsm_link* fsm_link_find( fsm* table, fsm_link* head );
diff --git a/cad/covered/patches/patch-ak b/cad/covered/patches/patch-ak
deleted file mode 100644
index 2d30a07e70d..00000000000
--- a/cad/covered/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/08/22 17:00:24 joerg Exp $
-
---- src/param.c.orig	2006-08-22 18:51:23.000000000 +0000
-+++ src/param.c
-@@ -369,7 +369,7 @@ void param_find_and_set_expr_value( expr
-  Sizes the specified signal according to the value of the specified
-  instance parameter value.
- */
--bool param_set_sig_size( signal* sig, inst_parm* icurr ) {
-+bool param_set_sig_size( signal_s* sig, inst_parm* icurr ) {
- 
-   bool established = FALSE;  /* Specifies if current signal size is fully established */
-   int  bit_sel;              /* MSB/LSB bit select value from instance parameter      */
diff --git a/cad/covered/patches/patch-al b/cad/covered/patches/patch-al
deleted file mode 100644
index 6510a51f86e..00000000000
--- a/cad/covered/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2006/08/22 17:00:24 joerg Exp $
-
---- src/param.h.orig	2006-08-22 18:51:54.000000000 +0000
-+++ src/param.h
-@@ -41,7 +41,7 @@ void defparam_add( char* scope, vector* 
- void param_set_expr_size( expression* expr, inst_parm* icurr );
- 
- /*! \brief Sets the specified signal size according to the specified instance parameter and resizes attached expressions. */
--bool param_set_sig_size( signal* sig, inst_parm* icurr );
-+bool param_set_sig_size( signal_s* sig, inst_parm* icurr );
- 
- /*! \brief Transforms a declared module parameter into an instance parameter. */
- void param_resolve_declared( char* mscope, mod_parm* mparm, inst_parm* ip_head, inst_parm** ihead, inst_parm** itail );
diff --git a/cad/covered/patches/patch-am b/cad/covered/patches/patch-am
deleted file mode 100644
index 6a409dc6e5b..00000000000
--- a/cad/covered/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2006/08/22 17:00:24 joerg Exp $
-
---- src/sim.h.orig	2006-08-22 18:52:08.000000000 +0000
-+++ src/sim.h
-@@ -23,7 +23,7 @@ void sim_set_curr_wait_signals();
- void sim_clear_curr_wait_signals();
- 
- /*! \brief Searches pre-simulation queue for specified signal name. */
--bool sim_is_curr_wait_signal( signal* sig );
-+bool sim_is_curr_wait_signal( signal_s* sig );
- 
- /*! \brief Adds static expression values to initial simulator */
- void sim_add_statics();
diff --git a/cad/covered/patches/patch-an b/cad/covered/patches/patch-an
deleted file mode 100644
index fd5f1315166..00000000000
--- a/cad/covered/patches/patch-an
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-an,v 1.1 2006/08/22 17:00:24 joerg Exp $
-
---- src/symtable.c.orig	2006-08-22 18:52:17.000000000 +0000
-+++ src/symtable.c
-@@ -158,7 +158,7 @@ int        postsim_size    = 0;
-  Creates and adds the specified symtable signal structure to the sym_sig
-  list for the specified symtab.
- */
--void symtable_add_sym_sig( symtable* symtab, signal* sig, int msb, int lsb ) {
-+void symtable_add_sym_sig( symtable* symtab, signal_s* sig, int msb, int lsb ) {
- 
-   sym_sig* new_ss;  /* Pointer to newly created sym_sig structure */
- 
-@@ -226,7 +226,7 @@ symtable* symtable_create() {
-  Using the symbol as a unique ID, creates a new symtable element for specified information
-  and places it into the binary tree.
- */
--void symtable_add( char* sym, signal* sig, int msb, int lsb ) {
-+void symtable_add( char* sym, signal_s* sig, int msb, int lsb ) {
- 
-   symtable* curr;  /* Pointer to current symtable entry   */
-   char*     ptr;   /* Pointer to current character in sym */
diff --git a/cad/covered/patches/patch-ao b/cad/covered/patches/patch-ao
deleted file mode 100644
index 2bdd03d03f8..00000000000
--- a/cad/covered/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2006/08/22 17:00:24 joerg Exp $
-
---- src/symtable.h.orig	2006-08-22 18:52:40.000000000 +0000
-+++ src/symtable.h
-@@ -15,7 +15,7 @@
- symtable* symtable_create();
- 
- /*! \brief Creates a new symtable entry and adds it to the specified symbol table. */
--void symtable_add( char* sym, signal* sig, int msb, int lsb );
-+void symtable_add( char* sym, signal_s* sig, int msb, int lsb );
- 
- /*! \brief Sets all matching symtable entries to specified value */
- void symtable_set_value( char* sym, char* value );
diff --git a/cad/covered/patches/patch-ap b/cad/covered/patches/patch-ap
deleted file mode 100644
index 4919b455884..00000000000
--- a/cad/covered/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2006/08/22 17:00:24 joerg Exp $
-
---- src/binding.c.orig	2006-08-22 18:54:50.000000000 +0000
-+++ src/binding.c
-@@ -187,7 +187,7 @@ void bind_remove( int id ) {
- */
- bool bind_perform( char* sig_name, expression* exp, module* mod_sig, module* mod_exp, bool implicit_allowed, bool fsm_bind ) {
- 
--  signal    tsig;           /* Temporary signal for comparison purposes          */
-+  signal_s  tsig;           /* Temporary signal for comparison purposes          */
-   sig_link* sigl;           /* Pointer to found signal in specified module       */
-   char*     tmpname;        /* Temporary name containing unused signal character */
-   bool      retval = TRUE;  /* Return value for this function                    */