⚡ Fixed running switch with two always blocks (#10)

AhmedSobhy01 · Apr 29, 2024 · c4564cb · c4564cb
1 parent d04ce73
commit c4564cb
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 46 deletions.
diff --git a/AESDecrypt.v b/AESDecrypt.v
@@ -7,7 +7,7 @@ module AESDecrypt #(parameter Nk = 4, parameter Nr = 10) (data, allKeys, out, cl
 
 	reg [127:0] state;
 	reg [127:0] keyReg; 
-	reg [3:0] roundCount = 1;
+	reg [3:0] roundCount = 0;
 	wire [127:0] stateAfterLastRound;
 	wire [127:0] stateAfterKey;
 	wire [127:0] stateAfterRound;
@@ -16,30 +16,29 @@ module AESDecrypt #(parameter Nk = 4, parameter Nr = 10) (data, allKeys, out, cl
 	DecryptRound round(state , keyReg , stateAfterRound);
 	LastDecryptRound lastRound (state , keyReg , stateAfterLastRound);
 
-	always@(data)begin
-		state = data;
-	end
-
-	always@(allKeys)begin
-		keyReg = allKeys[((11 * 128) - 1) -: 128] ;
-	end
-
 	assign out = state;
 
-	always @(posedge clk) begin
+	always @(clk) begin
 		if (enable == 1) begin
-			if (roundCount == 1)
-				state <= stateAfterKey;
-			else if (roundCount < Nr +1)
-				state <= stateAfterRound;
-			else if (roundCount == Nr +1)
-				state <= stateAfterLastRound;
-
-			if (roundCount > 0 && roundCount < Nr + 1)
-				keyReg <= allKeys[((11 * 128) - roundCount * 128 - 1) -: 128];	
-
-			if (roundCount < Nr + 2)
-				roundCount <= roundCount + 1;
+			if (clk) begin
+				if (roundCount == 1)
+					state <= stateAfterKey;
+				else if (roundCount < Nr +1)
+					state <= stateAfterRound;
+				else if (roundCount == Nr +1)
+					state <= stateAfterLastRound;
+
+				if (roundCount > 0 && roundCount < Nr + 1)
+					keyReg <= allKeys[((11 * 128) - roundCount * 128 - 1) -: 128];	
+
+				if (roundCount < Nr + 2)
+					roundCount <= roundCount + 1;
+			end
+			else if (roundCount == 0) begin
+				state <= data;
+				keyReg <= allKeys[((11 * 128) - 1) -: 128];
+				roundCount <= 1;
+			end
 		end
 	end
 endmodule

diff --git a/AESEncrypt.v b/AESEncrypt.v
@@ -1,4 +1,3 @@
-
 module AESEncrypt #(parameter Nk = 4, parameter Nr = 10) (data, allKeys, out, clk, enable);
 	input [127:0] data;
 	input [(11 * 128) - 1:0] allKeys;
@@ -8,7 +7,7 @@ module AESEncrypt #(parameter Nk = 4, parameter Nr = 10) (data, allKeys, out, cl
 
 	reg [127:0] state;
 	reg [127:0] keyReg;
-	reg [3:0] roundCount = 1;
+	reg [3:0] roundCount = 0;
 	wire [127:0] stateAfterLastRound;
 	wire [127:0] stateAfterKey;
 	wire [127:0] stateAfterRound;
@@ -18,30 +17,29 @@ module AESEncrypt #(parameter Nk = 4, parameter Nr = 10) (data, allKeys, out, cl
 	EncryptRound round(state, keyReg, stateAfterRound);
 	LastEncryptRound lastRound(state, keyReg, stateAfterLastRound);
 
-	always @(data) begin
-		state = data;
-	end
-
-	always @(allKeys) begin
-		keyReg = allKeys[127:0];
-	end
-
 	assign out = state;
 
-	always @(posedge clk) begin
-		if (enable == 1) begin
-			if (roundCount == 1)
-				state <= stateAfterKey;
-			else if (roundCount < Nr + 1)
-				state <= stateAfterRound;
-			else if (roundCount == Nr + 1)
-				state <= stateAfterLastRound;
-
-			if (roundCount > 0 && roundCount < Nr + 1)
-				keyReg <= allKeys[(128 * (roundCount + 1)) - 1 -: 128];
-
-			if (roundCount < Nr + 2)
-				roundCount <= roundCount + 1;
+	always @(clk) begin
+		if (enable) begin
+			if (clk) begin
+				if (roundCount == 1)
+					state <= stateAfterKey;
+				else if (roundCount < Nr + 1)
+					state <= stateAfterRound;
+				else if (roundCount == Nr + 1)
+					state <= stateAfterLastRound;
+
+				if (roundCount > 0 && roundCount < Nr + 1)
+					keyReg <= allKeys[(128 * (roundCount + 1)) - 1 -: 128];
+
+				if (roundCount < Nr + 2)
+					roundCount <= roundCount + 1;
+			end
+			else if (roundCount == 0) begin
+				state <= data;
+				keyReg <= allKeys[127 -: 128];
+				roundCount <= 1;
+			end
 		end
 	end
 endmodule