diff options
author | Clifford Wolf <clifford@clifford.at> | 2016-01-31 21:53:18 +0100 |
---|---|---|
committer | Clifford Wolf <clifford@clifford.at> | 2016-01-31 21:53:18 +0100 |
commit | 173fc4f4203a6aefef57ee1dfb0b8e4e0b59c078 (patch) | |
tree | d3d2adcbde799099a9e6b0b348a7c73ca2d4b1f6 /frontends/ast/genrtlil.cc | |
parent | 71f418c4682b8870c9f6ecb3c6f966d6072f8dfc (diff) | |
parent | 3c48de8e218ff70f4b5f8e42a6794a48354ea062 (diff) | |
download | yosys-173fc4f4203a6aefef57ee1dfb0b8e4e0b59c078.tar.gz yosys-173fc4f4203a6aefef57ee1dfb0b8e4e0b59c078.tar.bz2 yosys-173fc4f4203a6aefef57ee1dfb0b8e4e0b59c078.zip |
Merge branch 'rtlil_remove2_speedup' of https://github.com/kc8apf/yosys
Diffstat (limited to 'frontends/ast/genrtlil.cc')
-rw-r--r-- | frontends/ast/genrtlil.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc index 87e8379e9..876bfbe3d 100644 --- a/frontends/ast/genrtlil.cc +++ b/frontends/ast/genrtlil.cc @@ -379,7 +379,7 @@ struct AST_INTERNAL::ProcessGenerator // e.g. when the last statement in the code "a = 23; if (b) a = 42; a = 0;" is processed this // function is called to clean up the first two assignments as they are overwritten by // the third assignment. - void removeSignalFromCaseTree(const std::set<RTLIL::SigBit> &pattern, RTLIL::CaseRule *cs) + void removeSignalFromCaseTree(const RTLIL::SigSpec &pattern, RTLIL::CaseRule *cs) { for (auto it = cs->actions.begin(); it != cs->actions.end(); it++) it->first.remove2(pattern, &it->second); @@ -434,7 +434,7 @@ struct AST_INTERNAL::ProcessGenerator subst_rvalue_map.set(unmapped_lvalue[i], rvalue[i]); } - removeSignalFromCaseTree(lvalue.to_sigbit_set(), current_case); + removeSignalFromCaseTree(lvalue, current_case); remove_unwanted_lvalue_bits(lvalue, rvalue); current_case->actions.push_back(RTLIL::SigSig(lvalue, rvalue)); } @@ -511,7 +511,7 @@ struct AST_INTERNAL::ProcessGenerator subst_rvalue_map.set(this_case_eq_lvalue[i], this_case_eq_ltemp[i]); this_case_eq_lvalue.replace(subst_lvalue_map.stdmap()); - removeSignalFromCaseTree(this_case_eq_lvalue.to_sigbit_set(), current_case); + removeSignalFromCaseTree(this_case_eq_lvalue, current_case); addChunkActions(current_case->actions, this_case_eq_lvalue, this_case_eq_ltemp); } break; |