From b2b8b89cd8c311a24a4751bd6bc4c535d46cc37f Mon Sep 17 00:00:00 2001 From: steve Date: Sat, 15 Sep 2001 18:27:04 +0000 Subject: [PATCH] Make configure detect malloc.h --- config.h.in | 6 +++++- configure.in | 2 +- driver/parse.y | 5 ++++- ivlpp/lexor.lex | 5 ++++- ivlpp/main.c | 7 ++++++- t-dll-expr.cc | 8 +++++++- t-dll-proc.cc | 8 +++++++- t-dll.cc | 8 +++++++- tgt-fpga/configure.in | 1 + tgt-fpga/d-generic-edif.c | 7 ++++++- tgt-fpga/d-virtex.c | 7 ++++++- tgt-fpga/mangle.c | 8 +++++++- tgt-pal/emit_jed.c | 8 +++++++- tgt-pal/imain.c | 7 ++++++- tgt-vvp/configure.in | 1 + tgt-vvp/eval_expr.c | 8 +++++++- tgt-vvp/vvp_process.c | 8 +++++++- tgt-vvp/vvp_scope.c | 8 +++++++- vvm/vvm_calltf.cc | 7 ++++++- vvp/compile.cc | 7 ++++++- vvp/config.h.in | 6 +++++- vvp/configure.in | 2 +- vvp/debug.cc | 7 ++++++- vvp/fvectors.cc | 7 ++++++- vvp/memory.cc | 5 ++++- vvp/parse_misc.cc | 8 +++++++- vvp/schedule.cc | 8 +++++++- vvp/udp.cc | 8 +++++++- vvp/vpi_callback.cc | 8 +++++++- vvp/vpi_const.cc | 8 +++++++- vvp/vpi_priv.cc | 8 +++++++- vvp/vpi_scope.cc | 8 +++++++- vvp/vpi_signal.cc | 8 +++++++- vvp/vpi_tasks.cc | 8 +++++++- vvp/vpi_vthr_vector.cc | 8 +++++++- vvp/vthread.cc | 8 +++++++- 36 files changed, 207 insertions(+), 34 deletions(-) diff --git a/config.h.in b/config.h.in index b9981051f..c8e2ca428 100644 --- a/config.h.in +++ b/config.h.in @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: config.h.in,v 1.1 2001/07/25 03:10:48 steve Exp $" +#ident "$Id: config.h.in,v 1.2 2001/09/15 18:27:04 steve Exp $" #endif #if defined(__cplusplus) @@ -37,6 +37,7 @@ # undef HAVE_TIMES # undef HAVE_IOSFWD # undef HAVE_GETOPT_H +# undef HAVE_MALLOC_H # undef HAVE_DLFCN_H # undef HAVE_DL_H # undef HAVE_FCHMOD @@ -44,6 +45,9 @@ /* * $Log: config.h.in,v $ + * Revision 1.2 2001/09/15 18:27:04 steve + * Make configure detect malloc.h + * * Revision 1.1 2001/07/25 03:10:48 steve * Create a config.h.in file to hold all the config * junk, and support gcc 3.0. (Stephan Boettcher) diff --git a/configure.in b/configure.in index 107aa231a..55b11ea1a 100644 --- a/configure.in +++ b/configure.in @@ -16,7 +16,7 @@ fi AC_LANG_CPLUSPLUS -AC_CHECK_HEADERS(getopt.h iosfwd sys/wait.h) +AC_CHECK_HEADERS(getopt.h malloc.h iosfwd sys/wait.h) AC_MSG_CHECKING(for sys/times) AC_TRY_LINK( diff --git a/driver/parse.y b/driver/parse.y index c3215d8f2..063f98954 100644 --- a/driver/parse.y +++ b/driver/parse.y @@ -18,13 +18,16 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) && !defined(macintosh) -#ident "$Id: parse.y,v 1.3 2001/07/25 03:10:50 steve Exp $" +#ident "$Id: parse.y,v 1.4 2001/09/15 18:27:04 steve Exp $" #endif # include "config.h" # include +#ifdef HAVE_MALLOC_H # include +#endif +# include # include "globals.h" diff --git a/ivlpp/lexor.lex b/ivlpp/lexor.lex index 6311d4a1f..9fa049a3a 100644 --- a/ivlpp/lexor.lex +++ b/ivlpp/lexor.lex @@ -19,13 +19,16 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) && !defined(macintosh) -#ident "$Id: lexor.lex,v 1.24 2001/07/25 03:10:50 steve Exp $" +#ident "$Id: lexor.lex,v 1.25 2001/09/15 18:27:04 steve Exp $" #endif # include "config.h" # include +#ifdef HAVE_MALLOC_H # include +#endif +# include # include # include diff --git a/ivlpp/main.c b/ivlpp/main.c index a14d16ef0..b2afcd4a4 100644 --- a/ivlpp/main.c +++ b/ivlpp/main.c @@ -17,7 +17,7 @@ const char COPYRIGHT[] = * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) && !defined(macintosh) -#ident "$Id: main.c,v 1.11 2001/07/25 03:10:50 steve Exp $" +#ident "$Id: main.c,v 1.12 2001/09/15 18:27:04 steve Exp $" #endif # include "config.h" @@ -42,7 +42,9 @@ const char VERSION[] = "$Name: $ $State: Exp $"; # include # include +#ifdef HAVE_MALLOC_H # include +#endif # include # include #if defined(HAVE_GETOPT_H) @@ -186,6 +188,9 @@ int main(int argc, char*argv[]) /* * $Log: main.c,v $ + * Revision 1.12 2001/09/15 18:27:04 steve + * Make configure detect malloc.h + * * Revision 1.11 2001/07/25 03:10:50 steve * Create a config.h.in file to hold all the config * junk, and support gcc 3.0. (Stephan Boettcher) diff --git a/t-dll-expr.cc b/t-dll-expr.cc index 741132cdc..563fa59ec 100644 --- a/t-dll-expr.cc +++ b/t-dll-expr.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) & !defined(macintosh) -#ident "$Id: t-dll-expr.cc,v 1.17 2001/07/27 04:51:44 steve Exp $" +#ident "$Id: t-dll-expr.cc,v 1.18 2001/09/15 18:27:04 steve Exp $" #endif # include "config.h" @@ -27,7 +27,10 @@ # include "t-dll.h" # include "netlist.h" # include +#ifdef HAVE_MALLOC_H # include +#endif +# include /* * These methods implement the expression scan that generates the @@ -298,6 +301,9 @@ void dll_target::expr_unary(const NetEUnary*net) /* * $Log: t-dll-expr.cc,v $ + * Revision 1.18 2001/09/15 18:27:04 steve + * Make configure detect malloc.h + * * Revision 1.17 2001/07/27 04:51:44 steve * Handle part select expressions as variants of * NetESignal/IVL_EX_SIGNAL objects, instead of diff --git a/t-dll-proc.cc b/t-dll-proc.cc index 20e42ec23..9b1be58c5 100644 --- a/t-dll-proc.cc +++ b/t-dll-proc.cc @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) && !defined(macintosh) -#ident "$Id: t-dll-proc.cc,v 1.34 2001/08/25 23:50:03 steve Exp $" +#ident "$Id: t-dll-proc.cc,v 1.35 2001/09/15 18:27:04 steve Exp $" #endif # include "config.h" @@ -29,7 +29,10 @@ # include "ivl_target.h" # include "compiler.h" # include "t-dll.h" +#ifdef HAVE_MALLOC_H # include +#endif +# include bool dll_target::process(const NetProcTop*net) @@ -666,6 +669,9 @@ void dll_target::proc_while(const NetWhile*net) /* * $Log: t-dll-proc.cc,v $ + * Revision 1.35 2001/09/15 18:27:04 steve + * Make configure detect malloc.h + * * Revision 1.34 2001/08/25 23:50:03 steve * Change the NetAssign_ class to refer to the signal * instead of link into the netlist. This is faster diff --git a/t-dll.cc b/t-dll.cc index e345701dc..8b2c13b87 100644 --- a/t-dll.cc +++ b/t-dll.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) && !defined(macintosh) -#ident "$Id: t-dll.cc,v 1.62 2001/09/09 16:49:04 steve Exp $" +#ident "$Id: t-dll.cc,v 1.63 2001/09/15 18:27:04 steve Exp $" #endif # include "config.h" @@ -27,7 +27,10 @@ # include "compiler.h" # include "t-dll.h" # include "netmisc.h" +#ifdef HAVE_MALLOC_H # include +#endif +# include #if defined(__WIN32__) @@ -1532,6 +1535,9 @@ extern const struct target tgt_dll = { "dll", &dll_target_obj }; /* * $Log: t-dll.cc,v $ + * Revision 1.63 2001/09/15 18:27:04 steve + * Make configure detect malloc.h + * * Revision 1.62 2001/09/09 16:49:04 steve * Connect right ANEB pin when doing NE comparator. * diff --git a/tgt-fpga/configure.in b/tgt-fpga/configure.in index f95e761c2..0c725d81f 100644 --- a/tgt-fpga/configure.in +++ b/tgt-fpga/configure.in @@ -11,6 +11,7 @@ AC_CANONICAL_HOST AC_CYGWIN AC_SUBST(CYGWIN) +AC_CHECK_HEADERS(malloc.h) # The -fPIC flag is used to tell the compiler to make position # independent code. It is needed when making shared objects. diff --git a/tgt-fpga/d-generic-edif.c b/tgt-fpga/d-generic-edif.c index dd70c607d..e48bb5524 100644 --- a/tgt-fpga/d-generic-edif.c +++ b/tgt-fpga/d-generic-edif.c @@ -16,13 +16,15 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#ident "$Id: d-generic-edif.c,v 1.5 2001/09/15 05:06:04 steve Exp $" +#ident "$Id: d-generic-edif.c,v 1.6 2001/09/15 18:27:04 steve Exp $" # include "device.h" # include "fpga_priv.h" # include # include +#ifdef HAVE_MALLOC_H # include +#endif # include struct nexus_recall { @@ -392,6 +394,9 @@ const struct device_s d_generic_edif = { /* * $Log: d-generic-edif.c,v $ + * Revision 1.6 2001/09/15 18:27:04 steve + * Make configure detect malloc.h + * * Revision 1.5 2001/09/15 05:06:04 steve * Support != in virtex code generator. * diff --git a/tgt-fpga/d-virtex.c b/tgt-fpga/d-virtex.c index da2704b6a..b44a794a7 100644 --- a/tgt-fpga/d-virtex.c +++ b/tgt-fpga/d-virtex.c @@ -16,13 +16,15 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#ident "$Id: d-virtex.c,v 1.7 2001/09/15 05:06:04 steve Exp $" +#ident "$Id: d-virtex.c,v 1.8 2001/09/15 18:27:04 steve Exp $" # include "device.h" # include "fpga_priv.h" # include # include +#ifdef HAVE_MALLOC_H # include +#endif # include /* @@ -898,6 +900,9 @@ const struct device_s d_virtex_edif = { /* * $Log: d-virtex.c,v $ + * Revision 1.8 2001/09/15 18:27:04 steve + * Make configure detect malloc.h + * * Revision 1.7 2001/09/15 05:06:04 steve * Support != in virtex code generator. * diff --git a/tgt-fpga/mangle.c b/tgt-fpga/mangle.c index c6058b458..016fe6cb4 100644 --- a/tgt-fpga/mangle.c +++ b/tgt-fpga/mangle.c @@ -16,12 +16,15 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#ident "$Id: mangle.c,v 1.3 2001/09/02 21:33:07 steve Exp $" +#ident "$Id: mangle.c,v 1.4 2001/09/15 18:27:04 steve Exp $" # include "fpga_priv.h" # include +#ifdef HAVE_MALLOC_H # include +#endif +# include static size_t xnf_mangle_scope_name(ivl_scope_t net, char*buf, size_t nbuf) { @@ -94,6 +97,9 @@ const char* xnf_mangle_nexus_name(ivl_nexus_t net) /* * $Log: mangle.c,v $ + * Revision 1.4 2001/09/15 18:27:04 steve + * Make configure detect malloc.h + * * Revision 1.3 2001/09/02 21:33:07 steve * Rearrange the XNF code generator to be generic-xnf * so that non-XNF code generation is also possible. diff --git a/tgt-pal/emit_jed.c b/tgt-pal/emit_jed.c index 19785d0d2..5047362b3 100644 --- a/tgt-pal/emit_jed.c +++ b/tgt-pal/emit_jed.c @@ -17,14 +17,17 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) && !defined(macintosh) -#ident "$Id: emit_jed.c,v 1.3 2001/07/25 03:10:50 steve Exp $" +#ident "$Id: emit_jed.c,v 1.4 2001/09/15 18:27:04 steve Exp $" #endif # include "config.h" # include "priv.h" # include +#ifdef HAVE_MALLOC_H # include +#endif +# include # include static void draw_macrocell_modes(FILE*jfd) @@ -131,6 +134,9 @@ int emit_jedec(const char*path) /* * $Log: emit_jed.c,v $ + * Revision 1.4 2001/09/15 18:27:04 steve + * Make configure detect malloc.h + * * Revision 1.3 2001/07/25 03:10:50 steve * Create a config.h.in file to hold all the config * junk, and support gcc 3.0. (Stephan Boettcher) diff --git a/tgt-pal/imain.c b/tgt-pal/imain.c index dfbc26006..e0df05035 100644 --- a/tgt-pal/imain.c +++ b/tgt-pal/imain.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) && !defined(macintosh) -#ident "$Id: imain.c,v 1.8 2001/07/25 03:10:50 steve Exp $" +#ident "$Id: imain.c,v 1.9 2001/09/15 18:27:04 steve Exp $" #endif # include "config.h" @@ -28,7 +28,9 @@ # include "priv.h" +#ifdef HAVE_MALLOC_H # include +#endif # include # include # include @@ -152,6 +154,9 @@ DECLARE_CYGWIN_DLL(DllMain); /* * $Log: imain.c,v $ + * Revision 1.9 2001/09/15 18:27:04 steve + * Make configure detect malloc.h + * * Revision 1.8 2001/07/25 03:10:50 steve * Create a config.h.in file to hold all the config * junk, and support gcc 3.0. (Stephan Boettcher) diff --git a/tgt-vvp/configure.in b/tgt-vvp/configure.in index 91f71f0ec..a6537b56f 100644 --- a/tgt-vvp/configure.in +++ b/tgt-vvp/configure.in @@ -11,6 +11,7 @@ AC_CANONICAL_HOST AC_CYGWIN AC_SUBST(CYGWIN) +AC_CHECK_HEADERS(malloc.h) # The -fPIC flag is used to tell the compiler to make position # independent code. It is needed when making shared objects. diff --git a/tgt-vvp/eval_expr.c b/tgt-vvp/eval_expr.c index c08809202..3892a53d0 100644 --- a/tgt-vvp/eval_expr.c +++ b/tgt-vvp/eval_expr.c @@ -17,12 +17,15 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: eval_expr.c,v 1.43 2001/08/31 01:37:56 steve Exp $" +#ident "$Id: eval_expr.c,v 1.44 2001/09/15 18:27:04 steve Exp $" #endif # include "vvp_priv.h" # include +#ifdef HAVE_MALLOC_H # include +#endif +# include # include struct vector_info draw_eval_expr_wid(ivl_expr_t exp, unsigned wid); @@ -1197,6 +1200,9 @@ struct vector_info draw_eval_expr(ivl_expr_t exp) /* * $Log: eval_expr.c,v $ + * Revision 1.44 2001/09/15 18:27:04 steve + * Make configure detect malloc.h + * * Revision 1.43 2001/08/31 01:37:56 steve * Handle update in place of repeat constants. * diff --git a/tgt-vvp/vvp_process.c b/tgt-vvp/vvp_process.c index 9924895be..ee7c6124c 100644 --- a/tgt-vvp/vvp_process.c +++ b/tgt-vvp/vvp_process.c @@ -17,13 +17,16 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: vvp_process.c,v 1.44 2001/09/01 00:58:16 steve Exp $" +#ident "$Id: vvp_process.c,v 1.45 2001/09/15 18:27:04 steve Exp $" #endif # include "vvp_priv.h" # include # include +#ifdef HAVE_MALLOC_H # include +#endif +# include static int show_statement(ivl_statement_t net, ivl_scope_t sscope); @@ -981,6 +984,9 @@ int draw_func_definition(ivl_scope_t scope) /* * $Log: vvp_process.c,v $ + * Revision 1.45 2001/09/15 18:27:04 steve + * Make configure detect malloc.h + * * Revision 1.44 2001/09/01 00:58:16 steve * dead comments. * diff --git a/tgt-vvp/vvp_scope.c b/tgt-vvp/vvp_scope.c index ea4ba8041..b3d81b996 100644 --- a/tgt-vvp/vvp_scope.c +++ b/tgt-vvp/vvp_scope.c @@ -17,12 +17,15 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: vvp_scope.c,v 1.46 2001/09/14 04:15:46 steve Exp $" +#ident "$Id: vvp_scope.c,v 1.47 2001/09/15 18:27:04 steve Exp $" #endif # include "vvp_priv.h" # include +#ifdef HAVE_MALLOC_H # include +#endif +# include # include /* @@ -1199,6 +1202,9 @@ int draw_scope(ivl_scope_t net, ivl_scope_t parent) /* * $Log: vvp_scope.c,v $ + * Revision 1.47 2001/09/15 18:27:04 steve + * Make configure detect malloc.h + * * Revision 1.46 2001/09/14 04:15:46 steve * Generate code for identity comparators. * diff --git a/vvm/vvm_calltf.cc b/vvm/vvm_calltf.cc index ea58c7da2..237d828a8 100644 --- a/vvm/vvm_calltf.cc +++ b/vvm/vvm_calltf.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) && !defined(macintosh) -#ident "$Id: vvm_calltf.cc,v 1.14 2001/07/25 03:10:50 steve Exp $" +#ident "$Id: vvm_calltf.cc,v 1.15 2001/09/15 18:27:04 steve Exp $" #endif # include "config.h" @@ -31,7 +31,9 @@ # include # include # include +#ifdef HAVE_MALLOC_H # include +#endif # include # include "ivl_dlfcn.h" # include "vpithunk.h" @@ -137,6 +139,9 @@ void vvm_load_vpi_module(const char*name) /* * $Log: vvm_calltf.cc,v $ + * Revision 1.15 2001/09/15 18:27:04 steve + * Make configure detect malloc.h + * * Revision 1.14 2001/07/25 03:10:50 steve * Create a config.h.in file to hold all the config * junk, and support gcc 3.0. (Stephan Boettcher) diff --git a/vvp/compile.cc b/vvp/compile.cc index e1ee8e75f..c04344fd7 100644 --- a/vvp/compile.cc +++ b/vvp/compile.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: compile.cc,v 1.99 2001/09/11 01:54:58 steve Exp $" +#ident "$Id: compile.cc,v 1.100 2001/09/15 18:27:04 steve Exp $" #endif # include "arith.h" @@ -33,7 +33,9 @@ # include "vpi_priv.h" # include "vthread.h" # include "parse_misc.h" +#ifdef HAVE_MALLOC_H # include +#endif # include # include # include @@ -1635,6 +1637,9 @@ vvp_ipoint_t debug_lookup_functor(const char*name) /* * $Log: compile.cc,v $ + * Revision 1.100 2001/09/15 18:27:04 steve + * Make configure detect malloc.h + * * Revision 1.99 2001/09/11 01:54:58 steve * initial structural memory propagation (Stephan Boettcher) * diff --git a/vvp/config.h.in b/vvp/config.h.in index b89576646..e8af9db44 100644 --- a/vvp/config.h.in +++ b/vvp/config.h.in @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: config.h.in,v 1.6 2001/07/16 18:40:19 steve Exp $" +#ident "$Id: config.h.in,v 1.7 2001/09/15 18:27:05 steve Exp $" #endif # define SIZEOF_UNSIGNED_LONG 0 @@ -28,6 +28,7 @@ # undef HAVE_DLFCN_H # undef HAVE_DL_H # undef HAVE_GETOPT_H +# undef HAVE_MALLOC_H # undef HAVE_LIBREADLINE # undef ENABLE_VVP_DEBUG @@ -47,6 +48,9 @@ /* * $Log: config.h.in,v $ + * Revision 1.7 2001/09/15 18:27:05 steve + * Make configure detect malloc.h + * * Revision 1.6 2001/07/16 18:40:19 steve * Add a stdlog output for vvp, and vvp options * to direct them around. (Stephan Boettcher.) diff --git a/vvp/configure.in b/vvp/configure.in index 73e4d00b2..1be691582 100644 --- a/vvp/configure.in +++ b/vvp/configure.in @@ -15,7 +15,7 @@ AC_PROG_INSTALL AC_ARG_ENABLE(vvp-debug, vvp-debug -- interactive debugger for VVP runtime., AC_DEFINE(ENABLE_VVP_DEBUG)) -AC_CHECK_HEADERS(getopt.h) +AC_CHECK_HEADERS(getopt.h malloc.h) AC_CHECK_SIZEOF(unsigned long) AC_CHECK_SIZEOF(unsigned) diff --git a/vvp/debug.cc b/vvp/debug.cc index 81f19b3e7..fb2bfecc9 100644 --- a/vvp/debug.cc +++ b/vvp/debug.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: debug.cc,v 1.6 2001/08/09 22:25:30 steve Exp $" +#ident "$Id: debug.cc,v 1.7 2001/09/15 18:27:05 steve Exp $" #endif /* @@ -38,7 +38,9 @@ # include # include # include +#ifdef HAVE_MALLOC_H # include +#endif static bool interact_flag = false; @@ -171,6 +173,9 @@ void breakpoint(void) #endif /* * $Log: debug.cc,v $ + * Revision 1.7 2001/09/15 18:27:05 steve + * Make configure detect malloc.h + * * Revision 1.6 2001/08/09 22:25:30 steve * Include functor address in debug functor print. * diff --git a/vvp/fvectors.cc b/vvp/fvectors.cc index 4de4dcbf5..77b5abfe4 100644 --- a/vvp/fvectors.cc +++ b/vvp/fvectors.cc @@ -17,12 +17,17 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: fvectors.cc,v 1.2 2001/08/09 19:38:23 steve Exp $" +#ident "$Id: fvectors.cc,v 1.3 2001/09/15 18:27:05 steve Exp $" #endif +# include "config.h" + # include "functor.h" # include +#ifdef HAVE_MALLOC_H # include +#endif +# include # include struct vvp_fvector_s { diff --git a/vvp/memory.cc b/vvp/memory.cc index a697408b7..82c36a110 100644 --- a/vvp/memory.cc +++ b/vvp/memory.cc @@ -18,14 +18,17 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: memory.cc,v 1.7 2001/09/11 01:54:58 steve Exp $" +#ident "$Id: memory.cc,v 1.8 2001/09/15 18:27:05 steve Exp $" #endif #include "memory.h" #include "symbols.h" #include "schedule.h" #include +#ifdef HAVE_MALLOC_H #include +#endif +#include #include diff --git a/vvp/parse_misc.cc b/vvp/parse_misc.cc index fe2c4ded6..3ea8483e2 100644 --- a/vvp/parse_misc.cc +++ b/vvp/parse_misc.cc @@ -17,13 +17,16 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: parse_misc.cc,v 1.6 2001/07/11 04:43:57 steve Exp $" +#ident "$Id: parse_misc.cc,v 1.7 2001/09/15 18:27:05 steve Exp $" #endif # include "parse_misc.h" # include "compile.h" # include +#ifdef HAVE_MALLOC_H # include +#endif +# include const char*yypath; unsigned yyline; @@ -95,6 +98,9 @@ void argv_sym_lookup(struct argv_s*obj) /* * $Log: parse_misc.cc,v $ + * Revision 1.7 2001/09/15 18:27:05 steve + * Make configure detect malloc.h + * * Revision 1.6 2001/07/11 04:43:57 steve * support postpone of $systask parameters. (Stephan Boettcher) * diff --git a/vvp/schedule.cc b/vvp/schedule.cc index 486d35dbd..81bf97135 100644 --- a/vvp/schedule.cc +++ b/vvp/schedule.cc @@ -17,14 +17,17 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: schedule.cc,v 1.11 2001/07/11 02:27:21 steve Exp $" +#ident "$Id: schedule.cc,v 1.12 2001/09/15 18:27:05 steve Exp $" #endif # include "schedule.h" # include "functor.h" # include "memory.h" # include "vthread.h" +#ifdef HAVE_MALLOC_H # include +#endif +# include # include # include @@ -357,6 +360,9 @@ void schedule_simulate(void) /* * $Log: schedule.cc,v $ + * Revision 1.12 2001/09/15 18:27:05 steve + * Make configure detect malloc.h + * * Revision 1.11 2001/07/11 02:27:21 steve * Add support for REadOnlySync and monitors. * diff --git a/vvp/udp.cc b/vvp/udp.cc index 47ad04842..3b504b030 100644 --- a/vvp/udp.cc +++ b/vvp/udp.cc @@ -18,14 +18,17 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: udp.cc,v 1.9 2001/08/09 19:38:23 steve Exp $" +#ident "$Id: udp.cc,v 1.10 2001/09/15 18:27:05 steve Exp $" #endif #include "udp.h" #include "schedule.h" #include "symbols.h" #include +#ifdef HAVE_MALLOC_H #include +#endif +#include #include void vvp_udp_s::set(vvp_ipoint_t ptr, functor_t fp, bool) @@ -361,6 +364,9 @@ void vvp_udp_s::compile_row_(udp_table_entry_t row, char *rchr) /* * $Log: udp.cc,v $ + * Revision 1.10 2001/09/15 18:27:05 steve + * Make configure detect malloc.h + * * Revision 1.9 2001/08/09 19:38:23 steve * Nets (wires) do not use their own functors. * Modifications to propagation of values. diff --git a/vvp/vpi_callback.cc b/vvp/vpi_callback.cc index 9c8a4a1c7..8bcfaec25 100644 --- a/vvp/vpi_callback.cc +++ b/vvp/vpi_callback.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: vpi_callback.cc,v 1.5 2001/08/08 01:05:06 steve Exp $" +#ident "$Id: vpi_callback.cc,v 1.6 2001/09/15 18:27:05 steve Exp $" #endif /* @@ -33,7 +33,10 @@ # include "functor.h" # include # include +#ifdef HAVE_MALLOC_H # include +#endif +# include const struct __vpirt callback_rt = { vpiCallback, @@ -257,6 +260,9 @@ void vpip_trip_monitor_callbacks(void) /* * $Log: vpi_callback.cc,v $ + * Revision 1.6 2001/09/15 18:27:05 steve + * Make configure detect malloc.h + * * Revision 1.5 2001/08/08 01:05:06 steve * Initial implementation of vvp_fvectors. * (Stephan Boettcher) diff --git a/vvp/vpi_const.cc b/vvp/vpi_const.cc index b31c291db..92bb1bf21 100644 --- a/vvp/vpi_const.cc +++ b/vvp/vpi_const.cc @@ -17,12 +17,15 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: vpi_const.cc,v 1.6 2001/08/08 00:57:20 steve Exp $" +#ident "$Id: vpi_const.cc,v 1.7 2001/09/15 18:27:05 steve Exp $" #endif # include "vpi_priv.h" # include +#ifdef HAVE_MALLOC_H # include +#endif +# include # include # include @@ -194,6 +197,9 @@ vpiHandle vpip_make_binary_const(unsigned wid, char*bits) /* * $Log: vpi_const.cc,v $ + * Revision 1.7 2001/09/15 18:27:05 steve + * Make configure detect malloc.h + * * Revision 1.6 2001/08/08 00:57:20 steve * Unused variable warnings. * diff --git a/vvp/vpi_priv.cc b/vvp/vpi_priv.cc index 5f6923a39..0a244d105 100644 --- a/vvp/vpi_priv.cc +++ b/vvp/vpi_priv.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: vpi_priv.cc,v 1.8 2001/07/11 02:27:21 steve Exp $" +#ident "$Id: vpi_priv.cc,v 1.9 2001/09/15 18:27:05 steve Exp $" #endif # include "vpi_priv.h" @@ -25,7 +25,10 @@ # include # include # include +#ifdef HAVE_MALLOC_H # include +#endif +# include /* * When a task is called, this value is set so that vpi_handle can @@ -151,6 +154,9 @@ extern "C" void vpi_sim_vcontrol(int operation, va_list ap) /* * $Log: vpi_priv.cc,v $ + * Revision 1.9 2001/09/15 18:27:05 steve + * Make configure detect malloc.h + * * Revision 1.8 2001/07/11 02:27:21 steve * Add support for REadOnlySync and monitors. * diff --git a/vvp/vpi_scope.cc b/vvp/vpi_scope.cc index 7a7055616..f8746840b 100644 --- a/vvp/vpi_scope.cc +++ b/vvp/vpi_scope.cc @@ -17,13 +17,16 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: vpi_scope.cc,v 1.6 2001/07/11 04:43:57 steve Exp $" +#ident "$Id: vpi_scope.cc,v 1.7 2001/09/15 18:27:05 steve Exp $" #endif # include "compile.h" # include "vpi_priv.h" # include "symbols.h" +#ifdef HAVE_MALLOC_H # include +#endif +# include # include static char* scope_get_str(int code, vpiHandle obj) @@ -134,6 +137,9 @@ void vpip_attach_to_current_scope(vpiHandle obj) /* * $Log: vpi_scope.cc,v $ + * Revision 1.7 2001/09/15 18:27:05 steve + * Make configure detect malloc.h + * * Revision 1.6 2001/07/11 04:43:57 steve * support postpone of $systask parameters. (Stephan Boettcher) * diff --git a/vvp/vpi_signal.cc b/vvp/vpi_signal.cc index 5bd26d86f..ee237656f 100644 --- a/vvp/vpi_signal.cc +++ b/vvp/vpi_signal.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: vpi_signal.cc,v 1.23 2001/08/09 19:38:23 steve Exp $" +#ident "$Id: vpi_signal.cc,v 1.24 2001/09/15 18:27:05 steve Exp $" #endif /* @@ -28,7 +28,10 @@ # include "vpi_priv.h" # include "functor.h" # include +#ifdef HAVE_MALLOC_H # include +#endif +# include # include # include @@ -496,6 +499,9 @@ vpiHandle vpip_make_net(char*name, int msb, int lsb, bool signed_flag, /* * $Log: vpi_signal.cc,v $ + * Revision 1.24 2001/09/15 18:27:05 steve + * Make configure detect malloc.h + * * Revision 1.23 2001/08/09 19:38:23 steve * Nets (wires) do not use their own functors. * Modifications to propagation of values. diff --git a/vvp/vpi_tasks.cc b/vvp/vpi_tasks.cc index ef5f98ab8..17dff764c 100644 --- a/vvp/vpi_tasks.cc +++ b/vvp/vpi_tasks.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: vpi_tasks.cc,v 1.9 2001/08/03 06:50:44 steve Exp $" +#ident "$Id: vpi_tasks.cc,v 1.10 2001/09/15 18:27:05 steve Exp $" #endif /* @@ -28,7 +28,10 @@ # include "vpi_priv.h" # include "vthread.h" # include +#ifdef HAVE_MALLOC_H # include +#endif +# include # include # include @@ -329,6 +332,9 @@ void vpi_register_systf(const struct t_vpi_systf_data*ss) /* * $Log: vpi_tasks.cc,v $ + * Revision 1.10 2001/09/15 18:27:05 steve + * Make configure detect malloc.h + * * Revision 1.9 2001/08/03 06:50:44 steve * Detect system function used as a task. * diff --git a/vvp/vpi_vthr_vector.cc b/vvp/vpi_vthr_vector.cc index 23f8deece..775abd99a 100644 --- a/vvp/vpi_vthr_vector.cc +++ b/vvp/vpi_vthr_vector.cc @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: vpi_vthr_vector.cc,v 1.2 2001/05/20 00:40:12 steve Exp $" +#ident "$Id: vpi_vthr_vector.cc,v 1.3 2001/09/15 18:27:05 steve Exp $" #endif /* @@ -29,7 +29,10 @@ # include "vpi_priv.h" # include "vthread.h" # include +#ifdef HAVE_MALLOC_H # include +#endif +# include # include struct __vpiVThrVec { @@ -345,6 +348,9 @@ vpiHandle vpip_make_vthr_vector(unsigned base, unsigned wid) /* * $Log: vpi_vthr_vector.cc,v $ + * Revision 1.3 2001/09/15 18:27:05 steve + * Make configure detect malloc.h + * * Revision 1.2 2001/05/20 00:40:12 steve * Get bit ordering right when making decimal strings. * diff --git a/vvp/vthread.cc b/vvp/vthread.cc index c5f4961a5..956fbac5f 100644 --- a/vvp/vthread.cc +++ b/vvp/vthread.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: vthread.cc,v 1.54 2001/09/07 23:29:28 steve Exp $" +#ident "$Id: vthread.cc,v 1.55 2001/09/15 18:27:05 steve Exp $" #endif # include "vthread.h" @@ -26,7 +26,10 @@ # include "schedule.h" # include "functor.h" # include "vpi_priv.h" +#ifdef HAVE_MALLOC_H # include +#endif +# include # include # include @@ -1353,6 +1356,9 @@ bool of_ZOMBIE(vthread_t thr, vvp_code_t) /* * $Log: vthread.cc,v $ + * Revision 1.55 2001/09/15 18:27:05 steve + * Make configure detect malloc.h + * * Revision 1.54 2001/09/07 23:29:28 steve * Redo of_SUBU in a more obvious algorithm, that * is not significantly slower. Also, clean up the