diff options
| author | Claire Wolf <claire@symbioticeda.com> | 2020-04-15 20:36:40 +0200 |
|---|---|---|
| committer | Claire Wolf <claire@symbioticeda.com> | 2020-04-16 12:11:07 +0200 |
| commit | e1fb12a4b9e1d0685a1a1b060f2887f79b3c297f (patch) | |
| tree | f4928c7e4c62b041ae1ac3a88f205abb855d247e /frontends/ast/simplify.cc | |
| parent | 4711fea6c085e773d65f10c630f8d7a698f5b323 (diff) | |
| download | yosys-e1fb12a4b9e1d0685a1a1b060f2887f79b3c297f.tar.gz yosys-e1fb12a4b9e1d0685a1a1b060f2887f79b3c297f.tar.bz2 yosys-e1fb12a4b9e1d0685a1a1b060f2887f79b3c297f.zip | |
Add LookaheadRewriter for proper bitselwrite support
Signed-off-by: Claire Wolf <claire@symbioticeda.com>
Diffstat (limited to 'frontends/ast/simplify.cc')
| -rw-r--r-- | frontends/ast/simplify.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc index e181af140..18ad6926f 100644 --- a/frontends/ast/simplify.cc +++ b/frontends/ast/simplify.cc @@ -1797,19 +1797,25 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage, AstNode *ref_mask = new AstNode(AST_IDENTIFIER); ref_mask->str = wire_mask->str; + ref_mask->id2ast = wire_mask; ref_mask->was_checked = true; AstNode *ref_data = new AstNode(AST_IDENTIFIER); ref_data->str = wire_data->str; + ref_data->id2ast = wire_data; ref_data->was_checked = true; + AstNode *old_data = lvalue->clone(); + if (type == AST_ASSIGN_LE) + old_data->lookahead = true; + AstNode *shamt = shift_expr; newNode->children.push_back(new AstNode(AST_ASSIGN_EQ, ref_mask->clone(), new AstNode(AST_SHIFT_LEFT, mkconst_bits(std::vector<RTLIL::State>(result_width, State::S1), false), shamt->clone()))); newNode->children.push_back(new AstNode(AST_ASSIGN_EQ, ref_data->clone(), new AstNode(AST_SHIFT_LEFT, new AstNode(AST_BIT_AND, mkconst_bits(std::vector<RTLIL::State>(result_width, State::S1), false), children[1]->clone()), shamt))); - newNode->children.push_back(new AstNode(type, lvalue, new AstNode(AST_BIT_OR, new AstNode(AST_BIT_AND, lvalue->clone(), new AstNode(AST_BIT_NOT, ref_mask)), ref_data))); + newNode->children.push_back(new AstNode(type, lvalue, new AstNode(AST_BIT_OR, new AstNode(AST_BIT_AND, old_data, new AstNode(AST_BIT_NOT, ref_mask)), ref_data))); } goto apply_newNode; |