From 35f1c1d9714033b774e8be04ab1dcca64ef198b2 Mon Sep 17 00:00:00 2001
From: David Harris <David_Harris@hmc.edu>
Date: Sat, 16 Mar 2024 07:26:40 -0700
Subject: [PATCH] Restructured rconlut for modularity

---
 src/ieu/aes/aes64ks1i.sv                    |  8 ++--
 src/ieu/aes/{rconlut128.sv => rconlut32.sv} | 42 +++++++++++----------
 2 files changed, 26 insertions(+), 24 deletions(-)
 rename src/ieu/aes/{rconlut128.sv => rconlut32.sv} (70%)

diff --git a/src/ieu/aes/aes64ks1i.sv b/src/ieu/aes/aes64ks1i.sv
index ef36e1cc6..3c1d203f9 100644
--- a/src/ieu/aes/aes64ks1i.sv
+++ b/src/ieu/aes/aes64ks1i.sv
@@ -34,19 +34,17 @@ module aes64ks1i(
 );                 
                  
    logic 			        finalround;
-   logic [7:0] 			  rcon8;
    logic [31:0] 		     rcon, rs1Rotate;
    
-   rconlut128 rc(round, rcon8);                           // Get rcon value from lookup table
-   assign rcon = {24'b0, rcon8};                          // Zero-pad RCON 
+   rconlut32 rc(round, rcon);                             // Get rcon value from lookup table
    assign rs1Rotate = {rs1[39:32], rs1[63:40]};           // Get rotated value fo ruse in tmp2
    assign finalround = (round == 4'b1010);                // round 10 is the last one 
-   assign SboxKIn = finalround ? rs1[63:32] : rs1Rotate;     // Don't rotate on the last round
+   assign SboxKIn = finalround ? rs1[63:32] : rs1Rotate;  // Don't rotate on the last round
 
    // Share sbox with encryption in zknde64.  This module just sends value to shared sbox and gets result back
    // send out value as SboxKIn, get back subsittuted result as Sbox0Out
 
-   assign result[31:0] = Sbox0Out ^ rcon;
+   assign result[31:0]  = Sbox0Out ^ rcon;
    assign result[63:32] = Sbox0Out ^ rcon;	
 endmodule
 
diff --git a/src/ieu/aes/rconlut128.sv b/src/ieu/aes/rconlut32.sv
similarity index 70%
rename from src/ieu/aes/rconlut128.sv
rename to src/ieu/aes/rconlut32.sv
index 3360b9b51..e1f80964b 100644
--- a/src/ieu/aes/rconlut128.sv
+++ b/src/ieu/aes/rconlut32.sv
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////
-// rconlut128.sv
+// rconlut32.sv
 //
 // Written: ryan.swann@okstate.edu, james.stine@okstate.edu
 // Created: 20 February 2024
@@ -25,24 +25,28 @@
 // and limitations under the License.
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
-module rconlut128(
-	input  logic [3:0] rd,
-	output logic [7:0] rconOut
+module rconlut32(
+	input  logic [3:0]  rd,
+	output logic [31:0] rcon
 );
+
+	logic [7:0] rcon8;
 	
-   always_comb
-	case(rd)
-	  4'h0 : rconOut = 8'h01;
-	  4'h1 : rconOut = 8'h02;
-	  4'h2 : rconOut = 8'h04;
-	  4'h3 : rconOut = 8'h08;
-	  4'h4 : rconOut = 8'h10;
-	  4'h5 : rconOut = 8'h20;
-	  4'h6 : rconOut = 8'h40;
-	  4'h7 : rconOut = 8'h80;
-	  4'h8 : rconOut = 8'h1b;
-	  4'h9 : rconOut = 8'h36;
-	  4'hA : rconOut = 8'h00;
-	  default : rconOut = 8'h00;
-	endcase	
+   	always_comb
+		case(rd)
+			4'h0 : rcon8 = 8'h01;
+			4'h1 : rcon8 = 8'h02;
+			4'h2 : rcon8 = 8'h04;
+			4'h3 : rcon8 = 8'h08;
+			4'h4 : rcon8 = 8'h10;
+			4'h5 : rcon8 = 8'h20;
+			4'h6 : rcon8 = 8'h40;
+			4'h7 : rcon8 = 8'h80;
+			4'h8 : rcon8 = 8'h1b;
+			4'h9 : rcon8 = 8'h36;
+			4'hA : rcon8 = 8'h00;
+			default : rcon8 = 8'h00;
+		endcase	
+
+	assign rcon = {24'b0, rcon8};
 endmodule