From adbad78d77bd6ba045904260f0b2ec35ec0dd4e7 Mon Sep 17 00:00:00 2001
From: Eric Kooistra <kooistra@astron.nl>
Date: Fri, 8 Mar 2024 07:43:42 +0100
Subject: [PATCH] Add int_to_str(int, w) variant for fixed widths.
---
...d => tb_sdp_beamformer_remote_ring_bf.vhd} | 0
.../base/common/src/vhdl/common_str_pkg.vhd | 21 +++++++++++++++----
2 files changed, 17 insertions(+), 4 deletions(-)
rename applications/lofar2/libraries/sdp/tb/vhdl/{tb_sdp_beamformer_remote_ring.vhd => tb_sdp_beamformer_remote_ring_bf.vhd} (100%)
diff --git a/applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_beamformer_remote_ring.vhd b/applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_beamformer_remote_ring_bf.vhd
similarity index 100%
rename from applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_beamformer_remote_ring.vhd
rename to applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_beamformer_remote_ring_bf.vhd
diff --git a/libraries/base/common/src/vhdl/common_str_pkg.vhd b/libraries/base/common/src/vhdl/common_str_pkg.vhd
index e309a4d10a..8aad878892 100644
--- a/libraries/base/common/src/vhdl/common_str_pkg.vhd
+++ b/libraries/base/common/src/vhdl/common_str_pkg.vhd
@@ -53,6 +53,7 @@ package common_str_pkg is
function hex_nibble_to_slv(c: character) return std_logic_vector;
function int_to_str(int: integer) return string;
+ function int_to_str(int, w: integer) return string;
function real_to_str(re: real; width : integer; digits : integer) return string;
procedure print_str(str : string);
@@ -222,10 +223,9 @@ package body common_str_pkg is
when 'X' => v_result := "XXXX";
when 'z' => v_result := "ZZZZ";
when 'Z' => v_result := "ZZZZ";
-
- when others => v_result := "0000";
- end case;
- return v_result;
+ when others => v_result := "0000";
+ end case;
+ return v_result;
end hex_nibble_to_slv;
function int_to_str(int: integer) return string is
@@ -238,6 +238,19 @@ package body common_str_pkg is
return v_str;
end;
+ function int_to_str(int, w: integer) return string is
+ constant c_len: natural := nof_digits_int(int);
+ variable v_line: LINE;
+ variable v_str: string(1 to c_len) := (others => ' ');
+ variable v_ret: string(1 to w) := (others => ' ');
+ begin
+ STD.TEXTIO.WRITE(v_line, int);
+ v_str(v_line.ALL'range) := v_line.all;
+ deallocate(v_line);
+ v_ret(w - c_len + 1 to w) := v_str; -- right align v_str in v_ret
+ return v_ret;
+ end;
+
function real_to_str(re: real; width : integer; digits : integer) return string is
-- . The number length is width + 1, with +1 for the . in the floating point number.
-- However if width is too small to fit the number, then it will use more characters.
--
GitLab