gcc4 compile errors.
This commit is contained in:
steve
parent
9cae53988a
commit
a8d49921ee
|
|
@ -141,6 +141,7 @@ AC_SUBST(vpidir1)
|
|||
AC_SUBST(vpidir2)
|
||||
AC_MSG_RESULT(${vpidir1} ${vpidir2})
|
||||
|
||||
AC_CONFIG_SUBDIRS(vvp vpi tgt-vvp tgt-fpga libveriuser cadpli)
|
||||
# XXX disable tgt-fpga for the moment
|
||||
AC_CONFIG_SUBDIRS(vvp vpi tgt-vvp libveriuser cadpli)
|
||||
|
||||
AC_OUTPUT(Makefile ivlpp/Makefile driver/Makefile driver-vpi/Makefile tgt-null/Makefile tgt-stub/Makefile tgt-verilog/Makefile tgt-pal/Makefile)
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
#ifdef HAVE_CVS_IDENT
|
||||
#ident "$Id: netlist.h,v 1.346 2005/07/11 16:56:50 steve Exp $"
|
||||
#ident "$Id: netlist.h,v 1.347 2005/07/14 23:34:19 steve Exp $"
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
@ -59,6 +59,9 @@ class NetEvProbe;
|
|||
class NetExpr;
|
||||
class NetESignal;
|
||||
class NetFuncDef;
|
||||
class NetRamDq;
|
||||
class NetEvTrig;
|
||||
class NetEvWait;
|
||||
|
||||
|
||||
struct target;
|
||||
|
|
@ -3432,6 +3435,9 @@ extern ostream& operator << (ostream&, NetNet::Type);
|
|||
|
||||
/*
|
||||
* $Log: netlist.h,v $
|
||||
* Revision 1.347 2005/07/14 23:34:19 steve
|
||||
* gcc4 compile errors.
|
||||
*
|
||||
* Revision 1.346 2005/07/11 16:56:50 steve
|
||||
* Remove NetVariable and ivl_variable_t structures.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
#ifdef HAVE_CVS_IDENT
|
||||
#ident "$Id: compile.h,v 1.74 2005/07/06 04:29:25 steve Exp $"
|
||||
#ident "$Id: compile.h,v 1.75 2005/07/14 23:34:19 steve Exp $"
|
||||
#endif
|
||||
|
||||
# include <stdio.h>
|
||||
|
|
@ -27,6 +27,8 @@
|
|||
# include "vpi_user.h"
|
||||
# include "vvp_net.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
/*
|
||||
* The functions described here are the compile time support
|
||||
* functions. Various bits of the compile process are taken care of
|
||||
|
|
@ -325,6 +327,9 @@ extern void compile_net_real(char*label, char*name,
|
|||
|
||||
/*
|
||||
* $Log: compile.h,v $
|
||||
* Revision 1.75 2005/07/14 23:34:19 steve
|
||||
* gcc4 compile errors.
|
||||
*
|
||||
* Revision 1.74 2005/07/06 04:29:25 steve
|
||||
* Implement real valued signals and arith nodes.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
#ident "$Id: part.cc,v 1.7 2005/06/26 21:08:11 steve Exp $"
|
||||
#ident "$Id: part.cc,v 1.8 2005/07/14 23:34:19 steve Exp $"
|
||||
|
||||
# include "compile.h"
|
||||
# include "vvp_net.h"
|
||||
|
|
@ -69,7 +69,8 @@ void vvp_fun_part_pv::recv_vec4(vvp_net_ptr_t port, const vvp_vector4_t&bit)
|
|||
if (bit.size() != wid_) {
|
||||
cerr << "internal error: part_pv data mismatch. "
|
||||
<< "base_=" << base_ << ", wid_=" << wid_
|
||||
<< ", vwid_=" << vwid_ << ", bit=" << bit << endl;
|
||||
<< ", vwid_=" << vwid_ << ", bit=" // XXX << bit
|
||||
<< endl;
|
||||
}
|
||||
assert(bit.size() == wid_);
|
||||
|
||||
|
|
@ -166,6 +167,9 @@ void compile_part_select_var(char*label, char*source, char*var,
|
|||
|
||||
/*
|
||||
* $Log: part.cc,v $
|
||||
* Revision 1.8 2005/07/14 23:34:19 steve
|
||||
* gcc4 compile errors.
|
||||
*
|
||||
* Revision 1.7 2005/06/26 21:08:11 steve
|
||||
* More verbose debugging of part select width errors.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
#ifdef HAVE_CVS_IDENT
|
||||
#ident "$Id: vpi_signal.cc,v 1.68 2005/06/13 00:54:04 steve Exp $"
|
||||
#ident "$Id: vpi_signal.cc,v 1.69 2005/07/14 23:34:19 steve Exp $"
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
@ -107,7 +107,7 @@ static int signal_get(int code, vpiHandle ref)
|
|||
|
||||
case _vpiNexusId:
|
||||
if (rfp->msb == rfp->lsb)
|
||||
return (int)rfp->node;
|
||||
return (int) (unsigned long) rfp->node;
|
||||
else
|
||||
return 0;
|
||||
|
||||
|
|
@ -822,6 +822,9 @@ vpiHandle vpip_make_net(const char*name, int msb, int lsb,
|
|||
|
||||
/*
|
||||
* $Log: vpi_signal.cc,v $
|
||||
* Revision 1.69 2005/07/14 23:34:19 steve
|
||||
* gcc4 compile errors.
|
||||
*
|
||||
* Revision 1.68 2005/06/13 00:54:04 steve
|
||||
* More unified vec4 to hex string functions.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
#ident "$Id: vvp_net.h,v 1.42 2005/07/06 04:29:25 steve Exp $"
|
||||
#ident "$Id: vvp_net.h,v 1.43 2005/07/14 23:34:19 steve Exp $"
|
||||
|
||||
# include "config.h"
|
||||
# include <stddef.h>
|
||||
|
|
@ -30,6 +30,7 @@
|
|||
class ostream;
|
||||
#endif
|
||||
|
||||
using namespace std;
|
||||
|
||||
|
||||
/* Data types */
|
||||
|
|
@ -73,7 +74,7 @@ extern vvp_bit4_t operator ^ (vvp_bit4_t a, vvp_bit4_t b);
|
|||
extern ostream& operator<< (ostream&o, vvp_bit4_t a);
|
||||
|
||||
/*
|
||||
* This class represents scaler values collected into vectors. The
|
||||
* This class represents scalar values collected into vectors. The
|
||||
* vector values can be accessed individually, or treated as a
|
||||
* unit. in any case, the elements of the vector are addressed from
|
||||
* zero(LSB) to size-1(MSB).
|
||||
|
|
@ -954,6 +955,9 @@ inline void vvp_send_vec4_pv(vvp_net_ptr_t ptr, const vvp_vector4_t&val,
|
|||
|
||||
/*
|
||||
* $Log: vvp_net.h,v $
|
||||
* Revision 1.43 2005/07/14 23:34:19 steve
|
||||
* gcc4 compile errors.
|
||||
*
|
||||
* Revision 1.42 2005/07/06 04:29:25 steve
|
||||
* Implement real valued signals and arith nodes.
|
||||
*
|
||||
|
|
|
|||
Loading…
Reference in New Issue