From 20d3a8508e5d69ee657522792a1203148db08fda Mon Sep 17 00:00:00 2001 From: steve Date: Sun, 3 Apr 2005 06:13:34 +0000 Subject: [PATCH] Remove dead fvectors class. --- vvp/Makefile.in | 4 +- vvp/functor.cc | 45 ++-------------------- vvp/functor.h | 18 ++------- vvp/fvectors.cc | 99 ------------------------------------------------- 4 files changed, 10 insertions(+), 156 deletions(-) delete mode 100644 vvp/fvectors.cc diff --git a/vvp/Makefile.in b/vvp/Makefile.in index df4404a57..f4d904a63 100644 --- a/vvp/Makefile.in +++ b/vvp/Makefile.in @@ -16,7 +16,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.64 2005/02/03 04:55:13 steve Exp $" +#ident "$Id: Makefile.in,v 1.65 2005/04/03 06:13:34 steve Exp $" # # SHELL = /bin/sh @@ -82,7 +82,7 @@ vpi_memory.o vpi_vthr_vector.o vpip_bin.o vpip_hex.o vpip_oct.o \ vpip_to_dec.o vpip_format.o vvp_vpi.o O = main.o parse.o parse_misc.o lexor.o arith.o bufif.o compile.o concat.o \ -functor.o fvectors.o npmos.o part.o reduce.o resolv.o stop.o symbols.o \ +functor.o npmos.o part.o reduce.o resolv.o stop.o symbols.o \ ufunc.o codes.o \ vthread.o schedule.o statistics.o tables.o udp.o vvp_net.o memory.o \ force.o event.o logic.o delay.o words.o $V diff --git a/vvp/functor.cc b/vvp/functor.cc index 5ab7a5943..8eb5b6b97 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.46 2005/04/03 05:45:51 steve Exp $" +#ident "$Id: functor.cc,v 1.47 2005/04/03 06:13:34 steve Exp $" #endif # include "functor.h" @@ -132,7 +132,6 @@ functor_s::functor_s() inhibit = 0; } #endif - functor_s::~functor_s() { } @@ -184,47 +183,11 @@ void functor_s::put_ostr(unsigned val, unsigned str, #endif } -// Special infrastructure functor types - -extra_outputs_functor_s::~extra_outputs_functor_s() -{} - -void extra_outputs_functor_s::set(vvp_ipoint_t i, bool push, - unsigned val, unsigned) -{ - put(i, val); - functor_t base = functor_index(base_); - val = base->ival & 3; // yes, this is ugly - base->set(base_, push, val); -} - -extra_ports_functor_s::~extra_ports_functor_s() -{} - -void extra_ports_functor_s::set(vvp_ipoint_t i, bool push, - unsigned val, unsigned str) -{ - functor_t base = functor_index(base_); - base->set(i, push, val, str); -} - -extra_inputs_functor_s::~extra_inputs_functor_s() -{} - -void extra_inputs_functor_s::set(vvp_ipoint_t i, bool push, - unsigned val, unsigned) -{ - put(i, val); - functor_t base = functor_index(out); - val = base->ival & 3; // yes, this is ugly - base->set(ipoint_make(out,0), push, val); -} - -edge_inputs_functor_s::~edge_inputs_functor_s() -{} - /* * $Log: functor.cc,v $ + * Revision 1.47 2005/04/03 06:13:34 steve + * Remove dead fvectors class. + * * Revision 1.46 2005/04/03 05:45:51 steve * Rework the vvp_delay_t class. * diff --git a/vvp/functor.h b/vvp/functor.h index 53167784f..1b40b0a01 100644 --- a/vvp/functor.h +++ b/vvp/functor.h @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: functor.h,v 1.55 2005/04/03 06:13:34 steve Exp $" +#ident "$Id: functor.h,v 1.56 2005/04/03 06:16:54 steve Exp $" #endif /* NOTE: THIS FILE IS BEOING PHASED OUT. IT'S FUNCTIONALITY IS OBSOLETE. */ @@ -276,22 +276,12 @@ unsigned functor_get(vvp_ipoint_t ptr) return fp->get(); } -// Special infrastructure functor types -#if 0 -/* - * Vectors of functors - */ - -extern unsigned vvp_fvector_size(vvp_fvector_t v); -extern vvp_ipoint_t vvp_fvector_get(vvp_fvector_t v, unsigned i); -extern void vvp_fvector_set(vvp_fvector_t v, unsigned i, vvp_ipoint_t p); -extern vvp_ipoint_t *vvp_fvector_member(vvp_fvector_t v, unsigned i); -extern vvp_fvector_t vvp_fvector_new(unsigned size); -extern vvp_fvector_t vvp_fvector_continuous_new(unsigned size, vvp_ipoint_t p); -#endif /* * $Log: functor.h,v $ + * Revision 1.56 2005/04/03 06:16:54 steve + * Remove dead fvectors class. + * * Revision 1.55 2005/04/03 06:13:34 steve * Remove dead fvectors class. * diff --git a/vvp/fvectors.cc b/vvp/fvectors.cc deleted file mode 100644 index ef57e5450..000000000 --- a/vvp/fvectors.cc +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (c) 2001 Stephan Boettcher - * - * This source code is free software; you can redistribute it - * and/or modify it in source code form under the terms of the GNU - * General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * 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: fvectors.cc,v 1.6 2002/08/12 01:35:08 steve Exp $" -#endif - -# include "config.h" - -# include "functor.h" -# include -#ifdef HAVE_MALLOC_H -# include -#endif -# include -# include - -struct vvp_fvector_s { - unsigned size; - union { - vvp_ipoint_t iptrs[1]; - struct { - unsigned size; - vvp_ipoint_t iptr; - } cont; - }; -}; - -unsigned vvp_fvector_size(vvp_fvector_t v) -{ - return v->size ? v->size : v->cont.size; -} - -vvp_ipoint_t vvp_fvector_get(vvp_fvector_t v, unsigned i) -{ - if (!v->size) - return ipoint_index(v->cont.iptr, i); - assert(i < v->size); - return v->iptrs[i]; -} - -void vvp_fvector_set(vvp_fvector_t v, unsigned i, vvp_ipoint_t p) -{ - assert(i < v->size); - v->iptrs[i] = p; -} - -vvp_ipoint_t *vvp_fvector_member(vvp_fvector_t v, unsigned i) -{ - assert(i < v->size); - return &v->iptrs[i]; -} - -vvp_fvector_t vvp_fvector_continuous_new(unsigned size, vvp_ipoint_t p) -{ - vvp_fvector_t v = (vvp_fvector_t) - malloc(sizeof(struct vvp_fvector_s)); - v->size = 0; - v->cont.size = size; - v->cont.iptr = p; - return v; -} - -vvp_fvector_t vvp_fvector_new(unsigned size) -{ - assert(size>0); - vvp_fvector_t v = (vvp_fvector_t) - malloc(sizeof(struct vvp_fvector_s) - + (size-1)*sizeof(vvp_ipoint_t)); - assert(v); - v->size = size; - memset(v->iptrs, 0, size*sizeof(vvp_ipoint_t)); - return v; -} - -/* - * $Log: fvectors.cc,v $ - * Revision 1.6 2002/08/12 01:35:08 steve - * conditional ident string using autoconfig. - * - * Revision 1.5 2002/08/11 23:47:05 steve - * Add missing Log and Ident strings. - * - */