From e89b9fc25e3e583cbd3310b74938833ae5b05739 Mon Sep 17 00:00:00 2001
From: steve <steve>
Date: Thu, 18 Jan 2007 00:59:48 +0000
Subject: [PATCH]  Do not match array words in expression lookaside.

---
 tgt-vvp/vector.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tgt-vvp/vector.c b/tgt-vvp/vector.c
index 486f5fb34..3c575dbdc 100644
--- a/tgt-vvp/vector.c
+++ b/tgt-vvp/vector.c
@@ -16,7 +16,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: vector.c,v 1.8 2007/01/16 05:44:16 steve Exp $"
+#ident "$Id: vector.c,v 1.9 2007/01/18 00:59:48 steve Exp $"
 #endif
 
 # include  "vvp_priv.h"
@@ -226,6 +226,10 @@ static int compare_exp(ivl_expr_t l, ivl_expr_t r)
 	    if (ivl_expr_width(l) != ivl_expr_width(r))
 		  return 0;
 
+	      /* Don't match array words. */
+	    if (ivl_expr_oper1(l) || ivl_expr_oper1(r))
+		  return 0;
+
 	    return 1;
 
 	  default:
@@ -323,6 +327,9 @@ unsigned allocate_vector_exp(ivl_expr_t exp, unsigned wid,
 
 /*
  * $Log: vector.c,v $
+ * Revision 1.9  2007/01/18 00:59:48  steve
+ *  Do not match array words in expression lookaside.
+ *
  * Revision 1.8  2007/01/16 05:44:16  steve
  *  Major rework of array handling. Memories are replaced with the
  *  more general concept of arrays. The NetMemory and NetEMemory