diff --git a/src/ieu/sha/sha512_32.sv b/src/ieu/sha/sha512_32.sv
index 679d6d740..4ce8e31ef 100644
--- a/src/ieu/sha/sha512_32.sv
+++ b/src/ieu/sha/sha512_32.sv
@@ -31,67 +31,46 @@ module sha512_32 (
    output logic [31:0] result
 );
 
-   logic [31:0] x[6][6];
-   logic [31:0] y[6];
+   logic [31:0] x[6][3];
+   logic [31:0] y[3];
 
    // sha512{sig0h/sig0l/sig1h/sig1l/sum0r/sum1r} select shifted operands for 32-bit xor6
 
    // sha512sig0h
-   assign x[0][0] = A >> 1;
-   assign x[0][1] = A >> 7;
-   assign x[0][2] = A >> 8;
-   assign x[0][3] = B << 31;
-   assign x[0][4] = B << 24;
-   assign x[0][5] = '0;   
+   assign x[0][0] = {B[0], A[31:1]};
+   assign x[0][1] = {B[7:0], A[31:8]}; 
+   assign x[0][2] = {7'b0, A[31:7]};
 
    // sha512sig0l
-   assign x[1][0] = A >> 1; 
-   assign x[1][1] = A >> 7; 
-   assign x[1][2] = A >> 8; 
-   assign x[1][3] = B << 31;
-   assign x[1][4] = B << 25;
-   assign x[1][5] = B << 24;
+   assign x[1][0] = x[0][0];
+   assign x[1][1] = x[0][1]; 
+   assign x[1][2] = {B[6:0], A[31:7]};
 
    // sha512sig1h
-   assign x[2][0] = A << 3;
-   assign x[2][1] = A >> 6;
-   assign x[2][2] = A >> 19;
-   assign x[2][3] = B >> 29;
-   assign x[2][4] = B << 13;
-   assign x[2][5] = '0;      
+   assign x[2][0] = {A[28:0], B[31:29]};
+   assign x[2][1] = {B[18:0], A[31:19]};
+   assign x[2][2] = {6'b0, A[31:6]};  
 
    // sha512sig1l
-   assign x[3][0] = A << 3; 
-   assign x[3][1] = A >> 6; 
-   assign x[3][2] = A >> 19; 
-   assign x[3][3] = B >> 29;
-   assign x[3][4] = B << 26;
-   assign x[3][5] = B << 13;
+   assign x[3][0] = x[2][0];
+   assign x[3][1] = x[2][1];
+   assign x[3][2] = {B[5:0], A[31:6]};    
 
    // sha512sum0r
-   assign x[4][0] = A << 25; 
-   assign x[4][1] = A << 30; 
-   assign x[4][2] = A >> 28; 
-   assign x[4][3] = B >> 7;
-   assign x[4][4] = B >> 2;
-   assign x[4][5] = B << 4;
+   assign x[4][0] = {A[6:0], B[31:7]}; 
+   assign x[4][1] = {A[1:0], B[31:2]};
+   assign x[4][2] = {B[27:0], A[31:28]};    
 
    // sha512sum1r
-   assign x[5][0] = A << 23; 
-   assign x[5][1] = A >> 14; 
-   assign x[5][2] = A >> 18; 
-   assign x[5][3] = B >> 9;
-   assign x[5][4] = B << 18;
-   assign x[5][5] = B << 14;   
+   assign x[5][0] = {A[8:0], B[31:9]}; 
+   assign x[5][1] = {B[13:0], A[31:14]};
+   assign x[5][2] = {B[17:0], A[31:18]}; 
 
    // 32-bit muxes to select inputs to xor6 for sha512
    assign y[0] = x[ZKNHSelect[2:0]][0]; 
    assign y[1] = x[ZKNHSelect[2:0]][1]; 
    assign y[2] = x[ZKNHSelect[2:0]][2];
-   assign y[3] = x[ZKNHSelect[2:0]][3]; 
-   assign y[4] = x[ZKNHSelect[2:0]][4]; 
-   assign y[5] = x[ZKNHSelect[2:0]][5];    
-
+ 
    // sha512 32-bit xor6
-   assign result = y[0] ^ y[1] ^ y[2] ^ y[3] ^ y[4] ^ y[5];
+   assign result = y[0] ^ y[1] ^ y[2];
 endmodule