Naming a type "signal" is a bad idea since a compatibility function of

that name exists and GCC 3.4 complains about it. Rename it to signal_s.

17 files changed, 499 insertions, 10 deletions

diff --git a/cad/covered/distinfo b/cad/covered/distinfo
index dbe9795f2c6..cec7faed6f6 100644
--- a/cad/covered/distinfo
+++ b/cad/covered/distinfo
@@ -1,7 +1,21 @@
-$NetBSD: distinfo,v 1.6 2005/03/01 00:13:44 dmcmahill Exp $
+$NetBSD: distinfo,v 1.7 2006/08/22 17:00:24 joerg 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) = 0ffd830e411c00d5fa1776f14e949362b2d2980f
-SHA1 (patch-ab) = 5baa34bb31e8118ec656d022ee548987741e2c52
+SHA1 (patch-aa) = 77c21638506a2a20bf1003994a71fb4d27eee118
+SHA1 (patch-ab) = 5cb1af8100cb78bfef1cda3bde9ea6f1b0756878
+SHA1 (patch-ac) = b934c13b174cb7adb80b5f90a440e0644f6d11c6
+SHA1 (patch-ad) = de075fa6bc90ae4a06ee1353b7d0b2cd5a3e5dae
+SHA1 (patch-ae) = 6a255dc876522304737639f7485969be4df2a190
+SHA1 (patch-af) = 193b50148b1087f7a9a09345fcf6ad6e8a2f44fb
+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
diff --git a/cad/covered/patches/patch-aa b/cad/covered/patches/patch-aa
index 779fce89ac2..de35ae2ce22 100644
--- a/cad/covered/patches/patch-aa
+++ b/cad/covered/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/08/24 18:38:06 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.2 2006/08/22 17:00:24 joerg Exp $
 
---- doc/Makefile.orig	Sun Aug 17 03:13:41 2003
+--- doc/Makefile.orig	2003-08-17 03:13:41.000000000 +0000
 +++ doc/Makefile
-@@ -1,13 +1,13 @@
+@@ -1,13 +1,12 @@
  all:
- 	- doxygen covered.dox
+-	- doxygen covered.dox
 -	- cd ./user; make all
 +	- cd ./user; ${MAKE} all
  
diff --git a/cad/covered/patches/patch-ab b/cad/covered/patches/patch-ab
index 1ae80b15693..72d2a598439 100644
--- a/cad/covered/patches/patch-ab
+++ b/cad/covered/patches/patch-ab
@@ -1,8 +1,9 @@
-$NetBSD: patch-ab,v 1.1 2005/03/01 00:13:44 dmcmahill Exp $
+$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	2005-02-28 21:12:13.000000000 +0000
-@@ -62,10 +62,24 @@
++++ 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)         \
@@ -33,3 +34,22 @@ $NetBSD: patch-ab,v 1.1 2005/03/01 00:13:44 dmcmahill Exp $
 +    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
new file mode 100644
index 00000000000..8a4be8932ec
--- /dev/null
+++ b/cad/covered/patches/patch-ac
@@ -0,0 +1,58 @@
+$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
new file mode 100644
index 00000000000..dbbc29122ef
--- /dev/null
+++ b/cad/covered/patches/patch-ad
@@ -0,0 +1,56 @@
+$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
new file mode 100644
index 00000000000..64797a017ed
--- /dev/null
+++ b/cad/covered/patches/patch-ae
@@ -0,0 +1,121 @@
+$NetBSD: patch-ae,v 1.1 2006/08/22 17:00:24 joerg Exp $
+
+--- src/signal.c.orig	2006-08-22 18:49:38.000000000 +0000
++++ src/signal.c
+@@ -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 ), __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
new file mode 100644
index 00000000000..658d26e1e3b
--- /dev/null
+++ b/cad/covered/patches/patch-af
@@ -0,0 +1,54 @@
+$NetBSD: patch-af,v 1.1 2006/08/22 17:00:24 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 ), __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
new file mode 100644
index 00000000000..e67ab7e047d
--- /dev/null
+++ b/cad/covered/patches/patch-ag
@@ -0,0 +1,22 @@
+$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
new file mode 100644
index 00000000000..521fefa7f47
--- /dev/null
+++ b/cad/covered/patches/patch-ah
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..5926906e436
--- /dev/null
+++ b/cad/covered/patches/patch-ai
@@ -0,0 +1,22 @@
+$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
new file mode 100644
index 00000000000..5d9ade985f0
--- /dev/null
+++ b/cad/covered/patches/patch-aj
@@ -0,0 +1,22 @@
+$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
new file mode 100644
index 00000000000..2d30a07e70d
--- /dev/null
+++ b/cad/covered/patches/patch-ak
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..6510a51f86e
--- /dev/null
+++ b/cad/covered/patches/patch-al
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..6a409dc6e5b
--- /dev/null
+++ b/cad/covered/patches/patch-am
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..fd5f1315166
--- /dev/null
+++ b/cad/covered/patches/patch-an
@@ -0,0 +1,22 @@
+$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
new file mode 100644
index 00000000000..2bdd03d03f8
--- /dev/null
+++ b/cad/covered/patches/patch-ao
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..4919b455884
--- /dev/null
+++ b/cad/covered/patches/patch-ap
@@ -0,0 +1,13 @@
+$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                    */