mirror of
https://github.com/YosysHQ/yosys
synced 2025-07-24 13:18:56 +00:00
Various fixes for correct parameter support
This commit is contained in:
parent
160adccca2
commit
f050c40519
4 changed files with 102 additions and 41 deletions
|
@ -197,6 +197,18 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
|
|||
child_0_is_self_determined = true;
|
||||
break;
|
||||
|
||||
case AST_PARAMETER:
|
||||
case AST_LOCALPARAM:
|
||||
children[0]->detectSignWidth(width_hint, sign_hint);
|
||||
if (children.size() > 1) {
|
||||
assert(children[1]->type == AST_RANGE);
|
||||
while (children[1]->simplify(false, false, false, stage, -1, false) == true) { }
|
||||
if (!children[1]->range_valid)
|
||||
log_error("Non-constant width range on parameter decl at %s:%d.\n", filename.c_str(), linenum);
|
||||
width_hint = std::max(width_hint, children[1]->range_left - children[1]->range_right + 1);
|
||||
}
|
||||
break;
|
||||
|
||||
case AST_TO_SIGNED:
|
||||
case AST_TO_UNSIGNED:
|
||||
case AST_CONCAT:
|
||||
|
@ -419,6 +431,19 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
|
|||
}
|
||||
}
|
||||
|
||||
// trim/extend parameters
|
||||
if ((type == AST_PARAMETER || type == AST_LOCALPARAM) && children[0]->type == AST_CONSTANT && children.size() > 1) {
|
||||
if (!children[1]->range_valid)
|
||||
log_error("Non-constant width range on parameter decl at %s:%d.\n", filename.c_str(), linenum);
|
||||
int width = children[1]->range_left - children[1]->range_right + 1;
|
||||
if (width != int(children[0]->bits.size())) {
|
||||
RTLIL::SigSpec sig(children[0]->bits);
|
||||
sig.extend(width, children[0]->is_signed);
|
||||
delete children[0];
|
||||
children[0] = mkconst_bits(sig.as_const().bits, children[0]->is_signed);
|
||||
}
|
||||
}
|
||||
|
||||
// annotate identifiers using scope resolution and create auto-wires as needed
|
||||
if (type == AST_IDENTIFIER) {
|
||||
if (current_scope.count(str) == 0) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue