From: Clifford Wolf <clifford@clifford.at>
Date: Tue, 26 Mar 2013 08:44:54 +0000 (+0100)
Subject: Fixed handling of unconditional generate blocks
X-Git-Tag: yosys-0.2.0~681
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6a382f2abab4d6c24d329204ed1ea18e44f3f3b8;p=yosys.git

Fixed handling of unconditional generate blocks
---

diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc
index 0654db2df..47ca37bd0 100644
--- a/frontends/ast/genrtlil.cc
+++ b/frontends/ast/genrtlil.cc
@@ -528,6 +528,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint)
 	case AST_LOCALPARAM:
 	case AST_GENVAR:
 	case AST_GENFOR:
+	case AST_GENBLOCK:
 	case AST_GENIF:
 		break;
 
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index ef06c5b03..981897db5 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -182,6 +182,8 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage)
 			break;
 		if (type == AST_GENIF && i >= 1)
 			break;
+		if (type == AST_GENBLOCK)
+			break;
 		if (type == AST_PREFIX && i >= 1)
 			break;
 		while (did_something_here && i < children.size()) {
@@ -409,6 +411,21 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage)
 		did_something = true;
 	}
 
+	// simplify unconditional generate block
+	if (type == AST_GENBLOCK && children.size() != 0)
+	{
+		if (!str.empty()) {
+			std::map<std::string, std::string> name_map;
+			expand_genblock(std::string(), str + ".", name_map);
+		}
+
+		for (size_t i = 0; i < children.size(); i++)
+			current_ast_mod->children.push_back(children[i]);
+
+		children.clear();
+		did_something = true;
+	}
+
 	// simplify generate-if blocks
 	if (type == AST_GENIF && children.size() != 0)
 	{
@@ -434,7 +451,7 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage)
 
 			if (!buf->str.empty()) {
 				std::map<std::string, std::string> name_map;
-				buf->expand_genblock(std::string(), buf->str, name_map);
+				buf->expand_genblock(std::string(), buf->str + ".", name_map);
 			}
 
 			for (size_t i = 0; i < buf->children.size(); i++)