aboutsummaryrefslogtreecommitdiff
path: root/src/rtl
diff options
context:
space:
mode:
Diffstat (limited to 'src/rtl')
-rw-r--r--src/rtl/sha1_w_mem.v71
1 files changed, 9 insertions, 62 deletions
diff --git a/src/rtl/sha1_w_mem.v b/src/rtl/sha1_w_mem.v
index f50741e..2ba80f5 100644
--- a/src/rtl/sha1_w_mem.v
+++ b/src/rtl/sha1_w_mem.v
@@ -86,12 +86,6 @@ module sha1_w_mem(
reg [6 : 0] w_ctr_reg;
reg [6 : 0] w_ctr_new;
reg w_ctr_we;
- reg w_ctr_inc;
- reg w_ctr_rst;
-
- reg sha1_w_mem_ctrl_reg;
- reg sha1_w_mem_ctrl_new;
- reg sha1_w_mem_ctrl_we;
//----------------------------------------------------------------
@@ -123,7 +117,7 @@ module sha1_w_mem(
for (i = 0 ; i < 16 ; i = i + 1)
w_mem[i] <= 32'h0;
- sha1_w_mem_ctrl_reg <= CTRL_IDLE;
+ w_ctr_reg <= 7'h0;
end
else
begin
@@ -149,9 +143,6 @@ module sha1_w_mem(
if (w_ctr_we)
w_ctr_reg <= w_ctr_new;
-
- if (sha1_w_mem_ctrl_we)
- sha1_w_mem_ctrl_reg <= sha1_w_mem_ctrl_new;
end
end // reg_update
@@ -165,13 +156,9 @@ module sha1_w_mem(
always @*
begin : select_w
if (w_ctr_reg < 16)
- begin
- w_tmp = w_mem[w_ctr_reg[3 : 0]];
- end
+ w_tmp = w_mem[w_ctr_reg[3 : 0]];
else
- begin
- w_tmp = w_new;
- end
+ w_tmp = w_new;
end // select_w
@@ -235,7 +222,7 @@ module sha1_w_mem(
w_mem_we = 1;
end
- else if (w_ctr_reg > 15)
+ if (next && (w_ctr_reg > 15))
begin
w_mem00_new = w_mem[01];
w_mem01_new = w_mem[02];
@@ -267,60 +254,20 @@ module sha1_w_mem(
always @*
begin : w_ctr
w_ctr_new = 7'h0;
- w_ctr_we = 0;
+ w_ctr_we = 1'h0;
- if (w_ctr_rst)
+ if (init)
begin
w_ctr_new = 7'h0;
- w_ctr_we = 1;
+ w_ctr_we = 1'h1;
end
- if (w_ctr_inc)
+ if (next)
begin
w_ctr_new = w_ctr_reg + 7'h01;
- w_ctr_we = 1;
+ w_ctr_we = 1'h1;
end
end // w_ctr
-
-
- //----------------------------------------------------------------
- // sha1_w_mem_fsm
- //
- // Logic for the w shedule FSM.
- //----------------------------------------------------------------
- always @*
- begin : sha1_w_mem_fsm
- w_ctr_rst = 0;
- w_ctr_inc = 0;
- sha1_w_mem_ctrl_new = CTRL_IDLE;
- sha1_w_mem_ctrl_we = 0;
-
- case (sha1_w_mem_ctrl_reg)
- CTRL_IDLE:
- begin
- if (init)
- begin
- w_ctr_rst = 1;
- sha1_w_mem_ctrl_new = CTRL_UPDATE;
- sha1_w_mem_ctrl_we = 1;
- end
- end
-
- CTRL_UPDATE:
- begin
- if (next)
- begin
- w_ctr_inc = 1;
- end
-
- if (w_ctr_reg == SHA1_ROUNDS)
- begin
- sha1_w_mem_ctrl_new = CTRL_IDLE;
- sha1_w_mem_ctrl_we = 1;
- end
- end
- endcase // case (sha1_ctrl_reg)
- end // sha1_w_mem_fsm
endmodule // sha1_w_mem
//======================================================================