From 844cfc51379141c4be7bc5b7c7a8ae8f71203b8b Mon Sep 17 00:00:00 2001
From: steve <steve>
Date: Sat, 1 Feb 2003 23:37:34 +0000
Subject: [PATCH]  Allow parameter expressions to be type real.

---
 eval_rconst.cc | 25 +++++++++++++++++++++++-
 net_design.cc  | 53 +++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 64 insertions(+), 14 deletions(-)

diff --git a/eval_rconst.cc b/eval_rconst.cc
index 9714df8f0..1ed5f5226 100644
--- a/eval_rconst.cc
+++ b/eval_rconst.cc
@@ -17,12 +17,13 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: eval_rconst.cc,v 1.5 2002/08/12 01:34:59 steve Exp $"
+#ident "$Id: eval_rconst.cc,v 1.6 2003/02/01 23:37:34 steve Exp $"
 #endif
 
 # include "config.h"
 
 # include  "PExpr.h"
+# include  "verireal.h"
 
 verireal* PExpr::eval_rconst(const Design*, const NetScope*) const
 {
@@ -70,6 +71,25 @@ verireal* PEBinary::eval_rconst(const Design*des, const NetScope*scope) const
 
 verireal* PEIdent::eval_rconst(const Design*des, const NetScope*scope) const
 {
+      assert(scope);
+      const NetExpr*expr = des->find_parameter(scope, path_);
+      if (expr == 0)
+	    return 0;
+
+	/* Is this a real valued parameter? If so, then evaluate it
+	   as a real expression and return the resulting verireal. */
+      if (expr->expr_type() == NetExpr::ET_REAL) {
+	    const NetECReal*ereal = dynamic_cast<const NetECReal*>(expr);
+	    if (ereal == 0) {
+		  cerr << get_line() << ": internal error: "
+		       << "Unable to evaluate real constant expression "
+		       << "(parameter=" << path_ << "): " << *expr << endl;
+		  return 0;
+	    }
+
+	    return new verireal(ereal->value());
+      }
+
       verinum* val = eval_const(des, scope);
       if (val == 0)
 	    return 0;
@@ -81,6 +101,9 @@ verireal* PEIdent::eval_rconst(const Design*des, const NetScope*scope) const
 
 /*
  * $Log: eval_rconst.cc,v $
+ * Revision 1.6  2003/02/01 23:37:34  steve
+ *  Allow parameter expressions to be type real.
+ *
  * Revision 1.5  2002/08/12 01:34:59  steve
  *  conditional ident string using autoconfig.
  *
diff --git a/net_design.cc b/net_design.cc
index 675cc05a4..045053648 100644
--- a/net_design.cc
+++ b/net_design.cc
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: net_design.cc,v 1.33 2003/01/27 05:09:17 steve Exp $"
+#ident "$Id: net_design.cc,v 1.34 2003/02/01 23:37:34 steve Exp $"
 #endif
 
 # include "config.h"
@@ -353,27 +353,51 @@ void NetScope::evaluate_parameters(Design*des)
 	      /* Evaluate the parameter expression, if necessary. */
 	    expr = (*cur).second.expr;
 	    assert(expr);
-	    if (! dynamic_cast<const NetEConst*>(expr)) {
 
-		    // Try to evaluate the expression.
-		  NetExpr*nexpr = expr->eval_tree();
-		  if (nexpr == 0) {
+	    switch (expr->expr_type()) {
+		case NetExpr::ET_REAL:
+		  if (! dynamic_cast<const NetECReal*>(expr)) {
 			cerr << (*cur).second.expr->get_line()
 			     << ": internal error: "
-			      "unable to evaluate parameter value: " <<
+			      "unable to evaluate real parameter values: " <<
 			      *expr << endl;
 			des->errors += 1;
 			continue;
 		  }
+		  break;
 
-		    // The evaluate worked, replace the old expression with
-		    // this constant value.
-		  assert(nexpr);
-		  delete expr;
-		  (*cur).second.expr = nexpr;
+		case NetExpr::ET_VECTOR:
+		  if (! dynamic_cast<const NetEConst*>(expr)) {
 
-		    // Set the signedness flag.
-		  (*cur).second.expr->cast_signed( (*cur).second.signed_flag );
+			  // Try to evaluate the expression.
+			NetExpr*nexpr = expr->eval_tree();
+			if (nexpr == 0) {
+			      cerr << (*cur).second.expr->get_line()
+				   << ": internal error: "
+				    "unable to evaluate parameter value: " <<
+				    *expr << endl;
+			      des->errors += 1;
+			      continue;
+			}
+
+			  // The evaluate worked, replace the old
+			  // expression with this constant value.
+			assert(nexpr);
+			delete expr;
+			(*cur).second.expr = nexpr;
+
+			  // Set the signedness flag.
+			(*cur).second.expr
+			      ->cast_signed( (*cur).second.signed_flag );
+		  }
+		  break;
+
+		default:
+		  cerr << (*cur).second.expr->get_line()
+		       << ": internal error: "
+		       << "unhandled expression type?" << endl;
+		  des->errors += 1;
+		  continue;
 	    }
 
 	      /* If the parameter has range information, then make
@@ -625,6 +649,9 @@ void Design::delete_process(NetProcTop*top)
 
 /*
  * $Log: net_design.cc,v $
+ * Revision 1.34  2003/02/01 23:37:34  steve
+ *  Allow parameter expressions to be type real.
+ *
  * Revision 1.33  2003/01/27 05:09:17  steve
  *  Spelling fixes.
  *