From 96213fe0ace8216c54ae2954ab8859de7558f9fc Mon Sep 17 00:00:00 2001
From: steve <steve>
Date: Mon, 22 Apr 2002 03:15:25 +0000
Subject: [PATCH]  Keep delays applied to BUFZ devices.

---
 t-dll.cc            |  9 ++++++++-
 tgt-stub/stub.c     |  9 +++++++--
 tgt-vvp/vvp_scope.c | 11 ++++++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/t-dll.cc b/t-dll.cc
index 0f6d6202c..638f63cf9 100644
--- a/t-dll.cc
+++ b/t-dll.cc
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: t-dll.cc,v 1.80 2002/03/09 02:10:22 steve Exp $"
+#ident "$Id: t-dll.cc,v 1.81 2002/04/22 03:15:25 steve Exp $"
 #endif
 
 # include "config.h"
@@ -571,6 +571,10 @@ bool dll_target::bufz(const NetBUFZ*net)
       obj->name_ = strdup(net->name());
       logic_attributes(obj, net);
 
+      obj->delay[0] = net->rise_time();
+      obj->delay[1] = net->fall_time();
+      obj->delay[2] = net->decay_time();
+
       scope_add_logic(scope, obj);
 
       return true;
@@ -1929,6 +1933,9 @@ extern const struct target tgt_dll = { "dll", &dll_target_obj };
 
 /*
  * $Log: t-dll.cc,v $
+ * Revision 1.81  2002/04/22 03:15:25  steve
+ *  Keep delays applied to BUFZ devices.
+ *
  * Revision 1.80  2002/03/09 02:10:22  steve
  *  Add the NetUserFunc netlist node.
  *
diff --git a/tgt-stub/stub.c b/tgt-stub/stub.c
index c7c57d73c..66a8d1d74 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
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: stub.c,v 1.54 2002/04/22 02:40:32 steve Exp $"
+#ident "$Id: stub.c,v 1.55 2002/04/22 03:15:25 steve Exp $"
 #endif
 
 # include "config.h"
@@ -520,7 +520,9 @@ static void show_logic(ivl_net_logic_t net)
 		    ivl_nexus_name(ivl_logic_pin(net, 0)));
 	    break;
 	  case IVL_LO_BUFZ:
-	    fprintf(out, "  bufz %s (%s", name,
+	    fprintf(out, "  bufz #(%u) %s (%s",
+		    ivl_logic_delay(net, 0),
+		    name,
 		    ivl_nexus_name(ivl_logic_pin(net, 0)));
 	    break;
 	  case IVL_LO_OR:
@@ -616,6 +618,9 @@ int target_design(ivl_design_t des)
 
 /*
  * $Log: stub.c,v $
+ * Revision 1.55  2002/04/22 03:15:25  steve
+ *  Keep delays applied to BUFZ devices.
+ *
  * Revision 1.54  2002/04/22 02:40:32  steve
  *  Dump the while loop expression.
  *
diff --git a/tgt-vvp/vvp_scope.c b/tgt-vvp/vvp_scope.c
index f870ecb48..7bbff1dd0 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
  */
 #if !defined(WINNT)
-#ident "$Id: vvp_scope.c,v 1.66 2002/03/18 00:18:50 steve Exp $"
+#ident "$Id: vvp_scope.c,v 1.67 2002/04/22 03:15:25 steve Exp $"
 #endif
 
 # include  "vvp_priv.h"
@@ -250,6 +250,9 @@ static const char* draw_net_input_drive(ivl_nexus_t nex, ivl_nexus_ptr_t nptr)
 		  if (ivl_nexus_ptr_drive1(nptr) != IVL_DR_STRONG)
 			break;
 
+		  if (ivl_logic_delay(lptr, 0) != 0)
+			break;
+
 		  return draw_net_input(ivl_logic_pin(lptr, 1));
 	    } while(0);
 
@@ -694,6 +697,9 @@ static void draw_logic_in_scope(ivl_net_logic_t lptr)
 		if (dr1 != IVL_DR_STRONG)
 			break;
 
+		if (ivl_logic_delay(lptr, 0) != 0)
+		      break;
+
 		return;
 	  }
 
@@ -1476,6 +1482,9 @@ int draw_scope(ivl_scope_t net, ivl_scope_t parent)
 
 /*
  * $Log: vvp_scope.c,v $
+ * Revision 1.67  2002/04/22 03:15:25  steve
+ *  Keep delays applied to BUFZ devices.
+ *
  * Revision 1.66  2002/03/18 00:18:50  steve
  *  Generate port information in the .ufunc statement.
  *