diff --git a/vvp/compile.cc b/vvp/compile.cc index 2baca8d6d..02dce252a 100644 --- a/vvp/compile.cc +++ b/vvp/compile.cc @@ -17,12 +17,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: compile.cc,v 1.206 2005/06/09 05:04:45 steve Exp $" +#ident "$Id: compile.cc,v 1.207 2005/06/12 01:10:26 steve Exp $" #endif # include "arith.h" # include "compile.h" -# include "functor.h" # include "logic.h" # include "resolv.h" # include "udp.h" @@ -798,68 +797,6 @@ void wide_inputs_connect(vvp_wide_fun_core*core, } } - -struct const_functor_s: public functor_s { - const_functor_s(unsigned str0, unsigned str1) - { odrive0 = str0; odrive1 = str1; } - virtual void set(vvp_ipoint_t, bool, unsigned, unsigned); -}; -void const_functor_s::set(vvp_ipoint_t p, bool, unsigned val, unsigned) -{ - fprintf(stderr, "internal error: Set value to const_functor 0x%x\n", p); - fprintf(stderr, " : Value is %u, trying to set %u\n", - oval, val); - fprintf(stderr, " : I'm driving functor 0x%x\n", out); - assert(0); -} - -/* Lookup a functor[idx] and save the ipoint in *ref. */ - -#if 0 -static void functor_reference(vvp_ipoint_t *ref, char *lab, unsigned idx) -{ - if (lab == 0) - *ref = make_const_functor(3,6,6); - - else if (strcmp(lab, "C<0>") == 0) - *ref = make_const_functor(0,6,6); - - else if (strcmp(lab, "C") == 0) - *ref = make_const_functor(0,7,7); - - else if (strcmp(lab, "C") == 0) - *ref = make_const_functor(0,5,5); - - else if (strcmp(lab, "C") == 0) - *ref = make_const_functor(0,3,3); - - else if (strcmp(lab, "C<1>") == 0) - *ref = make_const_functor(1,6,6); - - else if (strcmp(lab, "C") == 0) - *ref = make_const_functor(1,7,7); - - else if (strcmp(lab, "C") == 0) - *ref = make_const_functor(1,5,5); - - else if (strcmp(lab, "C") == 0) - *ref = make_const_functor(1,3,3); - - else if (strcmp(lab, "C") == 0) - *ref = make_const_functor(2,6,6); - - else if (strcmp(lab, "C") == 0) - *ref = make_const_functor(3,6,6); - - else { - functor_ref_lookup(ref, lab, idx); - return; - } - free(lab); -} -#endif - - static void make_arith(vvp_arith_ *arith, char*label, long wid, unsigned argc, struct symb_s*argv) @@ -1561,6 +1498,9 @@ void compile_param_string(char*label, char*name, char*str, char*value) /* * $Log: compile.cc,v $ + * Revision 1.207 2005/06/12 01:10:26 steve + * Remove useless references to functor.h + * * Revision 1.206 2005/06/09 05:04:45 steve * Support UDP initial values. * diff --git a/vvp/schedule.cc b/vvp/schedule.cc index dd7f7841f..77c077b82 100644 --- a/vvp/schedule.cc +++ b/vvp/schedule.cc @@ -17,11 +17,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: schedule.cc,v 1.36 2005/06/09 05:04:45 steve Exp $" +#ident "$Id: schedule.cc,v 1.37 2005/06/12 01:10:26 steve Exp $" #endif # include "schedule.h" -# include "functor.h" # include "memory.h" # include "vthread.h" #ifdef HAVE_MALLOC_H @@ -582,6 +581,9 @@ void schedule_simulate(void) /* * $Log: schedule.cc,v $ + * Revision 1.37 2005/06/12 01:10:26 steve + * Remove useless references to functor.h + * * Revision 1.36 2005/06/09 05:04:45 steve * Support UDP initial values. * diff --git a/vvp/ufunc.cc b/vvp/ufunc.cc index 2b5c6b59e..55e48fdaf 100644 --- a/vvp/ufunc.cc +++ b/vvp/ufunc.cc @@ -17,13 +17,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: ufunc.cc,v 1.7 2005/04/01 06:02:45 steve Exp $" +#ident "$Id: ufunc.cc,v 1.8 2005/06/12 01:10:26 steve Exp $" #endif # include "compile.h" # include "symbols.h" # include "codes.h" -# include "functor.h" # include "ufunc.h" # include "vthread.h" # include "schedule.h" @@ -184,6 +183,9 @@ void compile_ufunc(char*label, char*code, unsigned wid, /* * $Log: ufunc.cc,v $ + * Revision 1.8 2005/06/12 01:10:26 steve + * Remove useless references to functor.h + * * Revision 1.7 2005/04/01 06:02:45 steve * Reimplement combinational UDPs. * diff --git a/vvp/vpi_callback.cc b/vvp/vpi_callback.cc index 91b8dc4fa..ff1829317 100644 --- a/vvp/vpi_callback.cc +++ b/vvp/vpi_callback.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: vpi_callback.cc,v 1.37 2005/06/09 05:04:45 steve Exp $" +#ident "$Id: vpi_callback.cc,v 1.38 2005/06/12 01:10:26 steve Exp $" #endif /* @@ -30,7 +30,6 @@ # include # include "vpi_priv.h" # include "schedule.h" -# include "functor.h" # include "event.h" # include # include @@ -479,6 +478,9 @@ void vvp_fun_signal::run_vpi_callbacks() /* * $Log: vpi_callback.cc,v $ + * Revision 1.38 2005/06/12 01:10:26 steve + * Remove useless references to functor.h + * * Revision 1.37 2005/06/09 05:04:45 steve * Support UDP initial values. * diff --git a/vvp/vpi_event.cc b/vvp/vpi_event.cc index a7a828bf4..1beaff433 100644 --- a/vvp/vpi_event.cc +++ b/vvp/vpi_event.cc @@ -17,11 +17,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: vpi_event.cc,v 1.10 2004/12/11 02:31:30 steve Exp $" +#ident "$Id: vpi_event.cc,v 1.11 2005/06/12 01:10:26 steve Exp $" #endif # include "vpi_priv.h" -# include "functor.h" # include #ifdef HAVE_MALLOC_H # include @@ -142,6 +141,9 @@ void vpip_run_named_event_callbacks(vpiHandle ref) /* * $Log: vpi_event.cc,v $ + * Revision 1.11 2005/06/12 01:10:26 steve + * Remove useless references to functor.h + * * Revision 1.10 2004/12/11 02:31:30 steve * Rework of internals to carry vectors through nexus instead * of single bits. Make the ivl, tgt-vvp and vvp initial changes diff --git a/vvp/vpi_scope.cc b/vvp/vpi_scope.cc index 03931e43d..f10a2239a 100644 --- a/vvp/vpi_scope.cc +++ b/vvp/vpi_scope.cc @@ -17,13 +17,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: vpi_scope.cc,v 1.33 2005/04/28 04:59:53 steve Exp $" +#ident "$Id: vpi_scope.cc,v 1.34 2005/06/12 01:10:26 steve Exp $" #endif # include "compile.h" # include "vpi_priv.h" # include "symbols.h" -# include "functor.h" # include "statistics.h" #ifdef HAVE_MALLOC_H # include @@ -480,6 +479,9 @@ void vpip_attach_to_current_scope(vpiHandle obj) /* * $Log: vpi_scope.cc,v $ + * Revision 1.34 2005/06/12 01:10:26 steve + * Remove useless references to functor.h + * * Revision 1.33 2005/04/28 04:59:53 steve * Remove dead functor code. * diff --git a/vvp/vpi_signal.cc b/vvp/vpi_signal.cc index 29c412b4e..fc705e2a9 100644 --- a/vvp/vpi_signal.cc +++ b/vvp/vpi_signal.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: vpi_signal.cc,v 1.66 2005/04/13 06:34:20 steve Exp $" +#ident "$Id: vpi_signal.cc,v 1.67 2005/06/12 01:10:26 steve Exp $" #endif /* @@ -26,7 +26,6 @@ */ # include "vpi_priv.h" -# include "functor.h" # include "schedule.h" # include "statistics.h" # include @@ -516,7 +515,7 @@ static void signal_get_value(vpiHandle ref, s_vpi_value*vp) */ static void functor_poke(struct __vpiSignal*rfp, unsigned idx, - unsigned val, unsigned str, unsigned long dly =0) + vvp_scalar_t val, unsigned long dly =0) { fprintf(stderr, "XXXX functor_poke not implemented\n"); } @@ -536,9 +535,9 @@ static void signal_put_stringval(struct __vpiSignal*rfp, unsigned wid, for (bit = 0 ; bit < 8 ; bit += 1) { if (byte & 1) - functor_poke(rfp, idx, 1, St1); + functor_poke(rfp, idx, vvp_scalar_t(BIT4_1,6,6)); else - functor_poke(rfp, idx, 0, St0); + functor_poke(rfp, idx, vvp_scalar_t(BIT4_0,6,6)); byte >>= 1; idx += 1; @@ -546,7 +545,7 @@ static void signal_put_stringval(struct __vpiSignal*rfp, unsigned wid, } while (idx < wid) { - functor_poke(rfp, idx, 0, St0); + functor_poke(rfp, idx, vvp_scalar_t(BIT4_0,6,6)); idx += 1; } } @@ -848,6 +847,9 @@ vpiHandle vpip_make_net(const char*name, int msb, int lsb, /* * $Log: vpi_signal.cc,v $ + * Revision 1.67 2005/06/12 01:10:26 steve + * Remove useless references to functor.h + * * Revision 1.66 2005/04/13 06:34:20 steve * Add vvp driver functor for logic outputs, * Add ostream output operators for debugging.