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

Merge pull request #8 from hansiglaser/master 

Added support for notif0/notif1 primitives
This commit is contained in:
Clifford Wolf 2013-08-20 03:36:34 -07:00
parent e3aa0514f2 6c4cbc03c2
commit 8e31a92407
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontends/ast/simplify.cc
View File

@ -498,7 +498,7 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage)
}
children.clear();
if (str == "bufif0" || str == "bufif1")
if (str == "bufif0" || str == "bufif1" || str == "notif0" || str == "notif1")
{
if (children_list.size() != 3)
log_error("Invalid number of arguments for primitive `%s' at %s:%d!\n",
@ -506,12 +506,16 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage)
std::vector<RTLIL::State> z_const(1, RTLIL::State::Sz);
AstNode *mux_input = children_list.at(1);
if (str == "notif0" || str == "notif1") {
mux_input = new AstNode(AST_BIT_NOT, mux_input);
}
AstNode *node = new AstNode(AST_TERNARY, children_list.at(2));
if (str == "bufif0") {
node->children.push_back(AstNode::mkconst_bits(z_const, false));
node->children.push_back(children_list.at(1));
node->children.push_back(mux_input);
} else {
node->children.push_back(children_list.at(1));
node->children.push_back(mux_input);
node->children.push_back(AstNode::mkconst_bits(z_const, false));
}

2
frontends/verilog/lexer.l
View File

@ -169,7 +169,7 @@ namespace VERILOG_FRONTEND {
}
<STRING>. { yymore(); }
and|nand|or|nor|xor|xnor|not|buf|bufif0|bufif1 {
and|nand|or|nor|xor|xnor|not|buf|bufif0|bufif1|notif0|notif1 {
frontend_verilog_yylval.string = new std::string(yytext);
return TOK_PRIMITIVE;
}