diff options
| author | Miodrag Milanovic <mmicko@gmail.com> | 2022-02-21 16:36:12 +0100 |
|---|---|---|
| committer | Miodrag Milanovic <mmicko@gmail.com> | 2022-02-21 16:36:12 +0100 |
| commit | fd3f08753a2c577bb87ad332329213c58d4a9326 (patch) | |
| tree | 2e08ead754233b554f2ab68c02bb001cc6848b97 | |
| parent | 13a5c28459ae676726611a7e08152235be1e3039 (diff) | |
| download | yosys-fd3f08753a2c577bb87ad332329213c58d4a9326.tar.gz yosys-fd3f08753a2c577bb87ad332329213c58d4a9326.tar.bz2 yosys-fd3f08753a2c577bb87ad332329213c58d4a9326.zip | |
Fix handling of ce_over_srst
| -rw-r--r-- | passes/sat/sim.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/passes/sat/sim.cc b/passes/sat/sim.cc index 57df0f929..3b8114fa9 100644 --- a/passes/sat/sim.cc +++ b/passes/sat/sim.cc @@ -487,14 +487,13 @@ struct SimInstance if (ff_data.pol_clk ? (ff.past_clk == State::S0 && current_clk != State::S0) : (ff.past_clk == State::S1 && current_clk != State::S1)) { 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 if (!ff_data.has_ce || (ff_data.has_ce && ce)) { current_q = ff.past_d; } // 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; } } |