[Cryptech-Commits] [core/platform/common] 02/02: Merge branch 'modexps6'

[git at cryptech.is]

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

paul at psgd.org pushed a commit to branch master
in repository core/platform/common.

commit dfb268cf925fa97ffa1729975ffb37dd2a37a2bc
Merge: cf6cf22 a8e0651
Author: Paul Selkirk <paul at psgd.org>
Date:   Thu Nov 12 22:48:08 2015 -0500

    Merge branch 'modexps6'

 core_selector/src/rtl/core_selector.v | 28 +++++++++++++++---
 core_selector/src/rtl/math_selector.v | 53 ++++++++++++++++++-----------------
 2 files changed, 52 insertions(+), 29 deletions(-)

diff --cc core_selector/src/rtl/math_selector.v
index c967715,833ffbf..8b8473a
--- a/core_selector/src/rtl/math_selector.v
+++ b/core_selector/src/rtl/math_selector.v
@@@ -77,27 -81,26 +81,26 @@@ module math_selecto
  
  
     //----------------------------------------------------------------
-    // MODEXP
+    // ModExpS6
     //----------------------------------------------------------------
-    `ifdef USE_CORE_MODEXP
-    wire                 enable_modexp = sys_ena && (core_select == CORE_MODEXP);
-    wire [31: 0]         read_data_modexp;
- 
-    modexp modexp_inst
+    `ifdef USE_CORE_MODEXPS6
+    wire [31: 0]         read_data_modexps6;
+    wire                 enable_modexps6 = sys_ena && (addr_core_num == CORE_ADDR_MODEXPS6);
+    modexps6_wrapper modexps6_inst
       (
        .clk(sys_clk),
 -      .rst(sys_rst),
 +      .reset_n(sys_rst_n),
  
-       .cs(enable_modexp & (sys_eim_rd | sys_eim_wr)),
+       .cs(enable_modexps6 & (sys_eim_rd | sys_eim_wr)),
        .we(sys_eim_wr),
  
-       .address(core_addr),
+       .address(addr_core_reg),
        .write_data(sys_write_data),
-       .read_data(read_data_modexp)
+       .read_data(read_data_modexps6)
        );
     `endif
- 
- 
+    
+    
     //----------------------------------------------------------------
     // Output (Read Data) Multiplexor
     //----------------------------------------------------------------