diff options
| author | Clifford Wolf <clifford@clifford.at> | 2019-06-19 13:53:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-19 13:53:07 +0200 |
| commit | 5a1f1caa44fb3f4427813acab61aaecc06bae7ba (patch) | |
| tree | 3cceea7d49a6ae44e5ab765e0bd11fecfee6b47b /frontends | |
| parent | c330379870a48209534807d1c021ce2a20ccf880 (diff) | |
| parent | fa5fc3f6afd9eb27c1f52244b60cbeb77aa2e26c (diff) | |
| download | yosys-5a1f1caa44fb3f4427813acab61aaecc06bae7ba.tar.gz yosys-5a1f1caa44fb3f4427813acab61aaecc06bae7ba.tar.bz2 yosys-5a1f1caa44fb3f4427813acab61aaecc06bae7ba.zip | |
Merge pull request #1105 from YosysHQ/clifford/fixlogicinit
Improve handling of initial/default values
Diffstat (limited to 'frontends')
| -rw-r--r-- | frontends/verilog/verilog_parser.y | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y index ea8e457e8..ebb4369c3 100644 --- a/frontends/verilog/verilog_parser.y +++ b/frontends/verilog/verilog_parser.y @@ -345,7 +345,13 @@ module_arg_opt_assignment: if (ast_stack.back()->children.size() > 0 && ast_stack.back()->children.back()->type == AST_WIRE) { AstNode *wire = new AstNode(AST_IDENTIFIER); wire->str = ast_stack.back()->children.back()->str; - if (ast_stack.back()->children.back()->is_reg) + if (ast_stack.back()->children.back()->is_input) { + AstNode *n = ast_stack.back()->children.back(); + if (n->attributes.count("\\defaultvalue")) + delete n->attributes.at("\\defaultvalue"); + n->attributes["\\defaultvalue"] = $2; + } else + if (ast_stack.back()->children.back()->is_reg || ast_stack.back()->children.back()->is_logic) ast_stack.back()->children.push_back(new AstNode(AST_INITIAL, new AstNode(AST_BLOCK, new AstNode(AST_ASSIGN_LE, wire, $2)))); else ast_stack.back()->children.push_back(new AstNode(AST_ASSIGN, wire, $2)); @@ -1360,7 +1366,12 @@ wire_name_and_opt_assign: wire_name '=' expr { AstNode *wire = new AstNode(AST_IDENTIFIER); wire->str = ast_stack.back()->children.back()->str; - if (astbuf1->is_reg) + if (astbuf1->is_input) { + if (astbuf1->attributes.count("\\defaultvalue")) + delete astbuf1->attributes.at("\\defaultvalue"); + astbuf1->attributes["\\defaultvalue"] = $3; + } else + if (astbuf1->is_reg || astbuf1->is_logic) ast_stack.back()->children.push_back(new AstNode(AST_INITIAL, new AstNode(AST_BLOCK, new AstNode(AST_ASSIGN_LE, wire, $3)))); else ast_stack.back()->children.push_back(new AstNode(AST_ASSIGN, wire, $3)); |