aboutsummaryrefslogtreecommitdiffstats
path: root/frontends/ast
diff options
context:
space:
mode:
authorZachary Snow <zach@zachjs.com>2020-07-19 20:27:09 -0600
committerZachary Snow <zach@zachjs.com>2020-07-19 20:27:09 -0600
commitf285f7b76916420b5d55a83d53a371ebe257cfb2 (patch)
tree54f1515c4504715d7b2dd9681aab3760ce542829 /frontends/ast
parenteed05953f820439178b2138cef7d53d50528354a (diff)
downloadyosys-f285f7b76916420b5d55a83d53a371ebe257cfb2.tar.gz
yosys-f285f7b76916420b5d55a83d53a371ebe257cfb2.tar.bz2
yosys-f285f7b76916420b5d55a83d53a371ebe257cfb2.zip
Allow reals as constant function parameters
Diffstat (limited to 'frontends/ast')
-rw-r--r--frontends/ast/simplify.cc14
1 files changed, 11 insertions, 3 deletions
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 00f8c8df6..fda064237 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -3029,7 +3029,7 @@ skip_dynamic_range_lvalue_expansion:;
bool all_args_const = true;
for (auto child : children) {
while (child->simplify(true, false, false, 1, -1, false, true)) { }
- if (child->type != AST_CONSTANT)
+ if (child->type != AST_CONSTANT && child->type != AST_REALVALUE)
all_args_const = false;
}
@@ -4349,8 +4349,16 @@ AstNode *AstNode::eval_const_function(AstNode *fcall)
variables[child->str].val = RTLIL::Const(RTLIL::State::Sx, abs(child->range_left - child->range_right)+1);
variables[child->str].offset = min(child->range_left, child->range_right);
variables[child->str].is_signed = child->is_signed;
- if (child->is_input && argidx < fcall->children.size())
- variables[child->str].val = fcall->children.at(argidx++)->bitsAsConst(variables[child->str].val.bits.size());
+ if (child->is_input && argidx < fcall->children.size()) {
+ int width = variables[child->str].val.bits.size();
+ auto* arg_node = fcall->children.at(argidx++);
+ if (arg_node->type == AST_CONSTANT) {
+ variables[child->str].val = arg_node->bitsAsConst(width);
+ } else {
+ log_assert(arg_node->type == AST_REALVALUE);
+ variables[child->str].val = arg_node->realAsConst(width);
+ }
+ }
backup_scope[child->str] = current_scope[child->str];
current_scope[child->str] = child;
continue;