Use the conf file to generate the vvm ivl string.

driver/build_string.c

@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: build_string.c,v 1.1 2000/10/08 22:36:56 steve Exp $"
+#ident "$Id: build_string.c,v 1.2 2000/10/28 03:45:47 steve Exp $"
 #endif
 
 # include  "globals.h"
@@ -41,11 +41,11 @@ int build_string(char*output, size_t olen, const char*pattern)
 			*output++ = '%';
 			break;
 
-		      case '?': {
+		      case '[': {
 			    const char*tail;
 			    pattern += 1;
 			    assert(*pattern);
-			    tail = strchr(pattern+1, ';');
+			    tail = strchr(pattern+1, ']');
 			    assert(tail);
 			    strncpy(tmp_buf, pattern+1, tail-pattern-1);
 			    tmp_buf[tail-pattern-1] = 0;
@@ -68,6 +68,22 @@ int build_string(char*output, size_t olen, const char*pattern)
 			olen -= strlen(base);
 			break;
 
+		      case 'f':
+			if (f_list) {
+			      strcpy(output, f_list);
+			      output += strlen(f_list);
+			      olen -= strlen(f_list);
+			}
+			break;
+
+		      case 'm':
+			if (mod_list) {
+			      strcpy(output, mod_list);
+			      output += strlen(mod_list);
+			      olen -= strlen(mod_list);
+			}
+			break;
+
 		      case 'N':
 			if (npath) {
 			      strcpy(output, npath);
@@ -76,6 +92,12 @@ int build_string(char*output, size_t olen, const char*pattern)
 			}
 			break;
 
+		      case 'o':
+			strcpy(output, opath);
+			output += strlen(opath);
+			olen -= strlen(opath);
+			break;
+
 		      case 's':
 			if (start) {
 			      strcpy(output, start);
@@ -97,6 +119,13 @@ int build_string(char*output, size_t olen, const char*pattern)
 			output += strlen(targ);
 			olen -= strlen(targ);
 			break;
+
+		      case 'W':
+			strcpy(output, warning_flags);
+			output += strlen(warning_flags);
+			olen -= strlen(warning_flags);
+			break;
+
 		  }
 		  pattern += 1;
 
@@ -112,6 +141,9 @@ int build_string(char*output, size_t olen, const char*pattern)
 
 /*
  * $Log: build_string.c,v $
+ * Revision 1.2  2000/10/28 03:45:47  steve
+ *  Use the conf file to generate the vvm ivl string.
+ *
  * Revision 1.1  2000/10/08 22:36:56  steve
  *  iverilog with an iverilog.conf configuration file.
  *

driver/globals.h

@@ -19,7 +19,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: globals.h,v 1.1 2000/10/08 22:36:56 steve Exp $"
+#ident "$Id: globals.h,v 1.2 2000/10/28 03:45:47 steve Exp $"
 #endif
 
 # include  <stddef.h>
@@ -27,24 +27,38 @@
   /* This is the base (i.e. -B<value>) of the Icarus Verilog files. */
 extern const char*base;
 
+  /* This is a list of all the -f<key>=<value> options from the
+     command line, concatenated together. */
+extern char*f_list;
+
+extern char*mod_list;
+
   /* This is the optional -Tmin|typ|max setting. */
 extern const char*mtm;
 
   /* Ths is the optional -N<path> value, if one was supplied. */
 extern const char*npath;
 
+  /* This is the name of the output file that the user selected. */
+extern const char*opath;
+
   /* This pointer is set if there was a -s<value> parameter. */
 extern const char*start;
 
   /* This is the name of the selected target. */
 extern const char*targ;
 
+extern char warning_flags[];
+
 extern const char*lookup_pattern(const char*key);
 
 extern int build_string(char*out, size_t olen, const char*pattern);
 
 /*
  * $Log: globals.h,v $
+ * Revision 1.2  2000/10/28 03:45:47  steve
+ *  Use the conf file to generate the vvm ivl string.
+ *
  * Revision 1.1  2000/10/08 22:36:56  steve
  *  iverilog with an iverilog.conf configuration file.
  *

driver/main.c

@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT)
-#ident "$Id: main.c,v 1.2 2000/10/28 03:45:47 steve Exp $"
+#ident "$Id: main.c,v 1.3 2000/10/28 03:47:25 steve Exp $"
 #endif
 
 #include <stdio.h>
@@ -117,7 +117,7 @@ static int t_vvm(char*cmd, unsigned ncmd)
 {
       int rc;
 
-      pattern = lookup_pattern("<ivl>");
+      const char*pattern = lookup_pattern("<ivl>");
       if (pattern == 0) {
 	    fprintf(stderr, "No such target: %s\n", targ);
 	    return -1;
@@ -456,6 +456,9 @@ int main(int argc, char **argv)
 
 /*
  * $Log: main.c,v $
+ * Revision 1.3  2000/10/28 03:47:25  steve
+ *  Use the conf file to generate the vvm ivl string.
+ *
  * Revision 1.2  2000/10/28 03:45:47  steve
  *  Use the conf file to generate the vvm ivl string.
  *