diff options
| author | Clifford Wolf <clifford@clifford.at> | 2019-03-09 11:14:57 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-09 11:14:57 -0800 |
| commit | cebd21aa9642e51acacbcbe62dee56074e8ed4d8 (patch) | |
| tree | dd5c8b0c5c9d678e7fb83061021a35a293915c8d /frontends/ast | |
| parent | 7504d4d3452096b56f127634837de43c7be2d8dc (diff) | |
| parent | e7a34d342ed1dd01074acdafca4f8f5557f8150f (diff) | |
| download | yosys-cebd21aa9642e51acacbcbe62dee56074e8ed4d8.tar.gz yosys-cebd21aa9642e51acacbcbe62dee56074e8ed4d8.tar.bz2 yosys-cebd21aa9642e51acacbcbe62dee56074e8ed4d8.zip | |
Merge pull request #858 from YosysHQ/clifford/svalabels
Add support for using SVA labels in yosys-smtbmc console output
Diffstat (limited to 'frontends/ast')
| -rw-r--r-- | frontends/ast/genrtlil.cc | 12 | ||||
| -rw-r--r-- | frontends/ast/simplify.cc | 1 |
2 files changed, 10 insertions, 3 deletions
diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc index 13383845a..d7da6fb40 100644 --- a/frontends/ast/genrtlil.cc +++ b/frontends/ast/genrtlil.cc @@ -1413,10 +1413,16 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint) if (GetSize(en) != 1) en = current_module->ReduceBool(NEW_ID, en); - std::stringstream sstr; - sstr << celltype << "$" << filename << ":" << linenum << "$" << (autoidx++); + IdString cellname; + if (str.empty()) { + std::stringstream sstr; + sstr << celltype << "$" << filename << ":" << linenum << "$" << (autoidx++); + cellname = sstr.str(); + } else { + cellname = str; + } - RTLIL::Cell *cell = current_module->addCell(sstr.str(), celltype); + RTLIL::Cell *cell = current_module->addCell(cellname, celltype); cell->attributes["\\src"] = stringf("%s:%d", filename.c_str(), linenum); for (auto &attr : attributes) { diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc index d0274cf78..ae7dec88d 100644 --- a/frontends/ast/simplify.cc +++ b/frontends/ast/simplify.cc @@ -1511,6 +1511,7 @@ skip_dynamic_range_lvalue_expansion:; newNode->children.push_back(assign_en); AstNode *assertnode = new AstNode(type); + assertnode->str = str; assertnode->children.push_back(new AstNode(AST_IDENTIFIER)); assertnode->children.push_back(new AstNode(AST_IDENTIFIER)); assertnode->children[0]->str = id_check; |