luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove malloc.h support and for C++ files use <c...> include files. 

The functions (malloc, free, etc.) that used to be provided in
malloc.h are now provided in cstdlib for C++ files and stdlib.h for
C files. Since we require a C99 compliant compiler it makes sense
that malloc.h is no longer needed.

This patch also modifies all the C++ files to use the <c...>
version of the standard C header files (e.g. <cstdlib> vs
<stdlib.h>). Some of the files used the C++ version and others did
not. There are still a few other header changes that could be done,
but this takes care of much of it.
This commit is contained in:
Cary R 2010-05-31 13:12:06 -07:00 committed by Stephen Williams
parent 8122432e47
commit 1993bf6f69
129 changed files with 299 additions and 871 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Attrib.cc
View File

@ -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 <assert.h>
# include <cassert>
Attrib::Attrib()
{

6
HName.cc
View File

@ -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 <cstring>
# include <cstdlib>
# include <climits>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
hname_t::hname_t()
@ -94,4 +91,3 @@ ostream& operator<< (ostream&out, const hname_t&that)
return out;
}

2
Module.cc
View File

@ -22,7 +22,7 @@
# include "Module.h"
# include "PGate.h"
# include "PWire.h"
# include <assert.h>
# include <cassert>
list<Module::named_expr_t> Module::user_defparms;

5
PGate.cc
View File

