mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-27 02:45:52 +00:00
Code Activity

Added $anyconst and $aconst

Browse source
This commit is contained in:
Clifford Wolf 2016-07-27 15:41:22 +02:00
parent a7b0769623
commit 4056312987
7 changed files with 83 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

45
frontends/ast/genrtlil.cc
View file

@ -750,6 +750,19 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
width_hint = max(width_hint, this_width);
break;
case AST_FCALL:
if (str == "\\$anyconst" || str == "\\$aconst") {
if (GetSize(children) == 1) {
while (children[0]->simplify(true, false, false, 1, -1, false, true) == true) { }
if (children[0]->type != AST_CONSTANT)
log_error("System function %s called with non-const argument at %s:%d!\n",
RTLIL::unescape_id(str).c_str(), filename.c_str(), linenum);
width_hint = max(width_hint, int(children[0]->asInt(true)));
}
break;
}
/* fall through */
// everything should have been handled above -> print error if not.
default:
for (auto f : log_files)
@ -1427,6 +1440,38 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
delete always;
} break;
case AST_FCALL: {
if (str == "\\$anyconst" || str == "\\$aconst")
{
string myid = stringf("%s$%d", RTLIL::unescape_id(str).c_str(), autoidx++);
int width = width_hint;
if (GetSize(children) > 1)
log_error("System function %s got %d arguments, expected 1 or 0 at %s:%d.\n",
RTLIL::unescape_id(str).c_str(), GetSize(children), filename.c_str(), linenum);
if (GetSize(children) == 1) {
if (children[0]->type != AST_CONSTANT)
log_error("System function %s called with non-const argument at %s:%d!\n",
RTLIL::unescape_id(str).c_str(), filename.c_str(), linenum);
width = children[0]->asInt(true);
}
if (width <= 0)
log_error("Failed to detect width of %s at %s:%d!\n",
RTLIL::unescape_id(str).c_str(), filename.c_str(), linenum);
Cell *cell = current_module->addCell(myid, str.substr(1));
cell->parameters["\\WIDTH"] = width;
Wire *wire = current_module->addWire(myid + "_wire", width);
cell->setPort("\\Y", wire);
is_signed = sign_hint;
return SigSpec(wire);
}
} /* fall through */
// everything should have been handled above -> print error if not.
default:
for (auto f : log_files)

4
frontends/ast/simplify.cc
View file

@ -1655,6 +1655,10 @@ skip_dynamic_range_lvalue_expansion:;
goto apply_newNode;
}
// $anyconst and $aconst are mapped in AstNode::genRTLIL()
if (str == "\\$anyconst" || str == "\\$aconst")
return false;
if (str == "\\$clog2")
{
if (children.size() != 1)

2
frontends/verilog/verilog_parser.y
View file

@ -1219,7 +1219,7 @@ rvalue:
$$ = new AstNode(AST_IDENTIFIER, $2);
$$->str = *$1;
delete $1;
if ($2 == nullptr && $$->str == "\\$initstate")
if ($2 == nullptr && formal_mode && ($$->str == "\\$initstate" || $$->str == "\\$anyconst" || $$->str == "\\$aconst"))
$$->type = AST_FCALL;
} |
hierarchical_id non_opt_multirange {