diff options
| author | Tristan Gingold <tgingold@free.fr> | 2020-03-07 18:31:50 +0100 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2020-03-07 18:31:50 +0100 |
| commit | 2e9fec6bb91436b40b2ebc6942e34736f97d9825 (patch) | |
| tree | 97579827001e73eb3861ffb24b3c4ca10a1f897c /src | |
| parent | ec0b123c0341074f815ea8087da2dbf4b4575e49 (diff) | |
| download | ghdl-2e9fec6bb91436b40b2ebc6942e34736f97d9825.tar.gz ghdl-2e9fec6bb91436b40b2ebc6942e34736f97d9825.tar.bz2 ghdl-2e9fec6bb91436b40b2ebc6942e34736f97d9825.zip | |
netlists-expands: fix dyn_insert_en (en was missing). Fix #1155
Diffstat (limited to 'src')
| -rw-r--r-- | src/synth/netlists-disp_vhdl.adb | 2 | ||||
| -rw-r--r-- | src/synth/netlists-expands.adb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/synth/netlists-disp_vhdl.adb b/src/synth/netlists-disp_vhdl.adb index c1ce68c2e..4bbaaef31 100644 --- a/src/synth/netlists-disp_vhdl.adb +++ b/src/synth/netlists-disp_vhdl.adb @@ -109,6 +109,7 @@ package body Netlists.Disp_Vhdl is return; end if; + -- Interface names are not versionned, and don't have prefix. if Get_Sname_Kind (N) in Sname_User .. Sname_Artificial and then Get_Sname_Prefix (N) = No_Sname then @@ -142,6 +143,7 @@ package body Netlists.Disp_Vhdl is case Get_Id (M) is when Id_Signal | Id_Isignal => + -- No suffix for signals (it's 'o'). null; when others => Port_Name := Get_Output_Desc (M, Idx).Name; diff --git a/src/synth/netlists-expands.adb b/src/synth/netlists-expands.adb index bab2b9b47..a7afdda01 100644 --- a/src/synth/netlists-expands.adb +++ b/src/synth/netlists-expands.adb @@ -406,7 +406,8 @@ package body Netlists.Expands is Off : Uns32; begin Off := Get_Param_Uns32 (Inst, 0); - Generate_Muxes (Ctxt, Concat, Mem, Off, Dat, Memidx_Arr, Net_Arr.all); + Generate_Muxes + (Ctxt, Concat, Mem, Off, Dat, Memidx_Arr, Net_Arr.all, En); if Off < O_W then Append (Concat, Build_Extract (Ctxt, Mem, Off, O_W - Off)); end if; |