mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-10-31 11:42:30 +00:00
Code Activity

Fix handling of ce_over_srst

Browse source
This commit is contained in:
Miodrag Milanovic 2022-02-21 16:36:12 +01:00
parent 13a5c28459
commit fd3f08753a
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
passes/sat/sim.cc
View file

@ -487,14 +487,13 @@ struct SimInstance
if (ff_data.pol_clk ? (ff.past_clk == State::S0 && current_clk != State::S0) : if (ff_data.pol_clk ? (ff.past_clk == State::S0 && current_clk != State::S0) :
(ff.past_clk == State::S1 && current_clk != State::S1)) { (ff.past_clk == State::S1 && current_clk != State::S1)) {
bool ce = ff.past_ce == (ff_data.pol_ce ? State::S1 : State::S0); bool ce = ff.past_ce == (ff_data.pol_ce ? State::S1 : State::S0);
// chip enable priority over reset
if (ff_data.ce_over_srst && ff_data.has_ce && !ce) continue;
// set if no ce, or ce is enabled // set if no ce, or ce is enabled
if (!ff_data.has_ce || (ff_data.has_ce && ce)) { if (!ff_data.has_ce || (ff_data.has_ce && ce)) {
current_q = ff.past_d; current_q = ff.past_d;
} }
// override if sync reset // override if sync reset
if ((ff_data.has_srst) && (ff.past_srst == (ff_data.pol_srst ? State::S1 : State::S0))) { if ((ff_data.has_srst) && (ff.past_srst == (ff_data.pol_srst ? State::S1 : State::S0)) &&
((!ff_data.ce_over_srst) || (ff_data.ce_over_srst && ce))) {
current_q = ff_data.val_srst; current_q = ff_data.val_srst;
} }
} }