[Cryptech-Commits] [test/novena_base] 01/01: Passes build without any warnings.

[git at cryptech.is]

This is an automated email from the git hooks/post-receive script.

joachim at secworks.se pushed a commit to branch sha256_core
in repository test/novena_base.

commit eff75209176003629d3840809fc220a458fd89f7
Author: Joachim Strömbergson <joachim at secworks.se>
Date:   Mon Feb 2 21:06:21 2015 +0100

    Passes build without any warnings.
---
 rtl/src/verilog/core_selector.v | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/rtl/src/verilog/core_selector.v b/rtl/src/verilog/core_selector.v
index 092b8ca..4d3a218 100644
--- a/rtl/src/verilog/core_selector.v
+++ b/rtl/src/verilog/core_selector.v
@@ -48,16 +48,22 @@ module core_selector
 	 input wire [31 : 0]  write_data
 	);
 
-  parameter SHA256_BASE = 6'h14;
-  wire is_sha256 = ~(sys_eim_addr[13:8] ^ SHA256_BASE);
-  wire sha256_cs = (is_sha256 & sys_eim_rd) | (is_sha256 & sys_eim_wr);
+//  parameter SHA256_BASE = 6'h14;
+//  wire is_sha256 = ~(sys_eim_addr[13:8] ^ SHA256_BASE);
+//  wire sha256_cs = (is_sha256 & sys_eim_rd) | (is_sha256 & sys_eim_wr);
+
+  localparam SHA256_BASE_ADDR = 6'h14;
+  wire access_sha256 = (sys_eim_addr[13 : 8] == SHA256_BASE_ADDR) ? 1'b1 : 1'b0;
+  wire read_access   = sys_eim_wr & access_sha256;
+  wire write_access  = sys_eim_rd & access_sha256;
+  wire select = read_access | write_access;
 
   sha256 sha256_inst(
                      .clk(sys_clk),
                      .reset_n(~sys_rst),
 
-                     .cs(sha256_cs),
-                     .we(sys_eim_wr),
+                     .cs(select),
+                     .we(write_access),
 
                      .address(sys_eim_addr[7 : 0]),
                      .write_data(write_data),