Skip to content

V
VME64x core
Commit a26a0c6b authored by Tristan Gingold's avatar Tristan Gingold
Browse files
Options

VME_CR_CSR_Space.vhd: avoid vector truncation in to_unsigned

parent e2b3712d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
hdl/vme64x-core/rtl/VME_CR_CSR_Space.vhd
View file @ a26a0c6b
...@@ -328,7 +328,7 @@ begin ...@@ -328,7 +328,7 @@ begin
-- Write -- Write
process (clk_i) process (clk_i)
variable v_addr : unsigned(6 downto 2); variable v_addr : unsigned(18 downto 2);
variable v_index : integer; variable v_index : integer;
variable v_byte : integer; variable v_byte : integer;
begin begin
...@@ -371,7 +371,7 @@ begin ...@@ -371,7 +371,7 @@ begin
s_reg_usr_bit_reg <= s_reg_usr_bit_reg and not data_i; s_reg_usr_bit_reg <= s_reg_usr_bit_reg and not data_i;
when c_ADER_REG_BEG to c_ADER_REG_END => when c_ADER_REG_BEG to c_ADER_REG_END =>
v_addr := s_addr(6 downto 2) - to_unsigned(c_ADER_REG_BEG, 5); v_addr := s_addr(18 downto 2) - to_unsigned(c_ADER_REG_BEG, 17);
v_index := to_integer(v_addr(6 downto 4)); v_index := to_integer(v_addr(6 downto 4));
v_byte := 3-to_integer(v_addr(3 downto 2)); v_byte := 3-to_integer(v_addr(3 downto 2));
s_reg_ader(v_index)(8*v_byte+7 downto 8*v_byte) <= data_i; s_reg_ader(v_index)(8*v_byte+7 downto 8*v_byte) <= data_i;
...@@ -438,7 +438,7 @@ begin ...@@ -438,7 +438,7 @@ begin
-- Read -- Read
process (clk_i) process (clk_i)
variable v_addr : unsigned(6 downto 2); variable v_addr : unsigned(18 downto 2);
variable v_index : integer; variable v_index : integer;
variable v_byte : integer; variable v_byte : integer;
begin begin
...@@ -466,7 +466,7 @@ begin ...@@ -466,7 +466,7 @@ begin
s_csr_data <= s_reg_usr_bit_reg; s_csr_data <= s_reg_usr_bit_reg;
when c_ADER_REG_BEG to c_ADER_REG_END => when c_ADER_REG_BEG to c_ADER_REG_END =>
v_addr := s_addr(6 downto 2) - to_unsigned(c_ADER_REG_BEG, 5); v_addr := s_addr(18 downto 2) - to_unsigned(c_ADER_REG_BEG, 17);
v_index := to_integer(v_addr(6 downto 4)); v_index := to_integer(v_addr(6 downto 4));
v_byte := 3-to_integer(v_addr(3 downto 2)); v_byte := 3-to_integer(v_addr(3 downto 2));
s_csr_data <= s_ader(v_index)(8*v_byte+7 downto 8*v_byte); s_csr_data <= s_ader(v_index)(8*v_byte+7 downto 8*v_byte);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment