mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-10-31 03:32:29 +00:00
Code Activity

verilog: instead of modifying localparam size, extend init constant expr

Browse source
This commit is contained in:
Eddie Hung 2020-02-05 17:19:42 -08:00
parent 505557e93e
commit fc33287bc1
1 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
frontends/ast/simplify.cc
View file

@ -1200,17 +1200,23 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
if (varbuf->type != AST_CONSTANT) if (varbuf->type != AST_CONSTANT)
log_file_error(filename, linenum, "Right hand side of 1st expression of generate for-loop is not constant!\n"); log_file_error(filename, linenum, "Right hand side of 1st expression of generate for-loop is not constant!\n");
varbuf = new AstNode(AST_LOCALPARAM, varbuf);
varbuf->str = init_ast->children[0]->str;
auto resolved = current_scope.at(init_ast->children[0]->str); auto resolved = current_scope.at(init_ast->children[0]->str);
if (resolved->range_valid) { if (resolved->range_valid) {
varbuf->range_left = resolved->range_left; int const_size = varbuf->range_left - varbuf->range_right;
varbuf->range_right = resolved->range_right; int resolved_size = resolved->range_left - resolved->range_right;
varbuf->range_swapped = resolved->range_swapped; if (const_size < resolved_size) {
varbuf->range_valid = resolved->range_valid; for (int i = const_size; i < resolved_size; i++)
varbuf->bits.push_back(resolved->is_signed ? varbuf->bits.back() : State::S0);
varbuf->range_left = resolved->range_left;
varbuf->range_right = resolved->range_right;
varbuf->range_swapped = resolved->range_swapped;
varbuf->range_valid = resolved->range_valid;
}
} }
varbuf = new AstNode(AST_LOCALPARAM, varbuf);
varbuf->str = init_ast->children[0]->str;
AstNode *backup_scope_varbuf = current_scope[varbuf->str]; AstNode *backup_scope_varbuf = current_scope[varbuf->str];
current_scope[varbuf->str] = varbuf; current_scope[varbuf->str] = varbuf;
@ -3022,14 +3028,6 @@ void AstNode::expand_genblock(std::string index_var, std::string prefix, std::ma
current_ast_mod->children.push_back(p); current_ast_mod->children.push_back(p);
str = p->str; str = p->str;
id2ast = p; id2ast = p;
auto resolved = current_scope.at(index_var);
if (resolved->range_valid) {
p->range_left = resolved->range_left;
p->range_right = resolved->range_right;
p->range_swapped = resolved->range_swapped;
p->range_valid = resolved->range_valid;
}
} }
} }