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

Added avail params to ilang format, check module params in 'hierarchy -check'

This commit is contained in:
Clifford Wolf 2016-10-22 11:05:49 +02:00
parent 3655d7fea7
commit aa72262330
4 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backends/ilang/ilang_backend.cc
View File

@ -278,6 +278,13 @@ void ILANG_BACKEND::dump_module(std::ostream &f, std::string indent, RTLIL::Modu
} }
f << stringf("%s" "module %s\n", indent.c_str(), module->name.c_str()); f << stringf("%s" "module %s\n", indent.c_str(), module->name.c_str());
if (!module->avail_parameters.empty()) {
if (only_selected)
f << stringf("\n");
for (auto &p : module->avail_parameters)
f << stringf("%s" " parameter %s\n", indent.c_str(), p.c_str());
}
} }
if (print_body) if (print_body)

9
frontends/ast/ast.cc
View File

@ -934,10 +934,15 @@ static AstModule* process_module(AstNode *ast, bool defer)
if (flag_lib) { if (flag_lib) {
std::vector<AstNode*> new_children; std::vector<AstNode*> new_children;
for (auto child : ast->children) { for (auto child : ast->children) {
if (child->type == AST_WIRE && (child->is_input || child->is_output)) if (child->type == AST_WIRE && (child->is_input || child->is_output)) {
new_children.push_back(child); new_children.push_back(child);
else } else if (child->type == AST_PARAMETER) {
child->delete_children();
child->children.push_back(AstNode::mkconst_int(0, false, 0));
new_children.push_back(child);
} else {
delete child; delete child;
}
} }
ast->children.swap(new_children); ast->children.swap(new_children);
ast->attributes["\\blackbox"] = AstNode::mkconst_int(1, false); ast->attributes["\\blackbox"] = AstNode::mkconst_int(1, false);

8
frontends/ilang/ilang_parser.y
View File

@ -112,7 +112,13 @@ module_body:
/* empty */; /* empty */;
module_stmt: module_stmt:
attr_stmt | wire_stmt | memory_stmt | cell_stmt | proc_stmt | conn_stmt; param_stmt | attr_stmt | wire_stmt | memory_stmt | cell_stmt | proc_stmt | conn_stmt;
param_stmt:
TOK_PARAMETER TOK_ID EOL {
current_module->avail_parameters.insert($2);
free($2);
};
attr_stmt: attr_stmt:
TOK_ATTRIBUTE TOK_ID constant EOL { TOK_ATTRIBUTE TOK_ID constant EOL {

4
passes/hierarchy/hierarchy.cc
View File

@ -212,6 +212,10 @@ bool expand_module(RTLIL::Design *design, RTLIL::Module *module, bool flag_check
} else if (mod->wire(conn.first) == nullptr || mod->wire(conn.first)->port_id == 0) } else if (mod->wire(conn.first) == nullptr || mod->wire(conn.first)->port_id == 0)
log_error("Module `%s' referenced in module `%s' in cell `%s' does not have a port named '%s'.\n", log_error("Module `%s' referenced in module `%s' in cell `%s' does not have a port named '%s'.\n",
log_id(cell->type), log_id(module), log_id(cell), log_id(conn.first)); log_id(cell->type), log_id(module), log_id(cell), log_id(conn.first));
for (auto &param : cell->parameters)
if (mod->avail_parameters.count(param.first) == 0)
log_error("Module `%s' referenced in module `%s' in cell `%s' does not have a parameter named '%s'.\n",
log_id(cell->type), log_id(module), log_id(cell), log_id(param.first));
} }
if (cell->parameters.size() == 0) if (cell->parameters.size() == 0)