diff options
| author | Tristan Gingold <tgingold@free.fr> | 2020-04-15 07:35:24 +0200 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2020-04-15 07:36:01 +0200 |
| commit | 15539c0af43cc63d99239e3b65d936955cde3226 (patch) | |
| tree | 97e95dcd9f260a3a7acf2cf48dde556416a65ecd /src/synth/netlists-inference.adb | |
| parent | add25cf10b6886bfea9b2392e08142cee1698fd0 (diff) | |
| download | ghdl-15539c0af43cc63d99239e3b65d936955cde3226.tar.gz ghdl-15539c0af43cc63d99239e3b65d936955cde3226.tar.bz2 ghdl-15539c0af43cc63d99239e3b65d936955cde3226.zip | |
synth: rework edge handling to properly support falling edge. Fix #1227
Diffstat (limited to 'src/synth/netlists-inference.adb')
| -rw-r--r-- | src/synth/netlists-inference.adb | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/synth/netlists-inference.adb b/src/synth/netlists-inference.adb index b0a660ec5..1155a6047 100644 --- a/src/synth/netlists-inference.adb +++ b/src/synth/netlists-inference.adb @@ -83,7 +83,7 @@ package body Netlists.Inference is Inst : constant Instance := Get_Net_Parent (N); begin case Get_Id (Inst) is - when Id_Edge => + when Edge_Module_Id => return True; when Id_And => -- Assume the condition is canonicalized, ie of the form: @@ -160,7 +160,7 @@ package body Netlists.Inference is Inst0 : constant Instance := Get_Net_Parent (N0); begin case Get_Id (Inst0) is - when Id_Edge => + when Edge_Module_Id => null; when Id_And => Extract_Clock_And (Ctxt, Inst0); @@ -175,7 +175,7 @@ package body Netlists.Inference is N3 : constant Net := Get_Driver (I3); Inst3 : constant Instance := Get_Net_Parent (N3); begin - if Get_Id (Inst3) = Id_Edge then + if Get_Id (Inst3) in Edge_Module_Id then declare Can_Rotate : constant Boolean := Has_One_Connection (N0); @@ -213,7 +213,7 @@ package body Netlists.Inference is Inst0 : constant Instance := Get_Net_Parent (N0); begin case Get_Id (Inst0) is - when Id_Edge => + when Edge_Module_Id => -- Swap inputs 0 and 1. declare I1 : constant Input := Get_Input (Inst, 0); @@ -236,7 +236,7 @@ package body Netlists.Inference is I3 : constant Input := Get_Input (Inst0, 0); N3 : constant Net := Get_Driver (I3); begin - if Get_Id (Get_Net_Parent (N3)) = Id_Edge then + if Get_Id (Get_Net_Parent (N3)) in Edge_Module_Id then declare Can_Rotate : constant Boolean := Has_One_Connection (N0); @@ -275,9 +275,8 @@ package body Netlists.Inference is Enable := No_Net; case Get_Id (Inst) is - when Id_Edge => - -- Get rid of the edge gate, just return the signal. - Clk := Get_Input_Net (Inst, 0); + when Edge_Module_Id => + Clk := N; when Id_And => -- Canonicalize conditions. Extract_Clock_And (Ctxt, Inst); @@ -287,12 +286,12 @@ package body Netlists.Inference is I0 : constant Net := Get_Input_Net (Inst, 0); Inst0 : constant Instance := Get_Net_Parent (I0); begin - if Get_Id (Inst0) = Id_Edge then + if Get_Id (Inst0) in Edge_Module_Id then -- INST is clearly not synthesizable (boolean operation on -- an edge). Will be removed at the end by -- remove_unused_instances. Do not remove it now as its -- output may be used by other nets. - Clk := Get_Input_Net (Inst0, 0); + Clk := I0; Enable := Get_Input_Net (Inst, 1); return; end if; |