diff --git a/Attrib.cc b/Attrib.cc index ee93d1814..b2565dfe5 100644 --- a/Attrib.cc +++ b/Attrib.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 Stephen Williams (steve@icarus.com) + * Copyright (c) 2000-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -20,7 +20,7 @@ # include "config.h" # include "Attrib.h" -# include +# include Attrib::Attrib() { diff --git a/HName.cc b/HName.cc index f1194aaf2..d18c3090b 100644 --- a/HName.cc +++ b/HName.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001 Stephen Williams (steve@icarus.com) + * Copyright (c) 2001-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -23,9 +23,6 @@ # include # include # include -#ifdef HAVE_MALLOC_H -# include -#endif hname_t::hname_t() @@ -116,4 +113,3 @@ ostream& operator<< (ostream&out, const hname_t&that) return out; } - diff --git a/Module.cc b/Module.cc index 774dfdbf7..ad75caaeb 100644 --- a/Module.cc +++ b/Module.cc @@ -22,7 +22,7 @@ # include "Module.h" # include "PGate.h" # include "PWire.h" -# include +# include /* n is a permallocated string. */ Module::Module(perm_string n) diff --git a/PGate.cc b/PGate.cc index 76950cef3..822f6be2a 100644 --- a/PGate.cc +++ b/PGate.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2007 Stephen Williams (steve@icarus.com) + * Copyright (c) 1999-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -22,7 +22,7 @@ # include "PGate.h" # include "PExpr.h" # include "verinum.h" -# include +# include PGate::PGate(perm_string name, svector*pins, @@ -189,4 +189,3 @@ perm_string PGModule::get_type() { return type_; } - diff --git a/PWire.cc b/PWire.cc index 4ad7fb391..911c2d537 100644 --- a/PWire.cc +++ b/PWire.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 1999-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -20,7 +20,7 @@ # include "config.h" # include "PWire.h" # include "PExpr.h" -# include +# include PWire::PWire(perm_string n, NetNet::Type t, diff --git a/StringHeap.cc b/StringHeap.cc index 5ac7006da..8b8b0cde1 100644 --- a/StringHeap.cc +++ b/StringHeap.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2002-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -18,12 +18,9 @@ */ # include "StringHeap.h" -#ifdef HAVE_MALLOC_H -# include -#endif -# include -# include -# include +# include +# include +# include #ifdef CHECK_WITH_VALGRIND static char **string_pool = NULL; diff --git a/async.cc b/async.cc index 0db7d7bec..89c3fccfb 100644 --- a/async.cc +++ b/async.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2008 Stephen Williams (steve@icarus.com) + * Copyright (c) 2002-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -21,7 +21,7 @@ # include "functor.h" # include "netlist.h" -# include +# include bool NetAssign::is_asynchronous() { diff --git a/cadpli/cadpli.c b/cadpli/cadpli.c index 073d2fef6..6e25c324c 100644 --- a/cadpli/cadpli.c +++ b/cadpli/cadpli.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2008 Stephen Williams (steve@icarus.com) + * Copyright (c) 2003-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -20,9 +20,6 @@ # include # include # include -#ifdef HAVE_MALLOC_H -# include -#endif # include # include # include "config.h" diff --git a/config.h.in b/config.h.in index 3b5eadcbd..cce688618 100644 --- a/config.h.in +++ b/config.h.in @@ -36,7 +36,6 @@ # undef HAVE_GETOPT_H # undef HAVE_INTTYPES_H # undef HAVE_LIBIBERTY_H -# undef HAVE_MALLOC_H # undef HAVE_DLFCN_H # undef HAVE_DL_H # undef HAVE_FCHMOD diff --git a/configure.in b/configure.in index e0c60d5d8..2e53c2e36 100644 --- a/configure.in +++ b/configure.in @@ -65,7 +65,7 @@ AC_LANG(C++) AC_CHECK_DECL(__SUNPRO_CC,AC_SUBST(WARNING_CXXFLAGS,),AC_SUBST(WARNING_CXXFLAGS,-Wall)) AC_CHECK_DECL(__SUNPRO_CC,AC_SUBST(DEPENDENCY_CPPFLAGS,-xMD),AC_SUBST(DEPENDENCY_CPPFLAGS,-MD)) -AC_CHECK_HEADERS(getopt.h malloc.h inttypes.h libiberty.h iosfwd sys/wait.h) +AC_CHECK_HEADERS(getopt.h inttypes.h libiberty.h iosfwd sys/wait.h) AC_CHECK_SIZEOF(unsigned long long) AC_CHECK_SIZEOF(unsigned long) diff --git a/driver/substit.c b/driver/substit.c index 7501d2db5..ac744deae 100644 --- a/driver/substit.c +++ b/driver/substit.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2002-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -20,9 +20,6 @@ # include # include # include -#ifdef HAVE_MALLOC_H -# include -#endif char* substitutions(const char*str) diff --git a/dup_expr.cc b/dup_expr.cc index 45ad48d5d..49eef2dfd 100644 --- a/dup_expr.cc +++ b/dup_expr.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2008 Stephen Williams (steve@icarus.com) + * Copyright (c) 1999-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -21,7 +21,7 @@ # include "netlist.h" # include -# include +# include # include "ivl_assert.h" NetEAccess* NetEAccess::dup_expr() const diff --git a/elab_scope.cc b/elab_scope.cc index f4f54f541..03ecb9325 100644 --- a/elab_scope.cc +++ b/elab_scope.cc @@ -23,7 +23,7 @@ # include # include # include -# include +# include /* * Elaboration happens in two passes, generally. The first scans the @@ -44,7 +44,7 @@ # include "netlist.h" # include "util.h" # include -# include +# include # include "ivl_assert.h" typedef map::const_iterator mparm_it_t; diff --git a/eval_attrib.cc b/eval_attrib.cc index c0c7cc23d..7544292cc 100644 --- a/eval_attrib.cc +++ b/eval_attrib.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2004 Stephen Williams (steve@icarus.com) + * Copyright (c) 2002-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -22,7 +22,7 @@ # include "PExpr.h" # include "netlist.h" # include -# include +# include /* * The evaluate_attributes function evaluates the attribute @@ -72,4 +72,3 @@ attrib_list_t* evaluate_attributes(const map&att, assert(idx == natt); return table; } - diff --git a/eval_tree.cc b/eval_tree.cc index af082a331..38c37dca3 100644 --- a/eval_tree.cc +++ b/eval_tree.cc @@ -23,7 +23,7 @@ # include # include # include -# include +# include # include "netlist.h" # include "ivl_assert.h" diff --git a/ivl_assert.h b/ivl_assert.h index c32683d0f..1a1aa8a16 100644 --- a/ivl_assert.h +++ b/ivl_assert.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007 Stephen Williams (steve@icarus.com) + * Copyright (c) 2007-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -20,7 +20,7 @@ #ifndef __ivl_assert_h #define __ivl_assert_h -# include +# include #define ivl_assert(tok, expression) \ do { \ diff --git a/ivlpp/lexor.lex b/ivlpp/lexor.lex index cf2f03ef9..f5c293380 100644 --- a/ivlpp/lexor.lex +++ b/ivlpp/lexor.lex @@ -21,9 +21,6 @@ # include "config.h" # include -#ifdef HAVE_MALLOC_H -# include -#endif # include # include # include diff --git a/ivlpp/main.c b/ivlpp/main.c index b256fb632..e16e9b8cb 100644 --- a/ivlpp/main.c +++ b/ivlpp/main.c @@ -39,9 +39,6 @@ const char NOTICE[] = # include # include -#ifdef HAVE_MALLOC_H -# include -#endif # include # include # include diff --git a/lexor.lex b/lexor.lex index c3937fc64..946445376 100644 --- a/lexor.lex +++ b/lexor.lex @@ -4,7 +4,7 @@ %{ /* - * Copyright (c) 1998-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 1998-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -31,8 +31,8 @@ # include "parse_misc.h" # include "parse_api.h" # include "parse.h" -# include -# include +# include +# include # include "lexor_keyword.h" # include "discipline.h" # include diff --git a/lexor_keyword.gperf b/lexor_keyword.gperf index 5ba577a71..83681aba3 100644 --- a/lexor_keyword.gperf +++ b/lexor_keyword.gperf @@ -4,7 +4,7 @@ #include "config.h" #include "parse_misc.h" #include "parse.h" -#include +#include #include "lexor_keyword.h" #include "compiler.h" diff --git a/libveriuser/a_vcl.c b/libveriuser/a_vcl.c index 40fff5f28..9594480aa 100644 --- a/libveriuser/a_vcl.c +++ b/libveriuser/a_vcl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2003-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -20,9 +20,6 @@ #include #include #include -#ifdef HAVE_MALLOC_H -#include -#endif #include "priv.h" #include diff --git a/libveriuser/workarea.c b/libveriuser/workarea.c index ec2a36ed9..bf722d491 100644 --- a/libveriuser/workarea.c +++ b/libveriuser/workarea.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002 Stephen Williams (steve@icarus.com) + * Copyright (c) 2002-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -16,16 +16,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#ifdef HAVE_CVS_IDENT -#ident "$Id: workarea.c,v 1.1 2002/12/19 21:37:04 steve Exp $" -#endif # include # include # include -#ifdef HAVE_MALLOC_H -# include -#endif /* * Keep a list of sys handle to work area bindings. @@ -82,13 +76,3 @@ PLI_BYTE8* tf_getworkarea(void) return 0; } - -/* - * $Log: workarea.c,v $ - * Revision 1.1 2002/12/19 21:37:04 steve - * Add tf_message, tf_get/setworkarea, and - * ty_typep functions, along with defines - * related to these functions. - * - */ - diff --git a/load_module.cc b/load_module.cc index 7d7d8d7bc..d95827c31 100644 --- a/load_module.cc +++ b/load_module.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2001-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -28,8 +28,8 @@ # include # include # include -# include -# include +# include +# include /* * The module library items are maps of key names to file name within diff --git a/main.cc b/main.cc index def4bbcb3..410c243d3 100644 --- a/main.cc +++ b/main.cc @@ -1,4 +1,3 @@ - const char COPYRIGHT[] = "Copyright (c) 1998-2010 Stephen Williams (steve@icarus.com)"; @@ -39,7 +38,7 @@ const char NOTICE[] = " 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" ; -# include +# include # include # include # include @@ -47,7 +46,7 @@ const char NOTICE[] = # include # include # include -# include +# include #if defined(HAVE_TIMES) # include #endif diff --git a/net_link.cc b/net_link.cc index 2b092eb61..eb4ab2b1a 100644 --- a/net_link.cc +++ b/net_link.cc @@ -26,9 +26,7 @@ # include # include # include -#ifdef HAVE_MALLOC_H -# include -#endif +# include void connect(Nexus*l, Link&r) { diff --git a/net_proc.cc b/net_proc.cc index b79b7bd88..3ccccb9eb 100644 --- a/net_proc.cc +++ b/net_proc.cc @@ -20,7 +20,7 @@ # include "config.h" # include "netlist.h" -# include +# include NetBlock::NetBlock(Type t, NetScope*ss) : type_(t), subscope_(ss), last_(0) diff --git a/parse_api.h b/parse_api.h index ba23c564e..05e6a09a2 100644 --- a/parse_api.h +++ b/parse_api.h @@ -1,7 +1,7 @@ #ifndef __parse_api_H #define __parse_api_H /* - * Copyright (c) 2001-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2001-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -# include +# include # include "StringHeap.h" # include # include diff --git a/pform.cc b/pform.cc index f4462ea1a..17b4a7e73 100644 --- a/pform.cc +++ b/pform.cc @@ -30,7 +30,7 @@ # include "discipline.h" # include # include -# include +# include # include # include # include diff --git a/pform.h b/pform.h index 11f7ec147..147758240 100644 --- a/pform.h +++ b/pform.h @@ -1,7 +1,7 @@ #ifndef __pform_H #define __pform_H /* - * Copyright (c) 1998-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 1998-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -35,7 +35,7 @@ # include # include # include -# include +# include /* * These classes implement the parsed form (P-form for short) of the diff --git a/svector.h b/svector.h index c0f262e4c..8681e510d 100644 --- a/svector.h +++ b/svector.h @@ -1,7 +1,7 @@ #ifndef __svector_H #define __svector_H /* - * Copyright (c) 1999-2008 Stephen Williams (steve@icarus.com) + * Copyright (c) 1999-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -24,7 +24,7 @@ # include "config.h" # include # include -# include +# include /* * This is a way simplified vector class that cannot grow or shrink, diff --git a/symbol_search.cc b/symbol_search.cc index b7706d7c9..f6ed3f527 100644 --- a/symbol_search.cc +++ b/symbol_search.cc @@ -19,7 +19,7 @@ # include "netlist.h" # include "netmisc.h" -# include +# include /* diff --git a/syn-rules.y b/syn-rules.y index dc06414a9..8e8fd41ae 100644 --- a/syn-rules.y +++ b/syn-rules.y @@ -34,7 +34,7 @@ # include "netlist.h" # include "netmisc.h" # include "functor.h" -# include +# include struct syn_token_t { int token; diff --git a/sync.cc b/sync.cc index b720dc6d5..019034713 100644 --- a/sync.cc +++ b/sync.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2008 Stephen Williams (steve@icarus.com) + * Copyright (c) 2002-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -21,7 +21,7 @@ # include "functor.h" # include "netlist.h" -# include +# include /* * Most process statements are not roots of synchronous logic. diff --git a/synth2.cc b/synth2.cc index d99e8e54b..4b48450f1 100644 --- a/synth2.cc +++ b/synth2.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2008 Stephen Williams (steve@icarus.com) + * Copyright (c) 2002-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -23,7 +23,7 @@ # include "netlist.h" # include "netmisc.h" # include "compiler.h" -# include +# include bool NetProc::synth_async(Design*des, NetScope*scope, diff --git a/sys_funcs.cc b/sys_funcs.cc index 4d2002606..08dfbdf3c 100644 --- a/sys_funcs.cc +++ b/sys_funcs.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2004-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -19,7 +19,7 @@ # include "config.h" # include "compiler.h" -# include +# include # include # include diff --git a/t-dll-analog.cc b/t-dll-analog.cc index ff0f8c43b..7d37be0a3 100644 --- a/t-dll-analog.cc +++ b/t-dll-analog.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008 Stephen Williams (steve@icarus.com) + * Copyright (c) 2008-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -27,10 +27,7 @@ # include "ivl_target.h" # include "compiler.h" # include "t-dll.h" -#ifdef HAVE_MALLOC_H -# include -#endif -# include +# include bool dll_target::process(const NetAnalogTop*net) { diff --git a/t-dll-api.cc b/t-dll-api.cc index 8f6d19db3..22cbbc5eb 100644 --- a/t-dll-api.cc +++ b/t-dll-api.cc @@ -21,12 +21,9 @@ # include "StringHeap.h" # include "t-dll.h" # include "discipline.h" -# include -# include -# include -#ifdef HAVE_MALLOC_H -# include -#endif +# include +# include +# include static StringHeap api_strings; diff --git a/t-dll-expr.cc b/t-dll-expr.cc index e67caca11..0daaaa48d 100644 --- a/t-dll-expr.cc +++ b/t-dll-expr.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2000-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -24,11 +24,8 @@ # include # include "t-dll.h" # include "netlist.h" -# include -#ifdef HAVE_MALLOC_H -# include -#endif -# include +# include +# include /* * This is a little convenience function for converting a NetExpr diff --git a/t-dll-proc.cc b/t-dll-proc.cc index dd4fa4664..c0581a6ca 100644 --- a/t-dll-proc.cc +++ b/t-dll-proc.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2000-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -27,10 +27,7 @@ # include "ivl_target.h" # include "compiler.h" # include "t-dll.h" -#ifdef HAVE_MALLOC_H -# include -#endif -# include +# include bool dll_target::process(const NetProcTop*net) { diff --git a/t-dll.cc b/t-dll.cc index babe9e759..e20860b2c 100644 --- a/t-dll.cc +++ b/t-dll.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2000-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -22,15 +22,12 @@ # include # include -# include // sprintf() +# include // sprintf() # include "compiler.h" # include "t-dll.h" # include "netmisc.h" # include "discipline.h" -#ifdef HAVE_MALLOC_H -# include -#endif -# include +# include # include "ivl_assert.h" struct dll_target dll_target_obj; diff --git a/tgt-fpga/d-generic-edif.c b/tgt-fpga/d-generic-edif.c index b998eb350..433bf55f1 100644 --- a/tgt-fpga/d-generic-edif.c +++ b/tgt-fpga/d-generic-edif.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001 Stephen Williams (steve@icarus.com) + * Copyright (c) 2001-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -16,17 +16,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#ifdef HAVE_CVS_IDENT -#ident "$Id: d-generic-edif.c,v 1.18 2004/10/04 01:10:56 steve Exp $" -#endif # include "device.h" # include "fpga_priv.h" # include # include -#ifdef HAVE_MALLOC_H -# include -#endif # include struct nexus_recall { @@ -473,72 +467,3 @@ const struct device_s d_generic_edif = { 0, /* show_shiftl */ 0 /* show_shiftr */ }; - - -/* - * $Log: d-generic-edif.c,v $ - * Revision 1.18 2004/10/04 01:10:56 steve - * Clean up spurious trailing white space. - * - * Revision 1.17 2003/11/12 03:20:14 steve - * devices need show_cmp_gt - * - * Revision 1.16 2003/07/02 00:48:03 steve - * No longer export generic-edif functions. - * - * Revision 1.15 2003/06/24 03:55:00 steve - * Add ivl_synthesis_cell support for virtex2. - * - * Revision 1.14 2003/06/17 03:47:41 steve - * Handle bufz as buf in generic fpga/edif target. - * - * Revision 1.13 2003/02/26 01:24:42 steve - * ivl_lpm_name is obsolete. - * - * Revision 1.12 2002/11/01 02:36:22 steve - * Give nets better names, if available. - * - * Revision 1.11 2002/10/30 03:58:45 steve - * Fix up left shift to pass compile, - * fix up ADD/SUB to generate missing pieces, - * Add the asynch set/reset to DFF devices. - * - * Revision 1.10 2002/10/28 02:05:56 steve - * Add Virtex code generators for left shift, - * subtraction, and GE comparators. - * - * Revision 1.9 2002/08/12 01:35:02 steve - * conditional ident string using autoconfig. - * - * Revision 1.8 2002/08/11 23:47:04 steve - * Add missing Log and Ident strings. - * - * Revision 1.7 2001/09/16 01:48:16 steve - * Suppor the PAD attribute on signals. - * - * 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. - * - * Revision 1.4 2001/09/09 22:23:28 steve - * Virtex support for mux devices and adders - * with carry chains. Also, make Virtex specific - * implementations of primitive logic. - * - * Revision 1.3 2001/09/06 04:28:40 steve - * Separate the virtex and generic-edif code generators. - * - * Revision 1.2 2001/09/02 23:53:55 steve - * Add virtex support for some basic logic, the DFF - * and constant signals. - * - * Revision 1.1 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. - * - * Start into the virtex EDIF output driver. - * - */ - diff --git a/tgt-fpga/d-virtex.c b/tgt-fpga/d-virtex.c index 11b12ebc6..d208b4216 100644 --- a/tgt-fpga/d-virtex.c +++ b/tgt-fpga/d-virtex.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 Stephen Williams (steve@icarus.com) + * Copyright (c) 2003-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -16,9 +16,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#ifdef HAVE_CVS_IDENT -#ident "$Id: d-virtex.c,v 1.35 2004/10/04 01:10:56 steve Exp $" -#endif # include "device.h" # include "fpga_priv.h" @@ -27,9 +24,6 @@ # include "xilinx.h" # include # include -#ifdef HAVE_MALLOC_H -# include -#endif # include /* @@ -842,50 +836,3 @@ const struct device_s d_virtex_edif = { xilinx_shiftl, 0 /* show_shiftr */ }; - - -/* - * $Log: d-virtex.c,v $ - * Revision 1.35 2004/10/04 01:10:56 steve - * Clean up spurious trailing white space. - * - * Revision 1.34 2004/02/15 18:03:30 steve - * Cleanup of warnings. - * - * Revision 1.33 2003/11/12 03:20:14 steve - * devices need show_cmp_gt - * - * Revision 1.32 2003/08/15 02:23:53 steve - * Add synthesis support for synchronous reset. - * - * Revision 1.31 2003/07/04 00:10:09 steve - * Generate MUXF5 based 4-input N-wide muxes. - * - * Revision 1.30 2003/07/02 03:02:15 steve - * More xilinx common code. - * - * Revision 1.29 2003/07/02 02:58:18 steve - * Remember to set INIT on wide-or trailing luts. - * - * Revision 1.28 2003/06/30 19:21:21 steve - * lut3 for 3input wide or. - * - * Revision 1.27 2003/06/28 04:18:47 steve - * Add support for wide OR/NOR gates. - * - * Revision 1.26 2003/06/26 03:57:05 steve - * Add Xilinx support for A/B MUX devices. - * - * Revision 1.25 2003/06/25 02:55:57 steve - * Virtex and Virtex2 share much code. - * - * Revision 1.24 2003/06/25 01:49:06 steve - * Spelling fixes. - * - * Revision 1.23 2003/06/24 03:55:00 steve - * Add ivl_synthesis_cell support for virtex2. - * - * Revision 1.22 2003/02/26 01:24:42 steve - * ivl_lpm_name is obsolete. - */ - diff --git a/tgt-fpga/d-virtex2.c b/tgt-fpga/d-virtex2.c index b59144f91..3c154fdc0 100644 --- a/tgt-fpga/d-virtex2.c +++ b/tgt-fpga/d-virtex2.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001 Stephen Williams (steve@icarus.com) + * Copyright (c) 2001-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -16,9 +16,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#ifdef HAVE_CVS_IDENT -#ident "$Id: d-virtex2.c,v 1.20 2004/10/04 01:10:57 steve Exp $" -#endif # include "device.h" # include "fpga_priv.h" @@ -27,9 +24,6 @@ # include "xilinx.h" # include # include -#ifdef HAVE_MALLOC_H -# include -#endif # include @@ -91,38 +85,3 @@ const struct device_s d_virtex2_edif = { xilinx_shiftl, /* show_shiftl */ 0 /* show_shiftr */ }; - - -/* - * $Log: d-virtex2.c,v $ - * Revision 1.20 2004/10/04 01:10:57 steve - * Clean up spurious trailing white space. - * - * Revision 1.19 2003/11/12 03:20:14 steve - * devices need show_cmp_gt - * - * Revision 1.18 2003/07/04 00:10:09 steve - * Generate MUXF5 based 4-input N-wide muxes. - * - * Revision 1.17 2003/07/02 03:02:15 steve - * More xilinx common code. - * - * Revision 1.16 2003/06/28 04:18:47 steve - * Add support for wide OR/NOR gates. - * - * Revision 1.15 2003/06/26 03:57:05 steve - * Add Xilinx support for A/B MUX devices. - * - * Revision 1.14 2003/06/25 02:55:57 steve - * Virtex and Virtex2 share much code. - * - * Revision 1.13 2003/06/25 01:49:06 steve - * Spelling fixes. - * - * Revision 1.12 2003/06/25 01:46:44 steve - * Virtex support for NOT gates. - * - * Revision 1.11 2003/06/24 03:55:00 steve - * Add ivl_synthesis_cell support for virtex2. - */ - diff --git a/tgt-fpga/edif.c b/tgt-fpga/edif.c index 2cba3bc07..a77451e22 100644 --- a/tgt-fpga/edif.c +++ b/tgt-fpga/edif.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 200Stephen Williams (steve@icarus.com) + * Copyright (c) 2003-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -16,16 +16,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#ifdef HAVE_CVS_IDENT -#ident "$Id: edif.c,v 1.8 2003/09/03 23:34:09 steve Exp $" -#endif # include "edif.h" # include # include -#ifdef HAVE_MALLOC_H -# include -#endif # include typedef enum property_e { @@ -614,33 +608,3 @@ void edif_print(FILE*fd, edif_t edf) fprintf(fd, ")\n"); fflush(fd); } - -/* - * $Log: edif.c,v $ - * Revision 1.8 2003/09/03 23:34:09 steve - * Support synchronous set of LPM_FF devices. - * - * Revision 1.7 2003/08/07 05:18:04 steve - * Add support for OR/NOR/bufif0/bufif1. - * - * Revision 1.6 2003/08/07 04:04:01 steve - * Add an LPM device type. - * - * Revision 1.5 2003/06/24 03:55:00 steve - * Add ivl_synthesis_cell support for virtex2. - * - * Revision 1.4 2003/04/04 04:59:03 steve - * Add xlibrary celltable. - * - * Revision 1.3 2003/03/30 03:43:44 steve - * Handle wide ports of macros. - * - * Revision 1.2 2003/03/24 02:29:04 steve - * Give proper basenames to PAD signals. - * - * Revision 1.1 2003/03/24 00:47:54 steve - * Add new virtex2 architecture family, and - * also the new edif.h EDIF management functions. - * - */ - diff --git a/tgt-fpga/mangle.c b/tgt-fpga/mangle.c index 020b836e0..03af19de3 100644 --- a/tgt-fpga/mangle.c +++ b/tgt-fpga/mangle.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001 Stephen Williams (steve@icarus.com) + * Copyright (c) 2001-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -16,15 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#ifdef HAVE_CVS_IDENT -#ident "$Id: mangle.c,v 1.6 2002/08/12 01:35:03 steve Exp $" -#endif # 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) @@ -95,29 +89,3 @@ const char* xnf_mangle_nexus_name(ivl_nexus_t net) ivl_nexus_set_private(net, name); return name; } - -/* - * $Log: mangle.c,v $ - * Revision 1.6 2002/08/12 01:35:03 steve - * conditional ident string using autoconfig. - * - * Revision 1.5 2002/08/11 23:47:04 steve - * Add missing Log and Ident strings. - * - * 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. - * - * Start into the virtex EDIF output driver. - * - * Revision 1.2 2001/08/30 04:31:05 steve - * Mangle nexus names. - * - * Revision 1.1 2001/08/28 04:14:20 steve - * Add the fpga target. - * - */ - diff --git a/tgt-fpga/xilinx.c b/tgt-fpga/xilinx.c index 370350c42..1efe9f11a 100644 --- a/tgt-fpga/xilinx.c +++ b/tgt-fpga/xilinx.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003 Stephen Williams (steve at icarus.com) + * Copyright (c) 2003-2010 Stephen Williams (steve at icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -16,9 +16,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#ifdef HAVE_CVS_IDENT -#ident "$Id: xilinx.c,v 1.13 2007/02/26 19:49:50 steve Exp $" -#endif # include "edif.h" # include "generic.h" @@ -26,9 +23,6 @@ # include "fpga_priv.h" # include # include -#ifdef HAVE_MALLOC_H -# include -#endif # include edif_cell_t xilinx_cell_buf(edif_xlibrary_t xlib) @@ -947,48 +941,3 @@ void xilinx_shiftl(ivl_lpm_t net) free(cells); free(table); } - - -/* - * $Log: xilinx.c,v $ - * Revision 1.13 2007/02/26 19:49:50 steve - * Spelling fixes (larry doolittle) - * - * Revision 1.12 2004/02/15 18:03:30 steve - * Cleanup of warnings. - * - * Revision 1.11 2004/02/10 16:39:33 steve - * Fix direction of Q/D signals of FD devices. - * - * Revision 1.10 2003/08/15 02:23:53 steve - * Add synthesis support for synchronous reset. - * - * Revision 1.9 2003/07/04 01:08:03 steve - * PAD attribute can be used to assign pins. - * - * Revision 1.8 2003/07/04 00:10:09 steve - * Generate MUXF5 based 4-input N-wide muxes. - * - * Revision 1.7 2003/07/03 17:46:33 steve - * IOPAD support. - * - * Revision 1.6 2003/07/02 03:02:15 steve - * More xilinx common code. - * - * Revision 1.5 2003/07/02 00:25:40 steve - * Add xilinx support for bufif1. - * - * Revision 1.4 2003/06/28 04:18:47 steve - * Add support for wide OR/NOR gates. - * - * Revision 1.3 2003/06/26 03:57:05 steve - * Add Xilinx support for A/B MUX devices. - * - * Revision 1.2 2003/06/25 02:55:57 steve - * Virtex and Virtex2 share much code. - * - * Revision 1.1 2003/04/05 05:53:34 steve - * Move library cell management to common file. - * - */ - diff --git a/tgt-pal/emit_jed.c b/tgt-pal/emit_jed.c index 7a74ff127..29066ba6e 100644 --- a/tgt-pal/emit_jed.c +++ b/tgt-pal/emit_jed.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001 Stephen Williams (steve@icarus.com) + * Copyright (c) 2001-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -16,17 +16,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#ifdef HAVE_CVS_IDENT -#ident "$Id: emit_jed.c,v 1.5 2002/08/12 01:35:03 steve Exp $" -#endif # include "config.h" # include "priv.h" # include -#ifdef HAVE_MALLOC_H -# include -#endif # include # include @@ -131,24 +125,3 @@ int emit_jedec(const char*path) fclose(jfd); return 0; } - -/* - * $Log: emit_jed.c,v $ - * Revision 1.5 2002/08/12 01:35:03 steve - * conditional ident string using autoconfig. - * - * 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) - * - * Revision 1.2 2001/01/09 04:41:32 steve - * Clean up the jedec header that is written. - * - * Revision 1.1 2001/01/09 03:10:48 steve - * Generate the jedec to configure the macrocells. - * - */ - diff --git a/tgt-pal/imain.c b/tgt-pal/imain.c index 1bc1c84e2..ea0ee112a 100644 --- a/tgt-pal/imain.c +++ b/tgt-pal/imain.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 Stephen Williams (steve@icarus.com) + * Copyright (c) 2000-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -16,9 +16,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#ifdef HAVE_CVS_IDENT -#ident "$Id: imain.c,v 1.11 2002/08/12 01:35:03 steve Exp $" -#endif # include "config.h" @@ -28,9 +25,6 @@ # include "priv.h" -#ifdef HAVE_MALLOC_H -# include -#endif # include # include # include @@ -146,45 +140,3 @@ int target_design(ivl_design_t des) pal_free(pal); return 0; } - -/* - * $Log: imain.c,v $ - * Revision 1.11 2002/08/12 01:35:03 steve - * conditional ident string using autoconfig. - * - * Revision 1.10 2001/09/30 16:45:10 steve - * Fix some Cygwin DLL handling. (Venkat Iyer) - * - * 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) - * - * Revision 1.7 2001/05/20 15:09:40 steve - * Mingw32 support (Venkat Iyer) - * - * Revision 1.6 2001/01/15 00:05:39 steve - * Add client data pointer for scope and process scanners. - * - * Revision 1.5 2001/01/09 03:10:48 steve - * Generate the jedec to configure the macrocells. - * - * Revision 1.4 2000/12/14 23:37:47 steve - * Start support for fitting the logic. - * - * Revision 1.3 2000/12/09 05:40:42 steve - * documentation... - * - * Revision 1.2 2000/12/09 03:42:52 steve - * Stuff registers into macrocells. - * - * Revision 1.1 2000/12/09 01:17:38 steve - * Add the pal loadable target. - * - * Revision 1.1 2000/12/02 04:50:32 steve - * Make the null target into a loadable target. - * - */ - diff --git a/tgt-vhdl/vhdl_config.h.in b/tgt-vhdl/vhdl_config.h.in index dbb221b9e..6edca4562 100644 --- a/tgt-vhdl/vhdl_config.h.in +++ b/tgt-vhdl/vhdl_config.h.in @@ -3,9 +3,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the header file. */ -#undef HAVE_MALLOC_H - /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H diff --git a/tgt-vvp/draw_net_input.c b/tgt-vvp/draw_net_input.c index 98593227f..6c792511a 100644 --- a/tgt-vvp/draw_net_input.c +++ b/tgt-vvp/draw_net_input.c @@ -18,9 +18,6 @@ */ # include "vvp_priv.h" -#ifdef HAVE_MALLOC_H -# include -#endif # include # include # include diff --git a/tgt-vvp/draw_switch.c b/tgt-vvp/draw_switch.c index 235106cbc..3799b6e11 100644 --- a/tgt-vvp/draw_switch.c +++ b/tgt-vvp/draw_switch.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008 Stephen Williams (steve@icarus.com) + * Copyright (c) 2008-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -19,9 +19,6 @@ # include "vvp_priv.h" # include -#ifdef HAVE_MALLOC_H -# include -#endif # include # include diff --git a/tgt-vvp/draw_ufunc.c b/tgt-vvp/draw_ufunc.c index 55b3c2a63..ebe939aae 100644 --- a/tgt-vvp/draw_ufunc.c +++ b/tgt-vvp/draw_ufunc.c @@ -19,9 +19,6 @@ # include "vvp_priv.h" # include -#ifdef HAVE_MALLOC_H -# include -#endif # include # include diff --git a/tgt-vvp/draw_vpi.c b/tgt-vvp/draw_vpi.c index 94d8e851f..22ddabb9c 100644 --- a/tgt-vvp/draw_vpi.c +++ b/tgt-vvp/draw_vpi.c @@ -19,9 +19,6 @@ # include "vvp_priv.h" # include -#ifdef HAVE_MALLOC_H -# include -#endif # include # include diff --git a/tgt-vvp/eval_bool.c b/tgt-vvp/eval_bool.c index a75908b52..c7cfee6bb 100644 --- a/tgt-vvp/eval_bool.c +++ b/tgt-vvp/eval_bool.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2005-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -23,9 +23,6 @@ # include "vvp_config.h" # include "vvp_priv.h" # include -#ifdef HAVE_MALLOC_H -# include -#endif # include #ifdef HAVE_STDINT_H # include @@ -93,4 +90,3 @@ int draw_eval_bool64(ivl_expr_t expr) return res; } - diff --git a/tgt-vvp/eval_expr.c b/tgt-vvp/eval_expr.c index ed8761921..82c07d4f2 100644 --- a/tgt-vvp/eval_expr.c +++ b/tgt-vvp/eval_expr.c @@ -19,9 +19,6 @@ # include "vvp_priv.h" # include -#ifdef HAVE_MALLOC_H -# include -#endif # include # include diff --git a/tgt-vvp/vvp_config.h.in b/tgt-vvp/vvp_config.h.in index 940d3a07e..f523107b4 100644 --- a/tgt-vvp/vvp_config.h.in +++ b/tgt-vvp/vvp_config.h.in @@ -1,7 +1,7 @@ #ifndef __vvp_config_H #define __vvp_config_H /* - * Copyright (c) 2004 Stephen Williams (steve@icarus.com) + * Copyright (c) 2004-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -27,7 +27,6 @@ # endif #endif -# undef HAVE_MALLOC_H # undef HAVE_STDINT_H # undef HAVE_INTTYPES_H diff --git a/tgt-vvp/vvp_process.c b/tgt-vvp/vvp_process.c index 049b850af..bab263b44 100644 --- a/tgt-vvp/vvp_process.c +++ b/tgt-vvp/vvp_process.c @@ -20,9 +20,6 @@ # include "vvp_priv.h" # include # include -#ifdef HAVE_MALLOC_H -# include -#endif # include #ifdef __MINGW32__ /* MinGW has inconsistent %p output. */ diff --git a/tgt-vvp/vvp_scope.c b/tgt-vvp/vvp_scope.c index af5cec308..412eb5e45 100644 --- a/tgt-vvp/vvp_scope.c +++ b/tgt-vvp/vvp_scope.c @@ -18,9 +18,6 @@ */ # include "vvp_priv.h" -#ifdef HAVE_MALLOC_H -# include -#endif # include # include # include diff --git a/verinum.cc b/verinum.cc index 6bfcd0a98..4c0250808 100644 --- a/verinum.cc +++ b/verinum.cc @@ -22,8 +22,8 @@ # include "verinum.h" # include # include -# include // Needed to get pow for as_double(). -# include // Needed to get snprintf for as_string(). +# include // Needed to get pow for as_double(). +# include // Needed to get snprintf for as_string(). #if !defined(HAVE_LROUND) /* diff --git a/verireal.cc b/verireal.cc index b02c47ab8..22838e737 100644 --- a/verireal.cc +++ b/verireal.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 1999-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -22,11 +22,11 @@ # include "verireal.h" # include "verinum.h" -# include -# include +# include +# include # include -# include -# include +# include +# include # include verireal::verireal() diff --git a/vpi/stringheap.c b/vpi/stringheap.c index 9369401de..a3e1d6eb6 100644 --- a/vpi/stringheap.c +++ b/vpi/stringheap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2003-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -21,9 +21,6 @@ # include "stringheap.h" # include # include -#ifdef HAVE_MALLOC_H -# include -#endif # include struct stringheap_cell { diff --git a/vpi/sys_fst.c b/vpi/sys_fst.c index bbac88663..14ce94109 100644 --- a/vpi/sys_fst.c +++ b/vpi/sys_fst.c @@ -31,9 +31,6 @@ # include # include # include -#ifdef HAVE_MALLOC_H -# include -#endif static char *dump_path = NULL; static struct fstContext *dump_file = NULL; diff --git a/vpi/sys_lxt.c b/vpi/sys_lxt.c index 87d01a1a6..2feecd674 100644 --- a/vpi/sys_lxt.c +++ b/vpi/sys_lxt.c @@ -34,9 +34,6 @@ # include # include # include -#ifdef HAVE_MALLOC_H -# include -#endif # include "stringheap.h" diff --git a/vpi/sys_lxt2.c b/vpi/sys_lxt2.c index 4f9b8190e..39da7485a 100644 --- a/vpi/sys_lxt2.c +++ b/vpi/sys_lxt2.c @@ -34,9 +34,6 @@ # include # include # include -#ifdef HAVE_MALLOC_H -# include -#endif # include "stringheap.h" diff --git a/vpi/sys_vcd.c b/vpi/sys_vcd.c index 8ea42b449..e0c4379cd 100644 --- a/vpi/sys_vcd.c +++ b/vpi/sys_vcd.c @@ -31,9 +31,6 @@ # include # include # include -#ifdef HAVE_MALLOC_H -# include -#endif static char *dump_path = NULL; static FILE *dump_file = NULL; diff --git a/vpi/sys_vcdoff.c b/vpi/sys_vcdoff.c index 49e8d5c45..51e8dd1b9 100644 --- a/vpi/sys_vcdoff.c +++ b/vpi/sys_vcdoff.c @@ -29,9 +29,6 @@ # include # include # include -#ifdef HAVE_MALLOC_H -# include -#endif # include "vcd_priv.h" diff --git a/vpi/vams_simparam.c b/vpi/vams_simparam.c index 87ac2e6f0..ebe2375e4 100644 --- a/vpi/vams_simparam.c +++ b/vpi/vams_simparam.c @@ -17,9 +17,6 @@ */ #include -#ifdef HAVE_MALLOC_H -# include -#endif #include #include #include diff --git a/vpi/vcd_priv.c b/vpi/vcd_priv.c index 1055b7f1a..38af265f4 100644 --- a/vpi/vcd_priv.c +++ b/vpi/vcd_priv.c @@ -23,9 +23,6 @@ #include #include #include -#ifdef HAVE_MALLOC_H -# include -#endif #include #include "stringheap.h" #include diff --git a/vpi/vpi_config.h.in b/vpi/vpi_config.h.in index d03ebcfa4..e4dd2eb47 100644 --- a/vpi/vpi_config.h.in +++ b/vpi/vpi_config.h.in @@ -20,7 +20,6 @@ */ # undef HAVE_LIBIBERTY_H -# undef HAVE_MALLOC_H # undef HAVE_INTTYPES_H # undef HAVE_LIBZ # undef HAVE_LIBBZ2 diff --git a/vvp/arith.cc b/vvp/arith.cc index 424e204e7..321cc4dd4 100644 --- a/vvp/arith.cc +++ b/vvp/arith.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2008 Stephen Williams (steve@icarus.com) + * Copyright (c) 2001-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -19,14 +19,11 @@ # include "arith.h" # include "schedule.h" -# include +# include # include -# include -# include -#ifdef HAVE_MALLOC_H -# include -#endif -# include +# include +# include +# include vvp_arith_::vvp_arith_(unsigned wid) : wid_(wid), x_val_(wid) diff --git a/vvp/array.cc b/vvp/array.cc index 5bd6fc113..91dd0bb5d 100644 --- a/vvp/array.cc +++ b/vvp/array.cc @@ -25,15 +25,12 @@ #ifdef CHECK_WITH_VALGRIND #include "vvp_cleanup.h" #endif -#ifdef HAVE_MALLOC_H -# include -#endif -# include -# include -# include +# include +# include +# include # include # include "compile.h" -# include +# include unsigned long count_net_arrays = 0; unsigned long count_net_array_words = 0; diff --git a/vvp/bufif.cc b/vvp/bufif.cc index edd9170fa..3e24b7ae4 100644 --- a/vvp/bufif.cc +++ b/vvp/bufif.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2005 Stephen Williams (steve@icarus.com) + * Copyright (c) 2001-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -21,7 +21,7 @@ # include "schedule.h" # include "statistics.h" # include -# include +# include vvp_fun_bufif::vvp_fun_bufif(bool en_invert, bool out_invert, unsigned str0, unsigned str1) diff --git a/vvp/codes.cc b/vvp/codes.cc index ddf0e27ea..22453127b 100644 --- a/vvp/codes.cc +++ b/vvp/codes.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2001-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -23,8 +23,8 @@ #ifdef CHECK_WITH_VALGRIND # include "vvp_cleanup.h" #endif -# include -# include +# include +# include /* * The code space is broken into chunks, to make for efficient diff --git a/vvp/compile.cc b/vvp/compile.cc index 75e9bbf1d..62c58c742 100644 --- a/vvp/compile.cc +++ b/vvp/compile.cc @@ -28,14 +28,11 @@ # include "vpi_priv.h" # include "parse_misc.h" # include "statistics.h" -#ifdef HAVE_MALLOC_H -# include -#endif # include # include -# include -# include -# include +# include +# include +# include #ifdef __MINGW32__ #include diff --git a/vvp/compile.h b/vvp/compile.h index c28036755..b134d7ee8 100644 --- a/vvp/compile.h +++ b/vvp/compile.h @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -# include +# include # include # include # include "parse_misc.h" diff --git a/vvp/concat.cc b/vvp/concat.cc index 9b0ee161d..c4457dc4e 100644 --- a/vvp/concat.cc +++ b/vvp/concat.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2004-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -19,12 +19,9 @@ # include "compile.h" # include "vvp_net.h" -# include +# include # include -#ifdef HAVE_MALLOC_H -# include -#endif -# include +# include vvp_fun_concat::vvp_fun_concat(unsigned w0, unsigned w1, diff --git a/vvp/config.h.in b/vvp/config.h.in index 53b2f7675..f945cfa03 100644 --- a/vvp/config.h.in +++ b/vvp/config.h.in @@ -1,7 +1,7 @@ #ifndef __config_H #define __config_H /* - * Copyright (c) 2001-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2001-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -41,7 +41,6 @@ # undef HAVE_DLFCN_H # undef HAVE_DL_H # undef HAVE_GETOPT_H -# undef HAVE_MALLOC_H # undef HAVE_LIBREADLINE # undef HAVE_READLINE_READLINE_H # undef HAVE_LIBHISTORY @@ -128,7 +127,7 @@ typedef unsigned long vvp_time64_t; #endif /* HAVE_INTTYPES_H */ -# include +# include /* getrusage, /proc/self/statm */ diff --git a/vvp/delay.cc b/vvp/delay.cc index 3d123fc27..9b6698467 100644 --- a/vvp/delay.cc +++ b/vvp/delay.cc @@ -27,8 +27,8 @@ #include #include #include -#include -#include +#include +#include void vvp_delay_t::calculate_min_delay_() { diff --git a/vvp/dff.cc b/vvp/dff.cc index 0b6b58725..58c02886d 100644 --- a/vvp/dff.cc +++ b/vvp/dff.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005-2008 Stephen Williams (steve@icarus.com) + * Copyright (c) 2005-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -20,13 +20,10 @@ # include "compile.h" # include "schedule.h" # include "dff.h" -# include -# include -# include -# include -#ifdef HAVE_MALLOC_H -# include -#endif +# include +# include +# include +# include vvp_dff::vvp_dff(bool invert_clk, bool invert_ce) : iclk_(invert_clk), ice_(invert_ce) diff --git a/vvp/event.cc b/vvp/event.cc index 3a6f95a67..a4ed8423b 100644 --- a/vvp/event.cc +++ b/vvp/event.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2004-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -26,12 +26,9 @@ #ifdef CHECK_WITH_VALGRIND # include "vvp_cleanup.h" #endif -# include -# include -# include -#ifdef HAVE_MALLOC_H -# include -#endif +# include +# include +# include # include diff --git a/vvp/extend.cc b/vvp/extend.cc index 93dc1e99c..427d54273 100644 --- a/vvp/extend.cc +++ b/vvp/extend.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Stephen Williams + * Copyright (c) 2005-2010 Stephen Williams * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -19,9 +19,9 @@ # include "vvp_net.h" # include "compile.h" -# include +# include # include -# include +# include vvp_fun_extend_signed::vvp_fun_extend_signed(unsigned wid) : width_(wid) diff --git a/vvp/ivl_dlfcn.h b/vvp/ivl_dlfcn.h index 129c959f0..ef68d9bb0 100644 --- a/vvp/ivl_dlfcn.h +++ b/vvp/ivl_dlfcn.h @@ -1,7 +1,7 @@ #ifndef __ivl_dlfcn_H #define __ivl_dlfcn_H /* - * Copyright (c) 2001 Stephen Williams (steve@icarus.com) + * Copyright (c) 2001-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -21,7 +21,7 @@ #if defined(__MINGW32__) # include -# include +# include typedef void * ivl_dll_t; #elif defined(HAVE_DLFCN_H) # include diff --git a/vvp/lexor.lex b/vvp/lexor.lex index 94d454115..d7ac863ff 100644 --- a/vvp/lexor.lex +++ b/vvp/lexor.lex @@ -25,8 +25,8 @@ # include "parse_misc.h" # include "compile.h" # include "parse.h" -# include -# include +# include +# include static char* strdupnew(char const *str) { @@ -287,4 +287,3 @@ void destroy_lexor() # endif # endif } - diff --git a/vvp/logic.cc b/vvp/logic.cc index 471c9103d..99160694c 100644 --- a/vvp/logic.cc +++ b/vvp/logic.cc @@ -24,12 +24,9 @@ # include "schedule.h" # include "delay.h" # include "statistics.h" -# include -# include -# include -#ifdef HAVE_MALLOC_H -# include -#endif +# include +# include +# include vvp_fun_boolean_::vvp_fun_boolean_(unsigned wid) { diff --git a/vvp/logic.h b/vvp/logic.h index b0565263c..9b01fb36c 100644 --- a/vvp/logic.h +++ b/vvp/logic.h @@ -1,7 +1,7 @@ #ifndef __logic_H #define __logic_H /* - * Copyright (c) 2000-2008 Stephen Williams (steve@icarus.com) + * Copyright (c) 2000-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -21,7 +21,7 @@ # include "vvp_net.h" # include "schedule.h" -# include +# include /* * vvp_fun_boolean_ is just a common hook for holding operands. diff --git a/vvp/main.cc b/vvp/main.cc index 4f436589a..8ae5210f7 100644 --- a/vvp/main.cc +++ b/vvp/main.cc @@ -26,9 +26,9 @@ # include "vpi_priv.h" # include "statistics.h" # include "vvp_cleanup.h" -# include -# include -# include +# include +# include +# include # include #if defined(HAVE_SYS_RESOURCE_H) diff --git a/vvp/parse.y b/vvp/parse.y index ae2454891..83c263298 100644 --- a/vvp/parse.y +++ b/vvp/parse.y @@ -22,9 +22,9 @@ # include "parse_misc.h" # include "compile.h" # include "delay.h" -# include -# include -# include +# include +# include +# include /* * These are bits in the lexor. diff --git a/vvp/parse_misc.cc b/vvp/parse_misc.cc index 641b03127..2bbaed7fb 100644 --- a/vvp/parse_misc.cc +++ b/vvp/parse_misc.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001 Stephen Williams (steve@icarus.com) + * Copyright (c) 2001-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -19,11 +19,8 @@ # include "parse_misc.h" # include "compile.h" -# include -#ifdef HAVE_MALLOC_H -# include -#endif -# include +# include +# include const char*yypath; unsigned yyline; @@ -99,4 +96,3 @@ void argv_sym_lookup(struct argv_s*obj) compile_vpi_lookup(&obj->argv[i], obj->syms[i]); free(obj->syms); } - diff --git a/vvp/part.cc b/vvp/part.cc index 3f5e96caa..39ae8cfa2 100644 --- a/vvp/part.cc +++ b/vvp/part.cc @@ -19,13 +19,10 @@ # include "compile.h" # include "part.h" -# include -# include -#ifdef HAVE_MALLOC_H -# include -#endif +# include +# include # include -# include +# include struct vvp_fun_part_state_s { vvp_fun_part_state_s() : bitsr(0.0) {} diff --git a/vvp/reduce.cc b/vvp/reduce.cc index d1e936662..0fc7bc028 100644 --- a/vvp/reduce.cc +++ b/vvp/reduce.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005-2007 Stephen Williams (steve@icarus.com) + * Copyright (c) 2005-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -19,13 +19,10 @@ # include "compile.h" # include "schedule.h" -# include -# include -# include -# include -#ifdef HAVE_MALLOC_H -# include -#endif +# include +# include +# include +# include /* * All the reduction operations take a single vector input and produce diff --git a/vvp/resolv.cc b/vvp/resolv.cc index 4919a1223..bc3905fe7 100644 --- a/vvp/resolv.cc +++ b/vvp/resolv.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2008 Stephen Williams (steve@icarus.com) + * Copyright (c) 2001-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -22,7 +22,7 @@ # include "compile.h" # include "statistics.h" # include -# include +# include resolv_functor::resolv_functor(vvp_scalar_t hiz_value, const char*debug_l) diff --git a/vvp/schedule.cc b/vvp/schedule.cc index a9700891f..b7687779b 100644 --- a/vvp/schedule.cc +++ b/vvp/schedule.cc @@ -21,11 +21,10 @@ # include "vthread.h" # include "slab.h" # include -# include -# include -# include - -# include +# include +# include +# include +# include unsigned long count_assign_events = 0; unsigned long count_gen_events = 0; diff --git a/vvp/sfunc.cc b/vvp/sfunc.cc index 3ef1e4540..a6ed0d397 100644 --- a/vvp/sfunc.cc +++ b/vvp/sfunc.cc @@ -23,13 +23,10 @@ # include "vvp_cleanup.h" #endif # include "sfunc.h" -#ifdef HAVE_MALLOC_H -# include -#endif -# include -# include +# include +# include # include -# include +# include sfunc_core::sfunc_core(vvp_net_t*net, vpiHandle sys, diff --git a/vvp/statistics.h b/vvp/statistics.h index cc5876120..8bf1c478d 100644 --- a/vvp/statistics.h +++ b/vvp/statistics.h @@ -1,7 +1,7 @@ #ifndef __statistics_H #define __statistics_H /* - * Copyright (c) 2002-2007 Stephen Williams (steve@icarus.com) + * Copyright (c) 2002-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -# include +# include extern unsigned long count_opcodes; extern unsigned long count_functors; diff --git a/vvp/stop.cc b/vvp/stop.cc index 889f1b90f..d1fd929e4 100644 --- a/vvp/stop.cc +++ b/vvp/stop.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2003-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -28,19 +28,16 @@ # include "vpi_priv.h" # include "vthread.h" # include "schedule.h" -# include -# include +# include +# include #ifdef USE_READLINE # include #endif #ifdef USE_HISTORY # include #endif -# include -# include -#ifdef HAVE_MALLOC_H -# include -#endif +# include +# include struct __vpiScope*stop_current_scope = 0; bool stop_is_finish; /* When set, $stop acts like $finish (set in main.cc). */ diff --git a/vvp/symbols.cc b/vvp/symbols.cc index 9c8896386..425c5e3dd 100644 --- a/vvp/symbols.cc +++ b/vvp/symbols.cc @@ -18,12 +18,9 @@ */ # include "symbols.h" -# include -# include -#ifdef HAVE_MALLOC_H -# include -#endif -# include +# include +# include +# include /* * The keys of the symbol table are null terminated strings. Keep them @@ -404,4 +401,3 @@ symbol_table_s::~symbol_table_s() delete tmp; } } - diff --git a/vvp/udp.cc b/vvp/udp.cc index 1fcb6e4a6..3fab068a2 100644 --- a/vvp/udp.cc +++ b/vvp/udp.cc @@ -28,13 +28,10 @@ #ifdef CHECK_WITH_VALGRIND #include "vvp_cleanup.h" #endif -#include -#ifdef HAVE_MALLOC_H -#include -#endif -#include -#include -#include +#include +#include +#include +#include #include // We may need these later when we build the VPI interface to diff --git a/vvp/udp.h b/vvp/udp.h index 70ab30a64..81202cf98 100644 --- a/vvp/udp.h +++ b/vvp/udp.h @@ -1,7 +1,7 @@ #ifndef __udp_H #define __udp_H /* - * Copyright (c) 2005-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2005-2010 Stephen Williams (steve@icarus.com) * * (This is a rewrite of code that was ... * Copyright (c) 2001 Stephan Boettcher ) @@ -22,8 +22,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -# include -# include +# include "vvp_net.h" +# include "delay.h" # include "schedule.h" struct udp_levels_table; diff --git a/vvp/ufunc.cc b/vvp/ufunc.cc index 70442dff0..84fded529 100644 --- a/vvp/ufunc.cc +++ b/vvp/ufunc.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2002-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -27,13 +27,10 @@ #ifdef CHECK_WITH_VALGRIND # include "vvp_cleanup.h" #endif -#ifdef HAVE_MALLOC_H -# include -#endif -# include -# include +# include +# include # include -# include +# include # include #ifdef __MINGW32__ diff --git a/vvp/vpi_callback.cc b/vvp/vpi_callback.cc index 461561d48..5ba57836f 100644 --- a/vvp/vpi_callback.cc +++ b/vvp/vpi_callback.cc @@ -24,18 +24,15 @@ * can look when the event in question is tripped. */ -# include +# include "vpi_user.h" # include "vpi_priv.h" # include "vvp_net.h" # include "schedule.h" # include "event.h" # include "config.h" -# include -# include -#ifdef HAVE_MALLOC_H -# include -#endif -# include +# include +# include +# include /* * The vpi_free_object() call to a callback doesn't actually delete diff --git a/vvp/vpi_const.cc b/vvp/vpi_const.cc index ee0b929bc..a7d13a2fa 100644 --- a/vvp/vpi_const.cc +++ b/vvp/vpi_const.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2001-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -23,13 +23,10 @@ #ifdef CHECK_WITH_VALGRIND # include "vvp_cleanup.h" #endif -# include -#ifdef HAVE_MALLOC_H -# include -#endif -# include -# include -# include +# include +# include +# include +# include static int string_get(int code, vpiHandle ref) { diff --git a/vvp/vpi_event.cc b/vvp/vpi_event.cc index 20849eefc..7eabdb95b 100644 --- a/vvp/vpi_event.cc +++ b/vvp/vpi_event.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2002-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -19,13 +19,10 @@ # include "compile.h" # include "vpi_priv.h" -# include -#ifdef HAVE_MALLOC_H -# include -#endif -# include -# include -# include +# include +# include +# include +# include static int named_event_get(int code, vpiHandle ref) { diff --git a/vvp/vpi_iter.cc b/vvp/vpi_iter.cc index 47678117b..c0dfae410 100644 --- a/vvp/vpi_iter.cc +++ b/vvp/vpi_iter.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2001 Stephen Williams (steve@icarus.com) + * Copyright (c) 1999-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -22,8 +22,8 @@ */ # include "vpi_priv.h" -# include -# include +# include +# include static int iterator_free_object(vpiHandle ref) { @@ -98,4 +98,3 @@ vpiHandle vpi_scan(vpiHandle ref) return hp->args[hp->next++]; } - diff --git a/vvp/vpi_mcd.cc b/vvp/vpi_mcd.cc index ce6867e65..c6ebb24f8 100644 --- a/vvp/vpi_mcd.cc +++ b/vvp/vpi_mcd.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2009 Stephen G. Tell + * Copyright (c) 2000-2010 Stephen G. Tell * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -22,11 +22,11 @@ #ifdef CHECK_WITH_VALGRIND # include "vvp_cleanup.h" #endif -# include -# include -# include -# include -# include +# include +# include +# include +# include +# include extern FILE* vpi_trace; diff --git a/vvp/vpi_modules.cc b/vvp/vpi_modules.cc index 7e509a19b..9098a9d19 100644 --- a/vvp/vpi_modules.cc +++ b/vvp/vpi_modules.cc @@ -21,8 +21,8 @@ # include "vpi_priv.h" # include "ivl_dlfcn.h" # include "vvp_cleanup.h" -# include -# include +# include +# include # include # include diff --git a/vvp/vpi_priv.cc b/vvp/vpi_priv.cc index c9c24b24d..ec13fddd8 100644 --- a/vvp/vpi_priv.cc +++ b/vvp/vpi_priv.cc @@ -20,15 +20,12 @@ # include "version_base.h" # include "vpi_priv.h" # include "schedule.h" -# include -# include -# include -# include -#ifdef HAVE_MALLOC_H -# include -#endif -# include -# include +# include +# include +# include +# include +# include +# include vpi_mode_t vpi_mode_flag = VPI_MODE_NONE; FILE*vpi_trace = 0; diff --git a/vvp/vpi_real.cc b/vvp/vpi_real.cc index 20ea7bfe5..f42fa4159 100644 --- a/vvp/vpi_real.cc +++ b/vvp/vpi_real.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2003-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -23,13 +23,10 @@ #ifdef CHECK_WITH_VALGRIND # include "vvp_cleanup.h" #endif -# include -# include -# include -#ifdef HAVE_MALLOC_H -# include -#endif -# include +# include +# include +# include +# include struct __vpiRealVar* vpip_realvar_from_handle(vpiHandle obj) { diff --git a/vvp/vpi_scope.cc b/vvp/vpi_scope.cc index 975928bfe..da9f375d3 100644 --- a/vvp/vpi_scope.cc +++ b/vvp/vpi_scope.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2001-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -25,12 +25,9 @@ #ifdef CHECK_WITH_VALGRIND # include "vvp_cleanup.h" #endif -#ifdef HAVE_MALLOC_H -# include -#endif -# include -# include -# include +# include +# include +# include static vpiHandle *vpip_root_table_ptr = 0; static unsigned vpip_root_table_cnt = 0; diff --git a/vvp/vpi_signal.cc b/vvp/vpi_signal.cc index 7a3582b34..2558ef91c 100644 --- a/vvp/vpi_signal.cc +++ b/vvp/vpi_signal.cc @@ -30,16 +30,13 @@ #ifdef CHECK_WITH_VALGRIND # include "vvp_cleanup.h" #endif -# include +# include # include -# include -#ifdef HAVE_MALLOC_H -# include -#endif -# include -# include -# include -# include +# include +# include +# include +# include +# include #ifdef CHECK_WITH_VALGRIND # include #endif diff --git a/vvp/vpi_tasks.cc b/vvp/vpi_tasks.cc index d40fc42cf..6c48dd6b3 100644 --- a/vvp/vpi_tasks.cc +++ b/vvp/vpi_tasks.cc @@ -29,13 +29,10 @@ #ifdef CHECK_WITH_VALGRIND # include "vvp_cleanup.h" #endif -# include -#ifdef HAVE_MALLOC_H -# include -#endif -# include -# include -# include +# include +# include +# include +# include static const struct __vpirt vpip_systask_def_rt = { vpiSysTask, diff --git a/vvp/vpi_time.cc b/vvp/vpi_time.cc index 94492728d..43a4e6e00 100644 --- a/vvp/vpi_time.cc +++ b/vvp/vpi_time.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2001-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -20,9 +20,9 @@ # include "config.h" # include "vpi_priv.h" # include "schedule.h" -# include -# include -# include +# include +# include +# include /* * The $time system function is supported in VPI contexts (i.e. an diff --git a/vvp/vpi_vthr_vector.cc b/vvp/vpi_vthr_vector.cc index d1e87fbe9..add5b8321 100644 --- a/vvp/vpi_vthr_vector.cc +++ b/vvp/vpi_vthr_vector.cc @@ -30,12 +30,9 @@ # include "vvp_cleanup.h" # include #endif -# include -#ifdef HAVE_MALLOC_H -# include -#endif -# include -# include +# include +# include +# include struct __vpiVThrVec { struct __vpiHandle base; diff --git a/vvp/vpip_bin.cc b/vvp/vpip_bin.cc index e871f1c05..72a9fea0f 100644 --- a/vvp/vpip_bin.cc +++ b/vvp/vpip_bin.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2008 Stephen Williams (steve@icarus.com) + * Copyright (c) 2002-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -19,14 +19,11 @@ # include "config.h" # include "vpi_priv.h" -# include -# include -# include -# include -#ifdef HAVE_MALLOC_H -# include -#endif -# include +# include +# include +# include +# include +# include void vpip_bin_str_to_vec4(vvp_vector4_t&vec4, const char*buf) { diff --git a/vvp/vpip_format.c b/vvp/vpip_format.c index 6c3ae370d..b750871d1 100644 --- a/vvp/vpip_format.c +++ b/vvp/vpip_format.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2009 Stephen Williams (steve@icarus.com) + * Copyright (c) 2003-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -# include +# include "vpi_user.h" # include static const char str_char1_table[256] = { diff --git a/vvp/vpip_hex.cc b/vvp/vpip_hex.cc index 2e24f6095..94293630f 100644 --- a/vvp/vpip_hex.cc +++ b/vvp/vpip_hex.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2008 Stephen Williams (steve@icarus.com) + * Copyright (c) 2002-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -19,14 +19,11 @@ # include "config.h" # include "vpi_priv.h" -# include -# include -# include /* for CHAR_BIT */ -# include -#ifdef HAVE_MALLOC_H -# include -#endif -# include +# include +# include +# include /* for CHAR_BIT */ +# include +# include extern const char hex_digits[256]; diff --git a/vvp/vpip_oct.cc b/vvp/vpip_oct.cc index a6ee42df8..b42af052f 100644 --- a/vvp/vpip_oct.cc +++ b/vvp/vpip_oct.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2008 Stephen Williams (steve@icarus.com) + * Copyright (c) 2002-2010 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -19,14 +19,11 @@ # include "config.h" # include "vpi_priv.h" -# include -# include -# include -# include -#ifdef HAVE_MALLOC_H -# include -#endif -# include +# include +# include +# include +# include +# include extern const char oct_digits[64]; diff --git a/vvp/vpip_to_dec.cc b/vvp/vpip_to_dec.cc index a34a3b0a0..543d62461 100644 --- a/vvp/vpip_to_dec.cc +++ b/vvp/vpip_to_dec.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2009 Stephen Williams + * Copyright (c) 2008-2010 Stephen Williams * Copyright (c) 2002 Larry Doolittle (larry@doolittle.boa.org) * * This source code is free software; you can redistribute it @@ -23,15 +23,12 @@ #ifdef CHECK_WITH_VALGRIND # include "vvp_cleanup.h" #endif -# include -# include -# include /* for CHAR_BIT */ -# include -# include -#ifdef HAVE_MALLOC_H -# include -#endif -# include +# include +# include +# include /* for CHAR_BIT */ +# include +# include +# include /* If you are allergic to malloc, you can set a stack memory allocation * here. Otherwise, malloc() is used for the temporary array, so the diff --git a/vvp/vthread.cc b/vvp/vthread.cc index 87b694602..f2a396cc5 100644 --- a/vvp/vthread.cc +++ b/vvp/vthread.cc @@ -27,18 +27,15 @@ #ifdef CHECK_WITH_VALGRIND # include "vvp_cleanup.h" #endif -#ifdef HAVE_MALLOC_H -# include -#endif # include -# include -# include -# include -# include -# include +# include +# include +# include +# include +# include # include -#include +# include /* This is the size of an unsigned long in bits. This is just a convenience macro. */ diff --git a/vvp/vvp_island.cc b/vvp/vvp_island.cc index 434739c51..adc893b7c 100644 --- a/vvp/vvp_island.cc +++ b/vvp/vvp_island.cc @@ -27,9 +27,9 @@ #endif # include # include -# include -# include -# include +# include +# include +# include static bool at_EOS = false; diff --git a/vvp/vvp_island.h b/vvp/vvp_island.h index 67620380d..de9b74cdf 100644 --- a/vvp/vvp_island.h +++ b/vvp/vvp_island.h @@ -24,7 +24,7 @@ # include "symbols.h" # include "schedule.h" # include -# include +# include /* * Islands are mutually connected bidirectional meshes that have a diff --git a/vvp/vvp_net.cc b/vvp/vvp_net.cc index ffbb14c8b..d4280f93a 100644 --- a/vvp/vvp_net.cc +++ b/vvp/vvp_net.cc @@ -22,14 +22,14 @@ # include "vpi_priv.h" # include "schedule.h" # include "statistics.h" -# include +# include # include # include # include # include -# include -# include -# include +# include +# include +# include #ifdef CHECK_WITH_VALGRIND # include # include diff --git a/vvp/vvp_net.h b/vvp/vvp_net.h index ee578a68b..fb67df31e 100644 --- a/vvp/vvp_net.h +++ b/vvp/vvp_net.h @@ -21,11 +21,11 @@ # include "config.h" # include "vpi_user.h" -# include -# include -# include +# include +# include +# include # include -# include +# include #ifdef HAVE_IOSFWD # include diff --git a/vvp/vvp_vpi.cc b/vvp/vvp_vpi.cc index f532c0135..e25cf9598 100644 --- a/vvp/vvp_vpi.cc +++ b/vvp/vvp_vpi.cc @@ -1,5 +1,5 @@ -#include +#include #include "vpi_user.h" diff --git a/vvp/words.cc b/vvp/words.cc index cd1a06d51..2c601a04f 100644 --- a/vvp/words.cc +++ b/vvp/words.cc @@ -21,14 +21,14 @@ # include "vpi_priv.h" # include "array.h" # include "schedule.h" -# include -# include -# include -# include -#ifdef HAVE_MALLOC_H -# include +#ifdef CHECK_WITH_VALGRIND +# include "vvp_cleanup.h" #endif -# include +# include +# include +# include +# include +# include static void __compile_var_real(char*label, char*name, vvp_array_t array, unsigned long array_addr,