From f465bca30530d2c0955a0f442d1c1618504d6525 Mon Sep 17 00:00:00 2001
From: steve <steve>
Date: Sat, 11 Jun 2005 16:21:08 +0000
Subject: [PATCH]  UD delays use delay node.

---
 vvp/udp.cc | 34 +++++++++++++++++++++++-----------
 vvp/udp.h  |  8 +++++---
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/vvp/udp.cc b/vvp/udp.cc
index e2f407c24..518cbb02c 100644
--- a/vvp/udp.cc
+++ b/vvp/udp.cc
@@ -20,7 +20,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: udp.cc,v 1.32 2005/06/11 02:04:48 steve Exp $"
+#ident "$Id: udp.cc,v 1.33 2005/06/11 16:21:08 steve Exp $"
 #endif
 
 #include "udp.h"
@@ -818,13 +818,10 @@ vvp_bit4_t vvp_udp_seq_s::test_edges_(const udp_levels_table&cur,
       return BIT4_X;
 }
 
-vvp_udp_fun_core::vvp_udp_fun_core(vvp_net_t*net,
-				   vvp_udp_s*def,
-				   vvp_delay_t*del)
+vvp_udp_fun_core::vvp_udp_fun_core(vvp_net_t*net, vvp_udp_s*def)
 : vvp_wide_fun_core(net, def->port_count())
 {
       def_ = def;
-      delay_ = del;
       cur_out_ = def_->get_init();
 	// Assume initially that all the inputs are 1'bx
       current_.mask0 = 0;
@@ -878,13 +875,14 @@ void vvp_udp_fun_core::recv_vec4_from_inputs(unsigned port)
       }
 
       vvp_bit4_t out_bit = def_->calculate_output(current_, prev, cur_out_);
+
+      if (out_bit == cur_out_)
+	    return;
+
       vvp_vector4_t out (1);
       out.set_bit(0, out_bit);
 
-      if (delay_)
-	    propagate_vec4(out, delay_->get_delay(cur_out_, out_bit));
-      else
-	    propagate_vec4(out);
+      propagate_vec4(out);
 
       cur_out_ = out_bit;
 }
@@ -904,9 +902,20 @@ void compile_udp_functor(char*label, char*type,
       free(type);
 
       vvp_net_t*ptr = new vvp_net_t;
-      vvp_udp_fun_core*core = new vvp_udp_fun_core(ptr, def, delay);
+      vvp_udp_fun_core*core = new vvp_udp_fun_core(ptr, def);
       ptr->fun = core;
-      define_functor_symbol(label, ptr);
+
+      if (delay != 0) {
+	    vvp_net_t*net_drv = new vvp_net_t;
+	    vvp_fun_delay*obj_drv = new vvp_fun_delay(net_drv, BIT4_X, *delay);
+	    net_drv->fun = obj_drv;
+
+	    ptr->out = vvp_net_ptr_t(net_drv,0);
+	    define_functor_symbol(label, net_drv);
+
+      } else {
+	    define_functor_symbol(label, ptr);
+      }
       free(label);
 
       wide_inputs_connect(core, argc, argv);
@@ -915,6 +924,9 @@ void compile_udp_functor(char*label, char*type,
 
 /*
  * $Log: udp.cc,v $
+ * Revision 1.33  2005/06/11 16:21:08  steve
+ *  UD delays use delay node.
+ *
  * Revision 1.32  2005/06/11 02:04:48  steve
  *  Handle all edge types of a synchronous UDP.
  *
diff --git a/vvp/udp.h b/vvp/udp.h
index de3fbd57e..c1698fe7c 100644
--- a/vvp/udp.h
+++ b/vvp/udp.h
@@ -22,7 +22,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: udp.h,v 1.18 2005/06/09 05:04:45 steve Exp $"
+#ident "$Id: udp.h,v 1.19 2005/06/11 16:21:08 steve Exp $"
 #endif
 
 # include  <vvp_net.h>
@@ -228,7 +228,7 @@ struct vvp_udp_s *udp_find(const char *label);
 class vvp_udp_fun_core  : public vvp_wide_fun_core, private vvp_gen_event_s {
 
     public:
-      vvp_udp_fun_core(vvp_net_t*net, vvp_udp_s*def, vvp_delay_t*del);
+      vvp_udp_fun_core(vvp_net_t*net, vvp_udp_s*def);
       ~vvp_udp_fun_core();
 
       void recv_vec4_from_inputs(unsigned);
@@ -237,7 +237,6 @@ class vvp_udp_fun_core  : public vvp_wide_fun_core, private vvp_gen_event_s {
       void run_run();
 
       vvp_udp_s*def_;
-      vvp_delay_t*delay_;
       vvp_bit4_t cur_out_;
       udp_levels_table current_;
 };
@@ -246,6 +245,9 @@ class vvp_udp_fun_core  : public vvp_wide_fun_core, private vvp_gen_event_s {
 
 /*
  * $Log: udp.h,v $
+ * Revision 1.19  2005/06/11 16:21:08  steve
+ *  UD delays use delay node.
+ *
  * Revision 1.18  2005/06/09 05:04:45  steve
  *  Support UDP initial values.
  *