diff options
| author | Clifford Wolf <clifford@clifford.at> | 2019-02-22 06:54:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-22 06:54:48 +0100 |
| commit | 25a3a961073335de138f8a037fc4b723572f1b68 (patch) | |
| tree | 9e8edb4533636cfd379e806e314dd4f44f867189 /frontends/ast/simplify.cc | |
| parent | 344afdcd5f37be4b326cefc397d65d9c92e54a47 (diff) | |
| parent | 362ef36ccdcb3023f9db259b983c08811f794edd (diff) | |
| download | yosys-25a3a961073335de138f8a037fc4b723572f1b68.tar.gz yosys-25a3a961073335de138f8a037fc4b723572f1b68.tar.bz2 yosys-25a3a961073335de138f8a037fc4b723572f1b68.zip | |
Merge pull request #820 from YosysHQ/clifford/fix810
Fix #810 and fix #814
Diffstat (limited to 'frontends/ast/simplify.cc')
| -rw-r--r-- | frontends/ast/simplify.cc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc index 83714f897..737fb300c 100644 --- a/frontends/ast/simplify.cc +++ b/frontends/ast/simplify.cc @@ -934,12 +934,15 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage, } } if (current_scope.count(str) == 0) { - // log_warning("Creating auto-wire `%s' in module `%s'.\n", str.c_str(), current_ast_mod->str.c_str()); - AstNode *auto_wire = new AstNode(AST_AUTOWIRE); - auto_wire->str = str; - current_ast_mod->children.push_back(auto_wire); - current_scope[str] = auto_wire; - did_something = true; + if (flag_autowire) { + AstNode *auto_wire = new AstNode(AST_AUTOWIRE); + auto_wire->str = str; + current_ast_mod->children.push_back(auto_wire); + current_scope[str] = auto_wire; + did_something = true; + } else { + log_file_error(filename, linenum, "Identifier `%s' is implicitly declared and `default_nettype is set to none.\n", str.c_str()); + } } if (id2ast != current_scope[str]) { id2ast = current_scope[str]; @@ -1689,7 +1692,7 @@ skip_dynamic_range_lvalue_expansion:; while (right_at_zero_ast->simplify(true, true, false, 1, -1, false, false)) { } if (left_at_zero_ast->type != AST_CONSTANT || right_at_zero_ast->type != AST_CONSTANT) log_file_error(filename, linenum, "Unsupported expression on dynamic range select on signal `%s'!\n", str.c_str()); - int width = left_at_zero_ast->integer - right_at_zero_ast->integer + 1; + int width = abs(int(left_at_zero_ast->integer - right_at_zero_ast->integer)) + 1; assign_data = new AstNode(AST_ASSIGN_LE, new AstNode(AST_IDENTIFIER), new AstNode(AST_SHIFT_LEFT, children[1]->clone(), offset_ast->clone())); @@ -1778,7 +1781,7 @@ skip_dynamic_range_lvalue_expansion:; if (str == "\\$past") { - if (width_hint <= 0) + if (width_hint < 0) goto replace_fcall_later; int num_steps = 1; |