diff options
| author | Clifford Wolf <clifford@clifford.at> | 2017-02-23 15:39:13 +0100 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2017-02-23 15:39:13 +0100 |
| commit | 1e927a51d575c19b85db2c73ff70d8a244eb1fb5 (patch) | |
| tree | e538a585baf2f95c332d49ee77494367b35e1d44 /frontends | |
| parent | c6d8d70109a2757a21ad9783e5daaae08260ac07 (diff) | |
| download | yosys-1e927a51d575c19b85db2c73ff70d8a244eb1fb5.tar.gz yosys-1e927a51d575c19b85db2c73ff70d8a244eb1fb5.tar.bz2 yosys-1e927a51d575c19b85db2c73ff70d8a244eb1fb5.zip | |
Preserve string parameters
Diffstat (limited to 'frontends')
| -rw-r--r-- | frontends/ast/ast.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/frontends/ast/ast.cc b/frontends/ast/ast.cc index 38a19a36f..06660102b 100644 --- a/frontends/ast/ast.cc +++ b/frontends/ast/ast.cc @@ -1104,7 +1104,10 @@ RTLIL::IdString AstModule::derive(RTLIL::Design *design, dict<RTLIL::IdString, R rewrite_parameter: para_info += stringf("%s=%s", child->str.c_str(), log_signal(RTLIL::SigSpec(parameters[para_id]))); delete child->children.at(0); - child->children[0] = AstNode::mkconst_bits(parameters[para_id].bits, (parameters[para_id].flags & RTLIL::CONST_FLAG_SIGNED) != 0); + if ((parameters[para_id].flags & RTLIL::CONST_FLAG_STRING) != 0) + child->children[0] = AstNode::mkconst_str(parameters[para_id].decode_string()); + else + child->children[0] = AstNode::mkconst_bits(parameters[para_id].bits, (parameters[para_id].flags & RTLIL::CONST_FLAG_SIGNED) != 0); parameters.erase(para_id); continue; } @@ -1118,7 +1121,10 @@ RTLIL::IdString AstModule::derive(RTLIL::Design *design, dict<RTLIL::IdString, R for (auto param : parameters) { AstNode *defparam = new AstNode(AST_DEFPARAM, new AstNode(AST_IDENTIFIER)); defparam->children[0]->str = param.first.str(); - defparam->children.push_back(AstNode::mkconst_bits(param.second.bits, (param.second.flags & RTLIL::CONST_FLAG_SIGNED) != 0)); + if ((param.second.flags & RTLIL::CONST_FLAG_STRING) != 0) + defparam->children.push_back(AstNode::mkconst_str(param.second.decode_string())); + else + defparam->children.push_back(AstNode::mkconst_bits(param.second.bits, (param.second.flags & RTLIL::CONST_FLAG_SIGNED) != 0)); new_ast->children.push_back(defparam); } |