[Cryptech-Commits] [core/math/modexpng] 80/92: Accomodate the changes to DSP slice wrappers.

[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/math/modexpng.

commit 6093e06cf36678a6b6b196e851338b7445212558
Author: Pavel V. Shatov (Meister) <meisterpaul1 at yandex.ru>
AuthorDate: Thu Jan 30 19:48:40 2020 +0300

    Accomodate the changes to DSP slice wrappers.
---
 rtl/modexpng_general_worker.v | 32 ++++++++++++++++++++------------
 rtl/modexpng_reductor.v       | 32 ++++++++++++++++++++------------
 2 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/rtl/modexpng_general_worker.v b/rtl/modexpng_general_worker.v
index b85f189..9a8824c 100644
--- a/rtl/modexpng_general_worker.v
+++ b/rtl/modexpng_general_worker.v
@@ -1070,11 +1070,13 @@ module modexpng_general_worker
     `MODEXPNG_DSP_SLICE_ADDSUB dsp_inst_x_x
     (
         .clk            (clk),
-        .ce_abc         (dsp_ce_x),
+        .ce_ab1         (1'b0),
+        .ce_ab2         (dsp_ce_x),
+        .ce_c           (dsp_ce_x),
         .ce_p           (dsp_ce_x_dly),
         .ce_ctrl        (dsp_ce_x),
-        .x              (dsp_x_x_x),
-        .y              (dsp_x_x_y),
+        .ab             (dsp_x_x_x),
+        .c              (dsp_x_x_y),
         .p              (dsp_x_x_p),
         .op_mode        (dsp_op_mode_x),
         .alu_mode       (dsp_alu_mode_x),
@@ -1087,11 +1089,13 @@ module modexpng_general_worker
     `MODEXPNG_DSP_SLICE_ADDSUB dsp_inst_y_x
     (
         .clk            (clk),
-        .ce_abc         (dsp_ce_x),
+        .ce_ab1         (1'b0),
+        .ce_ab2         (dsp_ce_x),
+        .ce_c           (dsp_ce_x),
         .ce_p           (dsp_ce_x_dly),
         .ce_ctrl        (dsp_ce_x),
-        .x              (dsp_y_x_x),
-        .y              (dsp_y_x_y),
+        .ab             (dsp_y_x_x),
+        .c              (dsp_y_x_y),
         .p              (dsp_y_x_p),
         .op_mode        (dsp_op_mode_x),
         .alu_mode       (dsp_alu_mode_x),
@@ -1104,11 +1108,13 @@ module modexpng_general_worker
     `MODEXPNG_DSP_SLICE_ADDSUB dsp_inst_x_y
     (
         .clk            (clk),
-        .ce_abc         (dsp_ce_y),
+        .ce_ab1         (1'b0),
+        .ce_ab2         (dsp_ce_y),
+        .ce_c           (dsp_ce_y),
         .ce_p           (dsp_ce_y_dly),
         .ce_ctrl        (dsp_ce_y),
-        .x              (dsp_x_y_x),
-        .y              (dsp_x_y_y),
+        .ab             (dsp_x_y_x),
+        .c              (dsp_x_y_y),
         .p              (dsp_x_y_p),
         .op_mode        (dsp_op_mode_y),
         .alu_mode       (dsp_alu_mode_y),        
@@ -1121,11 +1127,13 @@ module modexpng_general_worker
     `MODEXPNG_DSP_SLICE_ADDSUB dsp_inst_y_y
     (
         .clk            (clk),
-        .ce_abc         (dsp_ce_y),
+        .ce_ab1         (1'b0),
+        .ce_ab2         (dsp_ce_y),
+        .ce_c           (dsp_ce_y),
         .ce_p           (dsp_ce_y_dly),
         .ce_ctrl        (dsp_ce_y),
-        .x              (dsp_y_y_x),
-        .y              (dsp_y_y_y),
+        .ab             (dsp_y_y_x),
+        .c              (dsp_y_y_y),
         .p              (dsp_y_y_p),
         .op_mode        (dsp_op_mode_y),
         .alu_mode       (dsp_alu_mode_y),
diff --git a/rtl/modexpng_reductor.v b/rtl/modexpng_reductor.v
index 1e6dcc1..0b4f62e 100644
--- a/rtl/modexpng_reductor.v
+++ b/rtl/modexpng_reductor.v
@@ -300,11 +300,13 @@ module modexpng_reductor
     `MODEXPNG_DSP_SLICE_ADDSUB dsp_lsb_x
     (
         .clk            (clk),
-        .ce_abc         (lsb_ce),
+        .ce_ab1         (1'b0),
+        .ce_ab2         (lsb_ce),
+        .ce_c           (lsb_ce),
         .ce_p           (lsb_ce_dly),
         .ce_ctrl        (lsb_ce),
-        .x              (lsb_ax),
-        .y              (lsb_bx),
+        .ab             (lsb_ax),
+        .c              (lsb_bx),
         .p              (lsb_px),
         .op_mode        (lsb_opmode),
         .alu_mode       (DSP48E1_ALUMODE_Z_PLUS_X_AND_Y_AND_CIN),
@@ -317,11 +319,13 @@ module modexpng_reductor
     `MODEXPNG_DSP_SLICE_ADDSUB dsp_lsb_y
     (
         .clk            (clk),
-        .ce_abc         (lsb_ce),
+        .ce_ab1         (1'b0),
+        .ce_ab2         (lsb_ce),
+        .ce_c           (lsb_ce),
         .ce_p           (lsb_ce_dly),
         .ce_ctrl        (lsb_ce),
-        .x              (lsb_ay),
-        .y              (lsb_by),
+        .ab             (lsb_ay),
+        .c              (lsb_by),
         .p              (lsb_py),
         .op_mode        (lsb_opmode),
         .alu_mode       (DSP48E1_ALUMODE_Z_PLUS_X_AND_Y_AND_CIN),
@@ -383,11 +387,13 @@ module modexpng_reductor
     `MODEXPNG_DSP_SLICE_ADDSUB dsp_msb_x
     (
         .clk            (clk),
-        .ce_abc         (msb_ce),
+        .ce_ab1         (1'b0),
+        .ce_ab2         (msb_ce),
+        .ce_c           (msb_ce),
         .ce_p           (msb_ce_dly1),
         .ce_ctrl        (msb_ce),
-        .x              (msb_ax),
-        .y              (msb_bx),
+        .ab             (msb_ax),
+        .c              (msb_bx),
         .p              (msb_px),
         .op_mode        (msb_opmode),
         .alu_mode       (DSP48E1_ALUMODE_Z_PLUS_X_AND_Y_AND_CIN),
@@ -400,11 +406,13 @@ module modexpng_reductor
     `MODEXPNG_DSP_SLICE_ADDSUB dsp_msb_y
     (
         .clk            (clk),
-        .ce_abc         (msb_ce),
+        .ce_ab1         (1'b0),
+        .ce_ab2         (msb_ce),
+        .ce_c           (msb_ce),
         .ce_p           (msb_ce_dly1),
         .ce_ctrl        (msb_ce),
-        .x              (msb_ay),
-        .y              (msb_by),
+        .ab             (msb_ay),
+        .c              (msb_by),
         .p              (msb_py),
         .op_mode        (msb_opmode),
         .alu_mode       (DSP48E1_ALUMODE_Z_PLUS_X_AND_Y_AND_CIN),