From 72240c460eed6ecd3de2befd1de3fa8f218d2354 Mon Sep 17 00:00:00 2001 From: steve Date: Sun, 6 Mar 2005 17:25:03 +0000 Subject: [PATCH] Remove dead code from scheduler. --- vvp/functor.cc | 7 ++++++- vvp/functor.h | 6 +++++- vvp/schedule.cc | 51 ++++--------------------------------------------- 3 files changed, 15 insertions(+), 49 deletions(-) diff --git a/vvp/functor.cc b/vvp/functor.cc index bf96aab92..a61cf26ff 100644 --- a/vvp/functor.cc +++ b/vvp/functor.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: functor.cc,v 1.44 2004/10/04 01:10:59 steve Exp $" +#ident "$Id: functor.cc,v 1.45 2005/03/06 17:25:03 steve Exp $" #endif # include "functor.h" @@ -156,6 +156,7 @@ void functor_s::propagate(unsigned val, unsigned str, bool push) void functor_s::put_ostr(unsigned val, unsigned str, bool push, bool nba_flag) { +#if 0 if (str != get_ostr() || val != get_oval()) { unsigned char ooval = oval; @@ -179,6 +180,7 @@ void functor_s::put_ostr(unsigned val, unsigned str, else schedule(del, nba_flag); } +#endif } // Special infrastructure functor types @@ -222,6 +224,9 @@ edge_inputs_functor_s::~edge_inputs_functor_s() /* * $Log: functor.cc,v $ + * Revision 1.45 2005/03/06 17:25:03 steve + * Remove dead code from scheduler. + * * Revision 1.44 2004/10/04 01:10:59 steve * Clean up spurious trailing white space. * diff --git a/vvp/functor.h b/vvp/functor.h index c36c15221..b881b35a7 100644 --- a/vvp/functor.h +++ b/vvp/functor.h @@ -19,9 +19,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: functor.h,v 1.53 2004/12/11 02:31:29 steve Exp $" +#ident "$Id: functor.h,v 1.54 2005/03/06 17:25:03 steve Exp $" #endif +/* NOTE: THIS FILE IS BEOING PHASED OUT. IT'S FUNCTIONALITY IS OBSOLETE. */ # include "pointers.h" # include "delay.h" @@ -334,6 +335,9 @@ extern vvp_fvector_t vvp_fvector_continuous_new(unsigned size, vvp_ipoint_t p); /* * $Log: functor.h,v $ + * Revision 1.54 2005/03/06 17:25:03 steve + * Remove dead code from scheduler. + * * Revision 1.53 2004/12/11 02:31:29 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/schedule.cc b/vvp/schedule.cc index c7c27d1ee..0c83df4cd 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.32 2005/03/06 17:07:48 steve Exp $" +#ident "$Id: schedule.cc,v 1.33 2005/03/06 17:25:03 steve Exp $" #endif # include "schedule.h" @@ -412,21 +412,6 @@ void schedule_vthread(vthread_t thr, vvp_time64_t delay, bool push_flag) } } -void functor_s::schedule(vvp_time64_t delay, bool nba_flag) -{ -#if 0 - struct event_s*cur = new event_s; - - cur->funp = this; - cur->type = TYPE_PROP; - - schedule_event_(cur, delay, nba_flag? SEQ_NBASSIGN:SEQ_ACTIVE); -#else - fprintf(stderr, "XXXX I forgot how to schedule functors.\n"); -#endif -} - - void schedule_assign_vector(vvp_net_ptr_t ptr, vvp_vector4_t bit, vvp_time64_t delay) @@ -548,38 +533,7 @@ void schedule_simulate(void) } cur->run_run(); -#if 0 - switch (cur->type) { - case TYPE_THREAD: - count_thread_events += 1; - vthread_run(cur->thr); - break; - case TYPE_PROP: - //printf("Propagate %p\n", cur->fun); - count_prop_events += 1; - cur->funp->propagate(false); - break; - - case TYPE_ASSIGN: - count_assign_events += 1; - { static const unsigned val_table[4] = {St0, St1, StX, HiZ}; - functor_set(cur->fun, - cur->val, - val_table[cur->val], - false); - } - break; - - case TYPE_GEN: - count_gen_events += 1; - if (cur->obj && cur->obj->run) - cur->obj->run(cur->obj, cur->val); - - break; - - } -#endif delete (cur); } @@ -603,6 +557,9 @@ void schedule_simulate(void) /* * $Log: schedule.cc,v $ + * Revision 1.33 2005/03/06 17:25:03 steve + * Remove dead code from scheduler. + * * Revision 1.32 2005/03/06 17:07:48 steve * Non blocking assign to memory words. *