diff options
| author | Tristan Gingold <tgingold@free.fr> | 2019-07-21 10:16:48 +0200 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2019-07-22 07:32:57 +0200 |
| commit | 1bbec5cda2fcebd9190b1cdb05a102f40dee87c3 (patch) | |
| tree | 50df402f4c268cfcb4e751400eb6921b885cdddb /src/synth/netlists-disp_vhdl.adb | |
| parent | 666522908fb607d867c0bfff49a3b042d7f64314 (diff) | |
| download | ghdl-1bbec5cda2fcebd9190b1cdb05a102f40dee87c3.tar.gz ghdl-1bbec5cda2fcebd9190b1cdb05a102f40dee87c3.tar.bz2 ghdl-1bbec5cda2fcebd9190b1cdb05a102f40dee87c3.zip | |
synth: rework names.
Diffstat (limited to 'src/synth/netlists-disp_vhdl.adb')
| -rw-r--r-- | src/synth/netlists-disp_vhdl.adb | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/src/synth/netlists-disp_vhdl.adb b/src/synth/netlists-disp_vhdl.adb index 4e180d7f7..1ae79721a 100644 --- a/src/synth/netlists-disp_vhdl.adb +++ b/src/synth/netlists-disp_vhdl.adb @@ -84,27 +84,18 @@ package body Netlists.Disp_Vhdl is end if; Prefix := Get_Sname_Prefix (N); + if Prefix /= No_Sname then + Put_Name_1 (Prefix); + Put ("_"); + end if; case Get_Sname_Kind (N) is when Sname_User => - if Prefix = No_Sname then - Put ("\"); - else - Put_Name_1 (Prefix); - Put ("."); - end if; Put_Id (Get_Sname_Suffix (N)); when Sname_Artificial => - if Prefix = No_Sname then - Put ("$"); - else - Put_Name_1 (Prefix); - Put ("."); - end if; Put (Image (Get_Sname_Suffix (N))); when Sname_Version => - Put_Name_1 (Prefix); - Put ("%"); + Put ("n"); Put_Name_Version (N); end case; end Put_Name_1; @@ -206,15 +197,14 @@ package body Netlists.Disp_Vhdl is Put_Name (Get_Input_Desc (Get_Module (Inst), Idx).Name); else Inst_Name := Get_Name (Inst); - Port_Name := Get_Output_Desc (Get_Module (Inst), Idx).Name; + Put_Name (Inst_Name); case Get_Sname_Kind (Inst_Name) is when Sname_Version => - Put ("n"); - Put_Name_Version (Inst_Name); + Port_Name := Get_Output_Desc (Get_Module (Inst), Idx).Name; Put ("_"); Put_Interface_Name (Port_Name); when Sname_User => - Put_Id (Get_Sname_Suffix (Inst_Name)); + null; when others => raise Internal_Error; end case; @@ -501,6 +491,8 @@ package body Netlists.Disp_Vhdl is Disp_Template (" \o0 <= \i0; -- (output)" & NL, Inst); when Id_Signal => Disp_Template (" \o0 <= \i0; -- (signal)" & NL, Inst); + when Id_Isignal => + Disp_Template (" \o0 <= \i0; -- (isignal)" & NL, Inst); when Id_Port => null; when Id_Not => |