From 9fec1f7e4594e598ebdb576ca2c350dd26af1003 Mon Sep 17 00:00:00 2001
From: Cary R <cygcary@yahoo.com>
Date: Tue, 17 Mar 2009 14:44:23 -0700
Subject: [PATCH] Handle zero repetition in a synthesized concatenation.

It is valid to have a repetition of zero inside a concatenation
that has other elements with a defined width. This patch adds
this functionality to the synthesize method. It also prints
an error if you try to synthesize a zero width constant.
(cherry picked from commit fa8a3d6c2eec2e34951a5a45fb8ed0bfea84c669)
---
 expr_synth.cc | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/expr_synth.cc b/expr_synth.cc
index 3e4159174..1b4994a47 100644
--- a/expr_synth.cc
+++ b/expr_synth.cc
@@ -719,16 +719,20 @@ NetNet* NetEBShift::synthesize(Design*des, NetScope*scope, NetExpr*root)
 NetNet* NetEConcat::synthesize(Design*des, NetScope*scope, NetExpr*root)
 {
 	/* First, synthesize the operands. */
+      unsigned nparms = parms_.count();
       NetNet**tmp = new NetNet*[parms_.count()];
       bool flag = true;
       for (unsigned idx = 0 ;  idx < parms_.count() ;  idx += 1) {
-	    tmp[idx] = parms_[idx]->synthesize(des, scope, root);
-	    if (tmp[idx] == 0)
-		  flag = false;
+	    if (parms_[idx]->expr_width() == 0) {
+		  tmp[idx] = 0;
+		  nparms -= 1;
+	    } else {
+		  tmp[idx] = parms_[idx]->synthesize(des, scope, root);
+		  if (tmp[idx] == 0) flag = false;
+	    }
       }
 
-      if (flag == false)
-	    return 0;
+      if (flag == false) return 0;
 
       ivl_assert(*this, tmp[0]);
 
@@ -740,7 +744,7 @@ NetNet* NetEConcat::synthesize(Design*des, NetScope*scope, NetExpr*root)
 
       NetConcat*concat = new NetConcat(scope, scope->local_symbol(),
 				       osig->vector_width(),
-				       parms_.count() * repeat());
+				       nparms * repeat());
       concat->set_line(*this);
       des->add_node(concat);
       connect(concat->pin(0), osig->pin(0));
@@ -750,7 +754,7 @@ NetNet* NetEConcat::synthesize(Design*des, NetScope*scope, NetExpr*root)
       for (unsigned rpt = 0; rpt < repeat(); rpt += 1) {
 	    for (unsigned idx = 0 ;  idx < parms_.count() ;  idx += 1) {
 		  unsigned concat_item = parms_.count()-idx-1;
-		  ivl_assert(*this, tmp[concat_item]);
+		  if (tmp[concat_item] == 0) continue;
 		  connect(concat->pin(cur_pin), tmp[concat_item]->pin(0));
 		  cur_pin += 1;
 		  count_input_width += tmp[concat_item]->vector_width();
@@ -773,6 +777,11 @@ NetNet* NetEConst::synthesize(Design*des, NetScope*scope, NetExpr*)
 {
       perm_string path = scope->local_symbol();
       unsigned width=expr_width();
+      if (width == 0) {
+	    cerr << get_fileline() << ": internal error: "
+	         << "Found a zero width constant!" << endl;
+	    return 0;
+      }
 
       NetNet*osig = new NetNet(scope, path, NetNet::IMPLICIT, width);
       osig->local_flag(true);