pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/cad/covered Naming a type "signal" is a bad idea since...
details: https://anonhg.NetBSD.org/pkgsrc/rev/b2381fc18bfc
branches: trunk
changeset: 517763:b2381fc18bfc
user: joerg <joerg%pkgsrc.org@localhost>
date: Tue Aug 22 17:00:24 2006 +0000
description:
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.
diffstat:
cad/covered/distinfo | 20 ++++++-
cad/covered/patches/patch-aa | 8 +-
cad/covered/patches/patch-ab | 26 ++++++++-
cad/covered/patches/patch-ac | 58 ++++++++++++++++++++
cad/covered/patches/patch-ad | 56 +++++++++++++++++++
cad/covered/patches/patch-ae | 121 +++++++++++++++++++++++++++++++++++++++++++
cad/covered/patches/patch-af | 54 +++++++++++++++++++
cad/covered/patches/patch-ag | 22 +++++++
cad/covered/patches/patch-ah | 13 ++++
cad/covered/patches/patch-ai | 22 +++++++
cad/covered/patches/patch-aj | 22 +++++++
cad/covered/patches/patch-ak | 13 ++++
cad/covered/patches/patch-al | 13 ++++
cad/covered/patches/patch-am | 13 ++++
cad/covered/patches/patch-an | 22 +++++++
cad/covered/patches/patch-ao | 13 ++++
cad/covered/patches/patch-ap | 13 ++++
17 files changed, 499 insertions(+), 10 deletions(-)
diffs (truncated from 596 to 300 lines):
diff -r c116e01ecc8e -r b2381fc18bfc cad/covered/distinfo
--- a/cad/covered/distinfo Tue Aug 22 16:31:34 2006 +0000
+++ b/cad/covered/distinfo Tue Aug 22 17:00:24 2006 +0000
@@ -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 -r c116e01ecc8e -r b2381fc18bfc cad/covered/patches/patch-aa
--- a/cad/covered/patches/patch-aa Tue Aug 22 16:31:34 2006 +0000
+++ b/cad/covered/patches/patch-aa Tue Aug 22 17:00:24 2006 +0000
@@ -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 -r c116e01ecc8e -r b2381fc18bfc cad/covered/patches/patch-ab
--- a/cad/covered/patches/patch-ab Tue Aug 22 16:31:34 2006 +0000
+++ b/cad/covered/patches/patch-ab Tue Aug 22 17:00:24 2006 +0000
@@ -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 @@
+ 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 -r c116e01ecc8e -r b2381fc18bfc cad/covered/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/covered/patches/patch-ac Tue Aug 22 17:00:24 2006 +0000
@@ -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 -r c116e01ecc8e -r b2381fc18bfc cad/covered/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/covered/patches/patch-ad Tue Aug 22 17:00:24 2006 +0000
@@ -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 -r c116e01ecc8e -r b2381fc18bfc cad/covered/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/covered/patches/patch-ae Tue Aug 22 17:00:24 2006 +0000
@@ -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 ) {
+
Home |
Main Index |
Thread Index |
Old Index