diff --git a/libveriuser/getinstance.c b/libveriuser/getinstance.c index 4fb4b26a1..dbd613b97 100644 --- a/libveriuser/getinstance.c +++ b/libveriuser/getinstance.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: getinstance.c,v 1.4 2003/05/18 00:16:35 steve Exp $" +#ident "$Id: getinstance.c,v 1.5 2005/09/20 18:34:01 steve Exp $" #endif #include @@ -28,11 +28,14 @@ */ PLI_BYTE8* tf_getinstance(void) { - return (char *)vpi_handle(vpiSysTfCall, 0 /* NULL */); + return (PLI_BYTE8 *)vpi_handle(vpiSysTfCall, 0 /* NULL */); } /* * $Log: getinstance.c,v $ + * Revision 1.5 2005/09/20 18:34:01 steve + * Clean up compiler warnings. + * * Revision 1.4 2003/05/18 00:16:35 steve * Add PLI_TRACE tracing of PLI1 modules. * diff --git a/tgt-stub/stub.c b/tgt-stub/stub.c index ce4c3daab..5f9c94d1f 100644 --- a/tgt-stub/stub.c +++ b/tgt-stub/stub.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: stub.c,v 1.133 2005/09/14 02:53:15 steve Exp $" +#ident "$Id: stub.c,v 1.134 2005/09/20 18:34:01 steve Exp $" #endif # include "config.h" @@ -158,6 +158,9 @@ void show_expression(ivl_expr_t net, unsigned ind) const char*vt = "?"; switch (ivl_expr_value(net)) { + case IVL_VT_NO_TYPE: + vt = "no_type"; + break; case IVL_VT_VOID: vt = "void"; break; @@ -1530,6 +1533,9 @@ int target_design(ivl_design_t des) /* * $Log: stub.c,v $ + * Revision 1.134 2005/09/20 18:34:01 steve + * Clean up compiler warnings. + * * Revision 1.133 2005/09/14 02:53:15 steve * Support bool expressions and compares handle them optimally. * diff --git a/tgt-vvp/vvp_scope.c b/tgt-vvp/vvp_scope.c index c6db082a5..00806e853 100644 --- a/tgt-vvp/vvp_scope.c +++ b/tgt-vvp/vvp_scope.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: vvp_scope.c,v 1.132 2005/08/06 17:58:16 steve Exp $" +#ident "$Id: vvp_scope.c,v 1.133 2005/09/20 18:34:01 steve Exp $" #endif # include "vvp_priv.h" @@ -816,11 +816,11 @@ static void draw_reg_in_scope(ivl_signal_t sig) ivl_signal_signed(sig)? "/s" : ""; switch (ivl_signal_data_type(sig)) { - case IVL_VT_LOGIC: - break; case IVL_VT_REAL: datatype_flag = "/real"; break; + default: + break; } fprintf(vvp_out, "V_%s .var%s \"%s\", %d, %d;\n", @@ -852,11 +852,11 @@ static void draw_net_in_scope(ivl_signal_t sig) } switch (ivl_signal_data_type(sig)) { - case IVL_VT_LOGIC: - break; case IVL_VT_REAL: datatype_flag = "/real"; break; + default: + break; } fprintf(vvp_out, "V_%s .net%s \"%s\", %d, %d, %s;\n", @@ -1812,7 +1812,7 @@ static void draw_lpm_part_bi(ivl_lpm_t net) unsigned idx; ivl_nexus_t nex; - ivl_nexus_ptr_t ptr; + ivl_nexus_ptr_t ptr = 0; char*p_str; char*v_str; @@ -1828,6 +1828,7 @@ static void draw_lpm_part_bi(ivl_lpm_t net) if (ivl_nexus_ptr_lpm(ptr) == net) break; } + assert(ptr != 0); p_str = draw_net_input_x(nex, ptr); nex = ivl_lpm_data(net,0); @@ -2081,6 +2082,9 @@ int draw_scope(ivl_scope_t net, ivl_scope_t parent) /* * $Log: vvp_scope.c,v $ + * Revision 1.133 2005/09/20 18:34:01 steve + * Clean up compiler warnings. + * * Revision 1.132 2005/08/06 17:58:16 steve * Implement bi-directional part selects. * diff --git a/vpi/sys_fileio.c b/vpi/sys_fileio.c index edd1c479d..0177d7c35 100644 --- a/vpi/sys_fileio.c +++ b/vpi/sys_fileio.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: sys_fileio.c,v 1.6 2005/01/09 20:12:22 steve Exp $" +#ident "$Id: sys_fileio.c,v 1.7 2005/09/20 18:34:01 steve Exp $" #endif # include "vpi_user.h" @@ -36,7 +36,7 @@ static int sys_fopen_calltf(char *name) { s_vpi_value value; - unsigned char *mode_string = 0; + char *mode_string = 0; vpiHandle call_handle = vpi_handle(vpiSysTfCall, 0); vpiHandle argv = vpi_iterate(vpiArgument, call_handle); @@ -479,6 +479,9 @@ void sys_fileio_register() /* * $Log: sys_fileio.c,v $ + * Revision 1.7 2005/09/20 18:34:01 steve + * Clean up compiler warnings. + * * Revision 1.6 2005/01/09 20:12:22 steve * Merge $fopen robustness fix from 0.8 * diff --git a/vvp/compile.cc b/vvp/compile.cc index 747a75df6..88d8e3327 100644 --- a/vvp/compile.cc +++ b/vvp/compile.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: compile.cc,v 1.212 2005/09/17 04:01:01 steve Exp $" +#ident "$Id: compile.cc,v 1.213 2005/09/20 18:34:01 steve Exp $" #endif # include "arith.h" @@ -684,7 +684,7 @@ void input_connect(vvp_net_t*fdx, unsigned port, char*label) if ((strncmp(label, "C4<", 3) == 0) && ((tp = strchr(label,'>'))) && (tp[1] == 0) - && (strspn(label+3, "01xz") == (tp-label-3))) { + && (strspn(label+3, "01xz")+3 == (unsigned)(tp-label))) { size_t v4size = tp-label-3; vvp_vector4_t tmp (v4size); @@ -728,7 +728,7 @@ void input_connect(vvp_net_t*fdx, unsigned port, char*label) if ((strncmp(label, "C8<", 3) == 0) && ((tp = strchr(label,'>'))) && (tp[1] == 0) - && (strspn(label+3, "01234567xz") == (tp-label-3))) { + && (strspn(label+3, "01234567xz")+3 == (unsigned)(tp-label))) { size_t vsize = tp-label-3; assert(vsize%3 == 0); @@ -768,7 +768,7 @@ void input_connect(vvp_net_t*fdx, unsigned port, char*label) if ((strncmp(label, "Cr<", 3) == 0) && ((tp = strchr(label,'>'))) && (tp[1] == 0) - && (strspn(label+3, "0123456789.-e") == tp-label-3)) { + && (strspn(label+3, "0123456789.-e")+3 == (unsigned)(tp-label))) { double tmp; @@ -1481,6 +1481,9 @@ void compile_param_string(char*label, char*name, char*str, char*value) /* * $Log: compile.cc,v $ + * Revision 1.213 2005/09/20 18:34:01 steve + * Clean up compiler warnings. + * * Revision 1.212 2005/09/17 04:01:01 steve * Add the load/v.p instruction. * diff --git a/vvp/delay.cc b/vvp/delay.cc index 0ce13e62d..039254766 100644 --- a/vvp/delay.cc +++ b/vvp/delay.cc @@ -17,13 +17,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: delay.cc,v 1.9 2005/07/06 04:29:25 steve Exp $" +#ident "$Id: delay.cc,v 1.10 2005/09/20 18:34:02 steve Exp $" #endif #include "delay.h" #include "schedule.h" -#include -#include #include vvp_delay_t::vvp_delay_t(vvp_time64_t rise, vvp_time64_t fall) @@ -165,6 +163,9 @@ void vvp_fun_delay::run_run() /* * $Log: delay.cc,v $ + * Revision 1.10 2005/09/20 18:34:02 steve + * Clean up compiler warnings. + * * Revision 1.9 2005/07/06 04:29:25 steve * Implement real valued signals and arith nodes. * diff --git a/vvp/schedule.cc b/vvp/schedule.cc index 92f3b56d4..67620de0d 100644 --- a/vvp/schedule.cc +++ b/vvp/schedule.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: schedule.cc,v 1.39 2005/07/06 04:29:25 steve Exp $" +#ident "$Id: schedule.cc,v 1.40 2005/09/20 18:34:02 steve Exp $" #endif # include "schedule.h" @@ -69,6 +69,10 @@ struct event_time_s { void operator delete(void*obj, size_t s); }; +vvp_gen_event_s::~vvp_gen_event_s() +{ +} + /* * Derived event types */ @@ -601,6 +605,9 @@ void schedule_simulate(void) /* * $Log: schedule.cc,v $ + * Revision 1.40 2005/09/20 18:34:02 steve + * Clean up compiler warnings. + * * Revision 1.39 2005/07/06 04:29:25 steve * Implement real valued signals and arith nodes. * diff --git a/vvp/schedule.h b/vvp/schedule.h index 3b1b91068..001e0988e 100644 --- a/vvp/schedule.h +++ b/vvp/schedule.h @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: schedule.h,v 1.25 2005/07/06 04:29:25 steve Exp $" +#ident "$Id: schedule.h,v 1.26 2005/09/20 18:34:02 steve Exp $" #endif # include "vthread.h" @@ -85,6 +85,7 @@ extern void schedule_generic(vvp_gen_event_t obj, vvp_time64_t delay, struct vvp_gen_event_s { + virtual ~vvp_gen_event_s() =0; virtual void run_run() =0; }; @@ -132,6 +133,9 @@ extern unsigned long count_event_pool; /* * $Log: schedule.h,v $ + * Revision 1.26 2005/09/20 18:34:02 steve + * Clean up compiler warnings. + * * Revision 1.25 2005/07/06 04:29:25 steve * Implement real valued signals and arith nodes. * diff --git a/vvp/stop.cc b/vvp/stop.cc index 1828c2e57..312baa7e0 100644 --- a/vvp/stop.cc +++ b/vvp/stop.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: stop.cc,v 1.13 2005/01/29 06:29:17 steve Exp $" +#ident "$Id: stop.cc,v 1.14 2005/09/20 18:34:02 steve Exp $" #endif /* @@ -377,7 +377,7 @@ static void cmd_unknown(unsigned, char*argv[]) "of available commands.\n"); } -struct { +static struct { const char*name; void (*proc)(unsigned argc, char*argv[]); const char*summary; @@ -505,6 +505,9 @@ void stop_handler(int rc) /* * $Log: stop.cc,v $ + * Revision 1.14 2005/09/20 18:34:02 steve + * Clean up compiler warnings. + * * Revision 1.13 2005/01/29 06:29:17 steve * Support interactive mode even without readline. * diff --git a/vvp/vpi_real.cc b/vvp/vpi_real.cc index 659eaf85c..1e7b0d1b4 100644 --- a/vvp/vpi_real.cc +++ b/vvp/vpi_real.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: vpi_real.cc,v 1.10 2005/07/06 04:29:25 steve Exp $" +#ident "$Id: vpi_real.cc,v 1.11 2005/09/20 18:34:02 steve Exp $" #endif # include "vpi_priv.h" @@ -69,8 +69,6 @@ static vpiHandle real_var_put_value(vpiHandle ref, p_vpi_value vp) struct __vpiRealVar*rfp = (struct __vpiRealVar*)ref; - vvp_fun_signal_real*fun - = dynamic_cast(rfp->net->fun); vvp_net_ptr_t destination (rfp->net, 0); @@ -120,6 +118,9 @@ vpiHandle vpip_make_real_var(const char*name, vvp_net_t*net) /* * $Log: vpi_real.cc,v $ + * Revision 1.11 2005/09/20 18:34:02 steve + * Clean up compiler warnings. + * * Revision 1.10 2005/07/06 04:29:25 steve * Implement real valued signals and arith nodes. * diff --git a/vvp/vpi_tasks.cc b/vvp/vpi_tasks.cc index 4c9b0a78a..a4cdac4f8 100644 --- a/vvp/vpi_tasks.cc +++ b/vvp/vpi_tasks.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: vpi_tasks.cc,v 1.30 2005/08/29 02:38:50 steve Exp $" +#ident "$Id: vpi_tasks.cc,v 1.31 2005/09/20 18:34:02 steve Exp $" #endif /* @@ -222,6 +222,8 @@ static vpiHandle sysfunc_put_value(vpiHandle ref, p_vpi_value vp) case 3: bit4 = BIT4_X; break; + default: + assert(0); } vthread_put_bit(vpip_current_vthread, rfp->vbit+wdx+idx, bit4); @@ -485,6 +487,9 @@ void* vpi_get_userdata(vpiHandle ref) /* * $Log: vpi_tasks.cc,v $ + * Revision 1.31 2005/09/20 18:34:02 steve + * Clean up compiler warnings. + * * Revision 1.30 2005/08/29 02:38:50 steve * Eliminate int to vvp_bit4_t casts. *