diff options
| author | Joachim StroĢmbergson <joachim@assured.se> | 2019-02-08 10:42:37 +0100 |
|---|---|---|
| committer | Joachim StroĢmbergson <joachim@assured.se> | 2019-02-08 10:42:37 +0100 |
| commit | 136f26d704cb6b318b6cd3f79c19b9258b19813b (patch) | |
| tree | daeaf67995ec819401bef227df55bfa02b645a04 | |
| parent | de3f38a835ad9ac5ad8b6153a6b363c23641a3f8 (diff) | |
(1) Removed reset input port from qr module, qr module instances and qr module tb. (2) Fixed non blocking assigment erroneously used in comboinational process.HEADmaster
| -rw-r--r-- | src/rtl/chacha.v | 4 | ||||
| -rw-r--r-- | src/rtl/chacha_core.v | 4 | ||||
| -rw-r--r-- | src/rtl/chacha_qr.v | 1 | ||||
| -rw-r--r-- | src/tb/tb_chacha_qr.v | 1 |
4 files changed, 2 insertions, 8 deletions
diff --git a/src/rtl/chacha.v b/src/rtl/chacha.v index 435555b..ec67d24 100644 --- a/src/rtl/chacha.v +++ b/src/rtl/chacha.v @@ -233,8 +233,8 @@ module chacha( begin if (address == ADDR_CTRL) begin - init_new <= write_data[CTRL_INIT_BIT]; - next_new <= write_data[CTRL_NEXT_BIT]; + init_new = write_data[CTRL_INIT_BIT]; + next_new = write_data[CTRL_NEXT_BIT]; end if (address == ADDR_KEYLEN) diff --git a/src/rtl/chacha_core.v b/src/rtl/chacha_core.v index 20aecec..47234bf 100644 --- a/src/rtl/chacha_core.v +++ b/src/rtl/chacha_core.v @@ -195,7 +195,6 @@ module chacha_core( //---------------------------------------------------------------- chacha_qr qr0( .clk(clk), - .reset_n(reset_n), .a(qr0_a), .b(qr0_b), @@ -210,7 +209,6 @@ module chacha_core( chacha_qr qr1( .clk(clk), - .reset_n(reset_n), .a(qr1_a), .b(qr1_b), @@ -225,7 +223,6 @@ module chacha_core( chacha_qr qr2( .clk(clk), - .reset_n(reset_n), .a(qr2_a), .b(qr2_b), @@ -240,7 +237,6 @@ module chacha_core( chacha_qr qr3( .clk(clk), - .reset_n(reset_n), .a(qr3_a), .b(qr3_b), diff --git a/src/rtl/chacha_qr.v b/src/rtl/chacha_qr.v index 02fe59b..83edd9b 100644 --- a/src/rtl/chacha_qr.v +++ b/src/rtl/chacha_qr.v @@ -41,7 +41,6 @@ module chacha_qr( input wire clk, - input wire reset_n, input wire [31 : 0] a, input wire [31 : 0] b, diff --git a/src/tb/tb_chacha_qr.v b/src/tb/tb_chacha_qr.v index 06759d7..2c0de8e 100644 --- a/src/tb/tb_chacha_qr.v +++ b/src/tb/tb_chacha_qr.v @@ -76,7 +76,6 @@ module tb_chacha_qr(); //---------------------------------------------------------------- chacha_qr dut( .clk(tb_clk), - .reset_n(tb_reset_n), .a(a), .b(b), |