From f31b783828658d3d090d0b982f9a726bc5cb4961 Mon Sep 17 00:00:00 2001 From: markhummel Date: Wed, 7 Jan 2009 18:18:08 +0000 Subject: [PATCH] * Converged veriuser.h with version used by vrq * Corrected --help text for $lxt2_recordvars and $lxt_recordvars * Fixed bug in dumpvars that skipped initial timestamp in output file * Bumped rev to 2.8.7 --- ChangeLog | 5 +++++ configure | 20 ++++++++++---------- configure.in | 2 +- doc/veriwell.1 | 6 +++--- src/systask.cc | 1 + src/veriuser.h | 22 ++++++++++++---------- src/veriwell.cc | 4 ++-- 7 files changed, 34 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a8d31a..ea81713 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,3 +84,8 @@ * Added $dist_* system functions * Bumped rev to 2.8.6 +2009-1-6 Mark Hummel + * Converged veriuser.h with version used by vrq + * Corrected --help text for $lxt2_recordvars and $lxt_recordvars + * Fixed bug in dumpvars that skipped initial timestamp in output file + * Bumped rev to 2.8.7 diff --git a/configure b/configure index 78d6212..b6369fe 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for veriwell 2.8.6. +# Generated by GNU Autoconf 2.61 for veriwell 2.8.7. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -726,8 +726,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='veriwell' PACKAGE_TARNAME='veriwell' -PACKAGE_VERSION='2.8.6' -PACKAGE_STRING='veriwell 2.8.6' +PACKAGE_VERSION='2.8.7' +PACKAGE_STRING='veriwell 2.8.7' PACKAGE_BUGREPORT='' # Factoring default headers for most tests. @@ -1401,7 +1401,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures veriwell 2.8.6 to adapt to many kinds of systems. +\`configure' configures veriwell 2.8.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1471,7 +1471,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of veriwell 2.8.6:";; + short | recursive ) echo "Configuration of veriwell 2.8.7:";; esac cat <<\_ACEOF @@ -1578,7 +1578,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -veriwell configure 2.8.6 +veriwell configure 2.8.7 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1592,7 +1592,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by veriwell $as_me 2.8.6, which was +It was created by veriwell $as_me 2.8.7, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2285,7 +2285,7 @@ fi # Define the identity of the package. PACKAGE='veriwell' - VERSION='2.8.6' + VERSION='2.8.7' cat >>confdefs.h <<_ACEOF @@ -22627,7 +22627,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by veriwell $as_me 2.8.6, which was +This file was extended by veriwell $as_me 2.8.7, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22680,7 +22680,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -veriwell config.status 2.8.6 +veriwell config.status 2.8.7 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index 47c8236..de9c296 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT(veriwell,2.8.6) +AC_INIT(veriwell,2.8.7) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config.h]) diff --git a/doc/veriwell.1 b/doc/veriwell.1 index 51d0439..95f5a67 100644 --- a/doc/veriwell.1 +++ b/doc/veriwell.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH VERIWELL "1" "May 2008" "Veriwell 2.8.6," "User Commands" +.TH VERIWELL "1" "January 2009" "Veriwell 2.8.6," "User Commands" .SH NAME Veriwell \- manual page for Veriwell 2.8.6, .SH SYNOPSIS @@ -108,7 +108,7 @@ Set filename and options $lxt_recordsetup options Set options .TP -$lxt_recordvar options +$lxt_recordvars options Start waveform dump .TP $lxt2_recordon @@ -126,7 +126,7 @@ Set filename and options $lxt2_recordsetup options Set options .TP -$lxt2_recordvar options +$lxt2_recordvars options Start waveform dump .SS "Lxt Options:" .TP diff --git a/src/systask.cc b/src/systask.cc index 3e64c44..d6f7739 100644 --- a/src/systask.cc +++ b/src/systask.cc @@ -1287,6 +1287,7 @@ void exec_systask(tree node) if (dumpvars_header(node)) { dumpvars_enable(); dumpvars_checkpoint("$dumpvars"); + dumpvar.new_time = 1; } } break; diff --git a/src/veriuser.h b/src/veriuser.h index fcefd32..3ea2644 100644 --- a/src/veriuser.h +++ b/src/veriuser.h @@ -22,6 +22,7 @@ #ifndef VERIUSER_H #define VERIUSER_H + #ifdef _LP64 #define LP64 long #else @@ -29,13 +30,6 @@ #endif -/* general defines */ - -#define true 1 -#define false 0 -#define TRUE 1 -#define FALSE 0 - /* defines for error interception */ #define ERR_MESSAGE 1 @@ -44,9 +38,18 @@ #define ERR_INTERNAL 4 #define ERR_SYSTEM 5 +#ifdef __cplusplus +extern "C" { +#endif + /* VERILOG user tasks and functions C header file */ +struct t_call_stats { + unsigned long long count; + unsigned long long cycles; +}; + typedef struct t_tfcell { short type; /* either usertask or userfunction */ short data; /* parameter for the following routines */ @@ -66,6 +69,8 @@ typedef struct t_tfcell { struct t_tfcell *right_p; char *namecell_p; int warning_printed; /* Flag is set when skipping warning is printed */ + struct t_call_stats call_stats[18]; + int statsInit; } s_tfcell, *p_tfcell; struct t_tfexprinfo; @@ -145,9 +150,6 @@ number is passed as the 3rd argument. #define reason_scope 18 #define REASON_SCOPE 18 -#ifdef __cplusplus -extern "C" { -#endif /* user error message string */ extern char *tf_error_message; diff --git a/src/veriwell.cc b/src/veriwell.cc index 81ee4bf..6480cf0 100644 --- a/src/veriwell.cc +++ b/src/veriwell.cc @@ -812,7 +812,7 @@ void CmdlineHelp() printf(" $lxt_recordclose End waveform dump\n"); printf(" $lxt_recordfile filename options Set filename and options\n"); printf(" $lxt_recordsetup options Set options\n"); - printf(" $lxt_recordvar options Start waveform dump\n\n"); + printf(" $lxt_recordvars options Start waveform dump\n\n"); #endif #ifdef HAVE_LXT2 printf(" $lxt2_recordon Enable waveform dump\n"); @@ -820,7 +820,7 @@ void CmdlineHelp() printf(" $lxt2_recordclose End waveform dump\n"); printf(" $lxt2_recordfile filename options Set filename and options\n"); printf(" $lxt2_recordsetup options Set options\n"); - printf(" $lxt2_recordvar options Start waveform dump\n\n"); + printf(" $lxt2_recordvars options Start waveform dump\n\n"); #endif #if defined(HAVE_LXT) || defined(HAVE_LXT2) printf("Lxt Options:\n");