diff options
| author | Tristan Gingold <tgingold@free.fr> | 2020-04-04 06:29:57 +0200 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2020-04-06 20:10:55 +0200 |
| commit | 84e332e02c1903b110d3141934184ed5a0906db4 (patch) | |
| tree | 1f053179e11d2f25086c6dbcc55e661eb3a70512 /src/synth/netlists-disp_vhdl.adb | |
| parent | ac4a55b1eb20670b6b0d88f29e0bbf596d3d8830 (diff) | |
| download | ghdl-84e332e02c1903b110d3141934184ed5a0906db4.tar.gz ghdl-84e332e02c1903b110d3141934184ed5a0906db4.tar.bz2 ghdl-84e332e02c1903b110d3141934184ed5a0906db4.zip | |
netlists-disp_vhdl: factorize code, improve handling of 'Z'.
Diffstat (limited to 'src/synth/netlists-disp_vhdl.adb')
| -rw-r--r-- | src/synth/netlists-disp_vhdl.adb | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/synth/netlists-disp_vhdl.adb b/src/synth/netlists-disp_vhdl.adb index 13adbf62e..172e9d921 100644 --- a/src/synth/netlists-disp_vhdl.adb +++ b/src/synth/netlists-disp_vhdl.adb @@ -338,18 +338,20 @@ package body Netlists.Disp_Vhdl is Put ('"'); end Disp_Const_Log; - procedure Disp_X_Lit (W : Width) + procedure Disp_X_Lit (W : Width; C : Character) is Q : constant Character := Get_Lit_Quote (W); begin if W <= 8 then Put (Q); - Put ((1 .. Natural (W) => 'X')); + Put ((1 .. Natural (W) => C)); Put (Q); else Put ('('); Put_Trim (Uns32'Image (W - 1)); - Put (" downto 0 => 'X')"); + Put (" downto 0 => '"); + Put (C); + Put ("')"); end if; end Disp_X_Lit; @@ -359,7 +361,6 @@ package body Netlists.Disp_Vhdl is is Imod : constant Module := Get_Module (Inst); O : constant Net := Get_Output (Inst, 0); - W : Width; begin case Get_Id (Imod) is when Id_Const_UB32 @@ -370,18 +371,9 @@ package body Netlists.Disp_Vhdl is Get_Param_Uns32 (Inst, 1), Get_Width (O)); when Id_Const_Z => - Put ('('); - Put_Uns32 (Get_Width (O) - 1); - Put (" downto 0 => 'Z')"); + Disp_X_Lit (Get_Width (O), 'Z'); when Id_Const_X => - W := Get_Width (O); - if W = 1 then - Put ("'X'"); - else - Put ('('); - Put_Uns32 (Get_Width (O) - 1); - Put (" downto 0 => 'X')"); - end if; + Disp_X_Lit (Get_Width (O), 'X'); when Id_Const_Bit => Disp_Const_Bit (Inst); when Id_Const_Log => @@ -1003,7 +995,7 @@ package body Netlists.Disp_Vhdl is " \i3 when ""10""," & NL & " \i4 when ""11""," & NL, Inst); Put (" "); - Disp_X_Lit (Get_Width (Get_Output (Inst, 0))); + Disp_X_Lit (Get_Width (Get_Output (Inst, 0)), 'X'); Put_Line (" when others;"); when Id_Add => if Get_Width (Get_Output (Inst, 0)) = 1 then |