riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed name resolution of local tasks and functions in generate block

This commit is contained in:
Clifford Wolf 2013-11-20 11:05:58 +01:00
parent 19dba2561e
commit ac2be2d892
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README
View File

@ -292,7 +292,6 @@ Roadmap / Large-scale TODOs
- yosys-bigsim: https://github.com/cliffordwolf/yosys-bigsim - yosys-bigsim: https://github.com/cliffordwolf/yosys-bigsim
- Missing Verilog-2005 features to be implemented soon: - Missing Verilog-2005 features to be implemented soon:
- Fix corner cases with contextual name lookup
- Indexed part selects - Indexed part selects
- Technology mapping for real-world applications - Technology mapping for real-world applications

18
frontends/ast/simplify.cc
View File

@ -899,8 +899,10 @@ skip_dynamic_range_lvalue_expansion:;
if ((type == AST_FCALL || type == AST_TCALL) && !str.empty()) if ((type == AST_FCALL || type == AST_TCALL) && !str.empty())
{ {
if (type == AST_FCALL) { 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); log_error("Can't resolve function name `%s' at %s:%d.\n", str.c_str(), filename.c_str(), linenum);
}
} }
if (type == AST_TCALL) { if (type == AST_TCALL) {
if (current_scope.count(str) == 0 || current_scope[str]->type != AST_TASK) if (current_scope.count(str) == 0 || current_scope[str]->type != AST_TASK)
@ -1173,6 +1175,14 @@ apply_newNode:
return did_something; 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 // 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) 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] != '\\') if (new_name[0] != '$' && new_name[0] != '\\')
new_name = prefix[0] + new_name; new_name = prefix[0] + new_name;
name_map[child->str] = 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;
} }
} }