Fixed name resolution of local tasks and functions in generate block

diff --git a/README b/README
index 76b8a1226e54314edf81cc5367bf304354247752..aa68da253770bcf5b7951c68ba3dd81b6df315d6 100644 (file)
--- a/README
+++ b/README
@@ -292,7 +292,6 @@ Roadmap / Large-scale TODOs
    - yosys-bigsim: https://github.com/cliffordwolf/yosys-bigsim
 
 - Missing Verilog-2005 features to be implemented soon:
-  - Fix corner cases with contextual name lookup
   - Indexed part selects
 
 - Technology mapping for real-world applications

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 3c59ef350b3ac28e7ac07bcc22073cfc076a9122..57178c81436d0aa5fdba0dd342b506b8a4db5cb3 100644 (file)
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -899,8 +899,10 @@ skip_dynamic_range_lvalue_expansion:;
        if ((type == AST_FCALL || type == AST_TCALL) && !str.empty())
        {
                if (type == AST_FCALL) {
-                       if (current_scope.count(str) == 0 || current_scope[str]->type != AST_FUNCTION)
+                       if (current_scope.count(str) == 0 || current_scope[str]->type != AST_FUNCTION) {
+                               current_ast_mod->dumpAst(stderr, "> ");
                                log_error("Can't resolve function name `%s' at %s:%d.\n", str.c_str(), filename.c_str(), linenum);
+                       }
                }
                if (type == AST_TCALL) {
                        if (current_scope.count(str) == 0 || current_scope[str]->type != AST_TASK)
@@ -1173,6 +1175,14 @@ apply_newNode:
        return did_something;
 }
 
+static void replace_result_wire_name_in_function(AstNode *node, std::string &from, std::string &to)
+{
+       for (auto &it : node->children)
+               replace_result_wire_name_in_function(it, from, to);
+       if (node->str == from)
+               node->str = to;
+}
+
 // annotate the names of all wires and other named objects in a generate block
 void AstNode::expand_genblock(std::string index_var, std::string prefix, std::map<std::string, std::string> &name_map)
 {
@@ -1202,7 +1212,11 @@ void AstNode::expand_genblock(std::string index_var, std::string prefix, std::ma
                        if (new_name[0] != '$' && new_name[0] != '\\')
                                new_name = prefix[0] + new_name;
                        name_map[child->str] = new_name;
-                       child->str = new_name;
+                       if (child->type == AST_FUNCTION)
+                               replace_result_wire_name_in_function(child, child->str, new_name);
+                       else
+                               child->str = new_name;
+                       current_scope[new_name] = child;
                }
        }