Correction de la double inversion des entrées et de la création des tableaux

1 files changed, 4 insertions, 4 deletions

diff --git a/src/add_vhdltbc/ii/roundexe_liliput.vhd b/src/add_vhdltbc/ii/roundexe_liliput.vhd
index d407f6a..f04509f 100644
--- a/src/add_vhdltbc/ii/roundexe_liliput.vhd
+++ b/src/add_vhdltbc/ii/roundexe_liliput.vhd
@@ -71,8 +71,8 @@ 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(127-8*(j+(4*i))downto 120-8*(j+(4*i)));
-			data_o(127-8*(j+(4*i))downto 120-8*(j+(4*i))) <= state_o_s(i)(j) when data_out_valid_s = '1' else X"00";
+		 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";
 		end generate;
 	end generate;
 
@@ -95,12 +95,12 @@ begin
 	end process reg_roundkey;
 
 	--Tweak_key concatenation
-	tweak_key_i (TWEAK_KEY_LEN downto 0) <= tweak_i & keyb_i;
+	tweak_key_i (TWEAK_KEY_LEN downto 0) <= keyb_i & tweak_i;
 
 	--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( (TWEAK_KEY_LEN)-8*(8*i+j)downto TWEAK_KEY_LEN-7-8*(8*i+j));
+			tk_s(i)(j) <= tweak_key_i(((64*i)+(8*j)+7)downto((64*i)+(8*j)));
 		end generate;
 	end generate;