diff options
| author | Zachary Snow <zach@zachjs.com> | 2021-06-05 16:21:09 -0400 |
|---|---|---|
| committer | Zachary Snow <zachary.j.snow@gmail.com> | 2021-06-08 15:03:16 -0400 |
| commit | 2e697f5655455fd8ce5fec40b94683a11ade24e8 (patch) | |
| tree | c52389aa8feb3328e1a4c97bd5e3db303b187a96 /frontends/ast/genrtlil.cc | |
| parent | c79fbfe0a130f1a2979413174c3e5688433bafe3 (diff) | |
| download | yosys-2e697f5655455fd8ce5fec40b94683a11ade24e8.tar.gz yosys-2e697f5655455fd8ce5fec40b94683a11ade24e8.tar.bz2 yosys-2e697f5655455fd8ce5fec40b94683a11ade24e8.zip | |
verilog: check for module scope identifiers during width detection
The recent fix for case expression width detection causes the width of
the expressions to be queried before they are simplified. Because the
logic supporting module scope identifiers only existed in simplify,
looking them up would fail during width detection. This moves the logic
to a common helper used in both simplify() and detectSignWidthWorker().
Diffstat (limited to 'frontends/ast/genrtlil.cc')
| -rw-r--r-- | frontends/ast/genrtlil.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc index b8b9f715e..e886844be 100644 --- a/frontends/ast/genrtlil.cc +++ b/frontends/ast/genrtlil.cc @@ -767,8 +767,15 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun case AST_IDENTIFIER: id_ast = id2ast; - if (id_ast == NULL && current_scope.count(str)) - id_ast = current_scope.at(str); + if (!id_ast) { + if (current_scope.count(str)) + id_ast = current_scope[str]; + else { + std::string alt = try_pop_module_prefix(); + if (current_scope.count(alt)) + id_ast = current_scope[alt]; + } + } if (!id_ast) log_file_error(filename, location.first_line, "Failed to resolve identifier %s for width detection!\n", str.c_str()); if (id_ast->type == AST_PARAMETER || id_ast->type == AST_LOCALPARAM || id_ast->type == AST_ENUM_ITEM) { |