@ -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 <assert.h>
# include <cassert>
PGate::PGate(perm_string name,
svector<PExpr*>*pins,
@ -189,4 +189,3 @@ perm_string PGModule::get_type()
{
return type_;
}

4
PWire.cc
View File

@ -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 <assert.h>
# include <cassert>
PWire::PWire(perm_string n,
NetNet::Type t,

11
StringHeap.cc
View File

@ -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 <malloc.h>
#endif
# include <stdlib.h>
# include <string.h>
# include <assert.h>
# include <cstdlib>
# include <cstring>
# include <cassert>
#ifdef CHECK_WITH_VALGRIND
static char **string_pool = NULL;

4
async.cc
View File

@ -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 <assert.h>
# include <cassert>
bool NetAssign::is_asynchronous()
{

5
cadpli/cadpli.c
View File

@ -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 <vpi_user.h>
# include <veriuser.h>
# include <stdlib.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <string.h>
# include <assert.h>
# include "config.h"

1
config.h.in
View File

@ -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

2
configure.in
View File

@ -94,7 +94,7 @@ else
fi
fi
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)

5
driver/substit.c
View File

@ -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 <string.h>
# include <stdlib.h>
# include <stdio.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
char* substitutions(const char*str)

4
dup_expr.cc
View File

@ -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 <cassert>
# include <stdlib.h>
# include <cstdlib>
# include "ivl_assert.h"
NetEAccess* NetEAccess::dup_expr() const

4
elab_scope.cc
View File

@ -23,7 +23,7 @@
# include <cstring>
# include <iostream>
# include <cstdlib>
# include <stdio.h>
# include <cstdio>
/*
* Elaboration happens in two passes, generally. The first scans the
@ -44,7 +44,7 @@
# include "netlist.h"
# include "util.h"
# include <typeinfo>
# include <assert.h>
# include <cassert>
# include "ivl_assert.h"
typedef map<perm_string,LexicalScope::param_expr_t>::const_iterator mparm_it_t;

5
eval_attrib.cc
View File

@ -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 <iostream>
# include <assert.h>
# include <cassert>
/*
* The evaluate_attributes function evaluates the attribute
@ -72,4 +72,3 @@ attrib_list_t* evaluate_attributes(const map<perm_string,PExpr*>&att,
assert(idx == natt);
return table;
}

2
eval_tree.cc
View File

@ -23,7 +23,7 @@
# include <iostream>
# include <cstdlib>
# include <cstring>
# include <math.h>
# include <cmath>
# include "netlist.h"
# include "ivl_assert.h"

4
ivl_assert.h
View File

@ -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 <assert.h>
# include <cassert>
#define ivl_assert(tok, expression) \
do { \

3
ivlpp/lexor.lex
View File

@ -21,9 +21,6 @@
# include "config.h"
# include <stdio.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <stdlib.h>
# include <string.h>
# include <ctype.h>

3
ivlpp/main.c
View File

@ -39,9 +39,6 @@ const char NOTICE[] =
# include <stdio.h>
# include <stdlib.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <unistd.h>
# include <string.h>
# include <ctype.h>

6
lexor.lex
View File

@ -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 <ctype.h>
# include <string.h>
# include <cctype>
# include <cstring>
# include "lexor_keyword.h"
# include "discipline.h"
# include <list>

2
lexor_keyword.gperf
View File

@ -4,7 +4,7 @@
#include "config.h"
#include "parse_misc.h"
#include "parse.h"
#include <string.h>
#include <cstring>
#include "lexor_keyword.h"
#include "compiler.h"

5
libveriuser/a_vcl.c
View File

@ -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 <vpi_user.h>
#include <acc_user.h>
#include <stdlib.h>
#ifdef HAVE_MALLOC_H
#include <malloc.h>
#endif
#include "priv.h"
#include <assert.h>

18
libveriuser/workarea.c
View File

@ -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 <veriuser.h>
# include <vpi_user.h>
# include <stdlib.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#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.
*
*/

6
load_module.cc
View File

@ -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 <string>
# include <sys/types.h>
# include <dirent.h>
# include <ctype.h>
# include <assert.h>
# include <cctype>
# include <cassert>
/*
* The module library items are maps of key names to file name within

7
main.cc
View File

@ -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 <stdio.h>
# include <cstdio>
# include <iostream>
# include <fstream>
# include <queue>
@ -47,7 +46,7 @@ const char NOTICE[] =
# include <list>
# include <map>
# include <unistd.h>
# include <stdlib.h>
# include <cstdlib>
#if defined(HAVE_TIMES)
# include <sys/times.h>
#endif
@ -81,7 +80,7 @@ extern "C" const char*optarg;
* here for those days when I need the ability to cleanly exit on a
* signal interrupt.
*/
# include <signal.h>
# include <csignal>
static void signals_handler(int sig)
{
fprintf(stderr, "Exit on signal %d\n", sig);

4
net_link.cc
View File

@ -26,9 +26,7 @@
# include <cstring>
# include <string>
# include <typeinfo>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <cstdlib>
void Nexus::connect(Link&r)
{

2
net_proc.cc
View File

@ -20,7 +20,7 @@
# include "config.h"
# include "netlist.h"
# include <assert.h>
# include <cassert>
NetBlock::NetBlock(Type t, NetScope*ss)
: type_(t), subscope_(ss), last_(0)

4
parse_api.h
View File

@ -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 <stdio.h>
# include <cstdio>
# include "StringHeap.h"
# include <string>
# include <map>

2
pform.cc
View File

@ -30,7 +30,7 @@
# include "discipline.h"
# include <list>
# include <map>
# include <assert.h>
# include <cassert>
# include <stack>
# include <typeinfo>
# include <sstream>

4
pform.h
View File

@ -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 <iostream>
# include <string>
# include <list>
# include <stdio.h>
# include <cstdio>
/*
* These classes implement the parsed form (P-form for short) of the

4
svector.h
View File

@ -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 <string>
# include <vector>
# include <assert.h>
# include <cassert>
/*
* This is a way simplified vector class that cannot grow or shrink,

2
symbol_search.cc
View File

@ -19,7 +19,7 @@
# include "netlist.h"
# include "netmisc.h"
# include <assert.h>
# include <cassert>
/*

2
syn-rules.y
View File

@ -34,7 +34,7 @@
# include "netlist.h"
# include "netmisc.h"
# include "functor.h"
# include <assert.h>
# include <cassert>
struct syn_token_t {
int token;

4
sync.cc
View File

@ -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 <assert.h>
# include <cassert>
/*
* Most process statements are not roots of synchronous logic.

4
synth2.cc
View File

@ -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 <assert.h>
# include <cassert>
bool NetProc::synth_async(Design*des, NetScope*scope,

4
sys_funcs.cc
View File

@ -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 <stdio.h>
# include <cstdio>
# include <cstring>
# include <cstdlib>

7
t-dll-analog.cc
View File

@ -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 <malloc.h>
#endif
# include <stdlib.h>
# include <cstdlib>
bool dll_target::process(const NetAnalogTop*net)
{

9
t-dll-api.cc
View File

@ -21,12 +21,9 @@
# include "StringHeap.h"
# include "t-dll.h"
# include "discipline.h"
# include <stdlib.h>
# include <stdio.h>
# include <string.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <cstdlib>
# include <cstdio>
# include <cstring>
static StringHeap api_strings;

9
t-dll-expr.cc
View File

@ -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 <cstring>
# include "t-dll.h"
# include "netlist.h"
# include <assert.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <stdlib.h>
# include <cassert>
# include <cstdlib>
/*
* This is a little convenience function for converting a NetExpr

7
t-dll-proc.cc
View File

@ -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 <malloc.h>
#endif
# include <stdlib.h>
# include <cstdlib>
bool dll_target::process(const NetProcTop*net)
{

9
t-dll.cc
View File

@ -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 <iostream>
# include <cstring>
# include <stdio.h> // sprintf()
# include <cstdio> // sprintf()
# include "compiler.h"
# include "t-dll.h"
# include "netmisc.h"
# include "discipline.h"
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <stdlib.h>
# include <cstdlib>
# include "ivl_assert.h"
struct dll_target dll_target_obj;

77
tgt-fpga/d-generic-edif.c
View File

@ -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 <stdlib.h>
# include <string.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <assert.h>
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.
*
*/

55
tgt-fpga/d-virtex.c
View File

@ -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 <stdlib.h>
# include <string.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <assert.h>
/*
@ -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.
*/

43
tgt-fpga/d-virtex2.c
View File

@ -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 <stdlib.h>
# include <string.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <assert.h>
@ -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.
*/

38
tgt-fpga/edif.c
View File

@ -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 <stdlib.h>
# include <string.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <assert.h>
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.
*
*/

34
tgt-fpga/mangle.c
View File

@ -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 <string.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <stdlib.h>
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.
*
*/

53
tgt-fpga/xilinx.c
View File

@ -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 <stdlib.h>
# include <string.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <assert.h>
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.
*
*/

29
tgt-pal/emit_jed.c
View File

@ -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 <stdio.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <stdlib.h>
# include <assert.h>
@ -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.
*
*/

50
tgt-pal/imain.c
View File

@ -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 <malloc.h>
#endif
# include <stdio.h>
# include <stdlib.h>
# include <assert.h>
@ -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.
*
*/

3
tgt-vhdl/vhdl_config.h.in
View File

@ -3,9 +3,6 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H

3
tgt-vvp/draw_net_input.c
View File

@ -18,9 +18,6 @@
*/
# include "vvp_priv.h"
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <stdlib.h>
# include <math.h>
# include <string.h>

5
tgt-vvp/draw_switch.c
View File

@ -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 <assert.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <stdlib.h>
# include <string.h>

3
tgt-vvp/draw_ufunc.c
View File

@ -19,9 +19,6 @@
# include "vvp_priv.h"
# include <string.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <stdlib.h>
# include <assert.h>

3
tgt-vvp/draw_vpi.c
View File

@ -19,9 +19,6 @@
# include "vvp_priv.h"
# include <string.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <stdlib.h>
# include <assert.h>

6
tgt-vvp/eval_bool.c
View File

@ -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 <string.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <stdlib.h>
#ifdef HAVE_STDINT_H
# include <stdint.h>
@ -93,4 +90,3 @@ int draw_eval_bool64(ivl_expr_t expr)
return res;
}

3
tgt-vvp/eval_expr.c
View File

@ -19,9 +19,6 @@
# include "vvp_priv.h"
# include <string.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <stdlib.h>
# include <assert.h>

3
tgt-vvp/vvp_config.h.in
View File

@ -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

3
tgt-vvp/vvp_process.c
View File

@ -20,9 +20,6 @@
# include "vvp_priv.h"
# include <string.h>
# include <assert.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <stdlib.h>
#ifdef __MINGW32__ /* MinGW has inconsistent %p output. */

3
tgt-vvp/vvp_scope.c
View File

@ -18,9 +18,6 @@
*/
# include "vvp_priv.h"
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <stdlib.h>
# include <math.h>
# include <string.h>

4
verinum.cc
View File

@ -22,8 +22,8 @@
# include "verinum.h"
# include <iostream>
# include <cassert>
# include <math.h> // Needed to get pow for as_double().
# include <stdio.h> // Needed to get snprintf for as_string().
# include <cmath> // Needed to get pow for as_double().
# include <cstdio> // Needed to get snprintf for as_string().
#if !defined(HAVE_LROUND)
/*

10
verireal.cc
View File

@ -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 <stdlib.h>
# include <ctype.h>
# include <cstdlib>
# include <cctype>
# include <iostream>
# include <math.h>
# include <assert.h>
# include <cmath>
# include <cassert>
# include <cstring>
verireal::verireal()

5
vpi/stringheap.c
View File

@ -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 <string.h>
# include <stdlib.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <assert.h>
struct stringheap_cell {

3
vpi/sys_fst.c
View File

@ -31,9 +31,6 @@
# include <string.h>
# include <assert.h>
# include <time.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
static char *dump_path = NULL;
static struct fstContext *dump_file = NULL;

3
vpi/sys_lxt.c
View File

@ -32,9 +32,6 @@
# include <string.h>
# include <assert.h>
# include <time.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include "stringheap.h"

3
vpi/sys_lxt2.c
View File

@ -31,9 +31,6 @@
# include <stdlib.h>
# include <string.h>
# include <time.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include "stringheap.h"
# include <assert.h>

3
vpi/sys_vcd.c
View File

@ -30,9 +30,6 @@
# include <string.h>
# include <assert.h>
# include <time.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
static char *dump_path = NULL;
static FILE *dump_file = NULL;

3
vpi/sys_vcdoff.c
View File

@ -28,9 +28,6 @@
# include <string.h>
# include <assert.h>
# include <time.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include "vcd_priv.h"

3
vpi/vams_simparam.c
View File

@ -18,9 +18,6 @@
#include "sys_priv.h"
#include <assert.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
#include <math.h>
#include <stdlib.h>
#include <string.h>

3
vpi/vcd_priv.c
View File

@ -23,9 +23,6 @@
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
#include <ctype.h>
#include "stringheap.h"

6
vpi/vcd_priv2.cc
View File

@ -22,9 +22,9 @@
# include <set>
# include <string>
# include <pthread.h>
# include <stdlib.h>
# include <string.h>
# include <assert.h>
# include <cstdlib>
# include <cstring>
# include <cassert>
/*
Nexus Id cache

1
vpi/vpi_config.h.in
View File

@ -20,7 +20,6 @@
*/
# undef HAVE_LIBIBERTY_H
# undef HAVE_MALLOC_H
# undef HAVE_INTTYPES_H
# undef HAVE_LIBZ
# undef HAVE_LIBBZ2

13
vvp/arith.cc
View File

@ -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 <limits.h>
# include <climits>
# include <iostream>
# include <assert.h>
# include <stdlib.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <math.h>
# include <cassert>
# include <cstdlib>
# include <cmath>
vvp_arith_::vvp_arith_(unsigned wid)
: wid_(wid), x_val_(wid)

11
vvp/array.cc
View File

@ -26,15 +26,12 @@
#ifdef CHECK_WITH_VALGRIND
#include "vvp_cleanup.h"
#endif
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <stdlib.h>
# include <string.h>
# include <limits.h>
# include <cstdlib>
# include <cstring>
# include <climits>
# include <iostream>
# include "compile.h"
# include <assert.h>
# include <cassert>
unsigned long count_net_arrays = 0;
unsigned long count_net_array_words = 0;

4
vvp/bufif.cc
View File

@ -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 <iostream>
# include <assert.h>
# include <cassert>
vvp_fun_bufif::vvp_fun_bufif(bool en_invert, bool out_invert,
unsigned str0, unsigned str1)

6
vvp/codes.cc
View File

@ -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 <string.h>
# include <assert.h>
# include <cstring>
# include <cassert>
/*
* The code space is broken into chunks, to make for efficient

9
vvp/compile.cc
View File

@ -28,14 +28,11 @@
# include "vpi_priv.h"
# include "parse_misc.h"
# include "statistics.h"
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <iostream>
# include <list>
# include <stdlib.h>
# include <string.h>
# include <assert.h>
# include <cstdlib>
# include <cstring>
# include <cassert>
#ifdef __MINGW32__
#include <windows.h>

2
vvp/compile.h
View File

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
# include <stdio.h>
# include <cstdio>
# include <fstream>
# include <vector>
# include "parse_misc.h"

9
vvp/concat.cc
View File

@ -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 <stdlib.h>
# include <cstdlib>
# include <iostream>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <assert.h>
# include <cassert>
vvp_fun_concat::vvp_fun_concat(unsigned w0, unsigned w1,

5
vvp/config.h.in
View File

@ -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 <math.h>
# include <cmath>
/* getrusage, /proc/self/statm */

4
vvp/delay.cc
View File

@ -27,8 +27,8 @@
#include <iostream>
#include <cstdlib>
#include <list>
#include <assert.h>
#include <math.h>
#include <cassert>
#include <cmath>
void vvp_delay_t::calculate_min_delay_()
{

13
vvp/dff.cc
View File

@ -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,14 +20,11 @@
# include "compile.h"
# include "schedule.h"
# include "dff.h"
# include <limits.h>
# include <stdio.h>
# include <assert.h>
# include <stdlib.h>
# include <climits>
# include <cstdio>
# include <cassert>
# include <cstdlib>
# include <iostream>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
vvp_dff::vvp_dff(bool invert_clk, bool invert_ce)
: iclk_(invert_clk), ice_(invert_ce)

11
vvp/event.cc
View File

@ -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 <string.h>
# include <assert.h>
# include <stdlib.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <cstring>
# include <cassert>
# include <cstdlib>
# include <iostream>

6
vvp/extend.cc
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005 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,9 +19,9 @@
# include "vvp_net.h"
# include "compile.h"
# include <string.h>
# include <cstring>
# include <iostream>
# include <assert.h>
# include <cassert>
vvp_fun_extend_signed::vvp_fun_extend_signed(unsigned wid)
: width_(wid)

4
vvp/ivl_dlfcn.h
View File

@ -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 <windows.h>
# include <stdio.h>
# include <cstdio>
typedef void * ivl_dll_t;
#elif defined(HAVE_DLFCN_H)
# include <dlfcn.h>

5
vvp/lexor.lex
View File

@ -25,8 +25,8 @@
# include "parse_misc.h"
# include "compile.h"
# include "parse.h"
# include <string.h>
# include <assert.h>
# include <cstring>
# include <cassert>
static char* strdupnew(char const *str)
{
@ -288,4 +288,3 @@ void destroy_lexor()
# endif
# endif
}

9
vvp/logic.cc
View File

@ -24,12 +24,9 @@
# include "schedule.h"
# include "delay.h"
# include "statistics.h"
# include <string.h>
# include <assert.h>
# include <stdlib.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <cstring>
# include <cassert>
# include <cstdlib>
vvp_fun_boolean_::vvp_fun_boolean_(unsigned wid)
{

4
vvp/logic.h
View File

@ -1,7 +1,7 @@
#ifndef __logic_H
#define __logic_H
/*
* Copyright (c) 2000-2008,2010 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 <stddef.h>
# include <cstddef>
/*
* vvp_fun_boolean_ is just a common hook for holding operands.

6
vvp/main.cc
View File

@ -26,9 +26,9 @@
# include "vpi_priv.h"
# include "statistics.h"
# include "vvp_cleanup.h"
# include <stdio.h>
# include <stdlib.h>
# include <string.h>
# include <cstdio>
# include <cstdlib>
# include <cstring>
# include <unistd.h>
#if defined(HAVE_SYS_RESOURCE_H)

6
vvp/parse.y
View File

@ -22,9 +22,9 @@
# include "parse_misc.h"
# include "compile.h"
# include "delay.h"
# include <stdio.h>
# include <stdlib.h>
# include <assert.h>
# include <cstdio>
# include <cstdlib>
# include <cassert>
/*
* These are bits in the lexor.

10
vvp/parse_misc.cc
View File

@ -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 <stdio.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <stdlib.h>
# include <cstdio>
# include <cstdlib>
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);
}

9
vvp/part.cc
View File

@ -19,13 +19,10 @@
# include "compile.h"
# include "part.h"
# include <stdlib.h>
# include <limits.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <cstdlib>
# include <climits>
# include <iostream>
# include <assert.h>
# include <cassert>
struct vvp_fun_part_state_s {
vvp_fun_part_state_s() : bitsr(0.0) {}

5
vvp/permaheap.cc
View File

@ -1,6 +1,5 @@
/*
* Copyright (c) 2009 Stephen Williams (steve@icarus.com)
* Copyright (c) 2009-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 +18,7 @@
*/
# include "permaheap.h"
# include <assert.h>
# include <cassert>
permaheap::permaheap()
{

4
vvp/permaheap.h
View File

@ -1,7 +1,7 @@
#ifndef __permaheap_H
#define __permaheap_H
/*
* Copyright (c) 2009 Stephen Williams (steve@icarus.com)
* Copyright (c) 2009-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 <stdlib.h>
# include <cstdlib>
class permaheap {

13
vvp/reduce.cc
View File

@ -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 <limits.h>
# include <stdio.h>
# include <assert.h>
# include <stdlib.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <climits>
# include <cstdio>
# include <cassert>
# include <cstdlib>
/*
* All the reduction operations take a single vector input and produce

4
vvp/resolv.cc
View File

@ -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 <iostream>
# include <assert.h>
# include <cassert>
resolv_functor::resolv_functor(vvp_scalar_t hiz_value, const char*debug_l)

6
vvp/schedule.cc
View File

@ -24,9 +24,9 @@
# include "compile.h"
# include <new>
# include <typeinfo>
# include <signal.h>
# include <stdlib.h>
# include <assert.h>
# include <csignal>
# include <cstdlib>
# include <cassert>
# include <iostream>

9
vvp/sfunc.cc
View File

@ -23,13 +23,10 @@
# include "vvp_cleanup.h"
#endif
# include "sfunc.h"
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <stdlib.h>
# include <string.h>
# include <cstdlib>
# include <cstring>
# include <iostream>
# include <assert.h>
# include <cassert>
sfunc_core::sfunc_core(vvp_net_t*net, vpiHandle sys,

4
vvp/statistics.h
View File

@ -1,7 +1,7 @@
#ifndef __statistics_H
#define __statistics_H
/*
* 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,7 +19,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
# include <stddef.h>
# include <cstddef>
extern unsigned long count_opcodes;
extern unsigned long count_functors;

13
vvp/stop.cc
View File

@ -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 <stdio.h>
# include <ctype.h>
# include <cstdio>
# include <cctype>
#ifdef USE_READLINE
# include <readline/readline.h>
#endif
#ifdef USE_HISTORY
# include <readline/history.h>
#endif
# include <string.h>
# include <stdlib.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <cstring>
# include <cstdlib>
struct __vpiScope*stop_current_scope = 0;
bool stop_is_finish; /* When set, $stop acts like $finish (set in main.cc). */

10
vvp/symbols.cc
View File

@ -18,12 +18,9 @@
*/
# include "symbols.h"
# include <string.h>
# include <stdlib.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
# include <assert.h>
# include <cstring>
# include <cstdlib>
# include <cassert>
/*
* The keys of the symbol table are null terminated strings. Keep them
@ -405,4 +402,3 @@ symbol_table_s::~symbol_table_s()
delete tmp;
}
}

11
vvp/udp.cc
View File

@ -28,13 +28,10 @@
#ifdef CHECK_WITH_VALGRIND
#include "vvp_cleanup.h"
#endif
#include <assert.h>
#ifdef HAVE_MALLOC_H
#include <malloc.h>
#endif
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <cassert>
#include <cstdlib>
#include <cstring>
#include <cstdio>
#include <iostream>
// We may need these later when we build the VPI interface to

Some files were not shown because too many files have changed in this diff Show More