Corrections des entrées et du traitement de ces entrées

1 files changed, 6 insertions, 3 deletions

diff --git a/src/add_vhdltbc/ii/roundexe_liliput.vhd b/src/add_vhdltbc/ii/roundexe_liliput.vhd
index f04509f..437e831 100644
--- a/src/add_vhdltbc/ii/roundexe_liliput.vhd
+++ b/src/add_vhdltbc/ii/roundexe_liliput.vhd
@@ -71,8 +71,10 @@ begin
 
 	convertion_ligne : for i in 0 to 3 generate
 		convertion_colonne : for j in 0 to 3 generate
-		 data_i_s(i)(j) <= data_i((7+(8*(4*i+j)))downto((8*(4*i+j))));
-		 data_o(7+(8*(4*i+j)) downto (8*(4*i+j))) <= state_o_s(i)(j) when data_out_valid_s = '1' else X"00";
+			data_i_s(i)(j)(7 downto 4)                       <= data_i((3+(8*(4*i+j)))downto((8*(4*i+j))));
+			data_i_s(i)(j)(3 downto 0)                       <= data_i((7+(8*(4*i+j)))downto(4+(8*(4*i+j))));
+			data_o(7+(8*(4*i+j)) downto 4+(8*(4*i+j)))       <= state_o_s(i)(j)(3 downto 0) when data_out_valid_s = '1' else X"0";
+			data_o(3+(8*(4*i+j)) downto (8*(4*i+j)))         <= state_o_s(i)(j)(7 downto 4)  when data_out_valid_s = '1' else X"0";
 		end generate;
 	end generate;
 
@@ -100,7 +102,8 @@ begin
 	--formatting tweak_key in type_tweak_key_array
 	convertion_ligne_key : for i in 0 to LANE_NB-1 generate
 		convertion_colonne_key : for j in 0 to 7 generate
-			tk_s(i)(j) <= tweak_key_i(((64*i)+(8*j)+7)downto((64*i)+(8*j)));
+			tk_s(i)(j)(7 downto 4) <= tweak_key_i(((64*i)+(8*j)+3)downto((64*i)+(8*j)));
+			tk_s(i)(j)(3 downto 0) <= tweak_key_i(((64*i)+(8*j)+7)downto((64*i)+(8*j)+4));
 		end generate;
 	end generate;