aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel V. Shatov (Meister) <meisterpaul1@yandex.ru>2020-02-03 22:42:41 +0300
committerPavel V. Shatov (Meister) <meisterpaul1@yandex.ru>2020-02-03 22:42:41 +0300
commit58ad4d95d6de1f62bb3664e3782d8f6ae9c691f0 (patch)
tree1637ec255c5b3bb93f4acbb4305bb9a167c24130
parent2500312ba55ed31c1a4c49c5797d13220d2925cc (diff)
Adapted to the changes in the DSP slice wrappers.
-rw-r--r--rtl/modexpng_general_worker.v16
-rw-r--r--rtl/modexpng_reductor.v18
2 files changed, 9 insertions, 25 deletions
diff --git a/rtl/modexpng_general_worker.v b/rtl/modexpng_general_worker.v
index 9a8824c..13b7aac 100644
--- a/rtl/modexpng_general_worker.v
+++ b/rtl/modexpng_general_worker.v
@@ -1070,9 +1070,7 @@ module modexpng_general_worker
`MODEXPNG_DSP_SLICE_ADDSUB dsp_inst_x_x
(
.clk (clk),
- .ce_ab1 (1'b0),
- .ce_ab2 (dsp_ce_x),
- .ce_c (dsp_ce_x),
+ .ce_abc (dsp_ce_x),
.ce_p (dsp_ce_x_dly),
.ce_ctrl (dsp_ce_x),
.ab (dsp_x_x_x),
@@ -1089,9 +1087,7 @@ module modexpng_general_worker
`MODEXPNG_DSP_SLICE_ADDSUB dsp_inst_y_x
(
.clk (clk),
- .ce_ab1 (1'b0),
- .ce_ab2 (dsp_ce_x),
- .ce_c (dsp_ce_x),
+ .ce_abc (dsp_ce_x),
.ce_p (dsp_ce_x_dly),
.ce_ctrl (dsp_ce_x),
.ab (dsp_y_x_x),
@@ -1108,9 +1104,7 @@ module modexpng_general_worker
`MODEXPNG_DSP_SLICE_ADDSUB dsp_inst_x_y
(
.clk (clk),
- .ce_ab1 (1'b0),
- .ce_ab2 (dsp_ce_y),
- .ce_c (dsp_ce_y),
+ .ce_abc (dsp_ce_y),
.ce_p (dsp_ce_y_dly),
.ce_ctrl (dsp_ce_y),
.ab (dsp_x_y_x),
@@ -1127,9 +1121,7 @@ module modexpng_general_worker
`MODEXPNG_DSP_SLICE_ADDSUB dsp_inst_y_y
(
.clk (clk),
- .ce_ab1 (1'b0),
- .ce_ab2 (dsp_ce_y),
- .ce_c (dsp_ce_y),
+ .ce_abc (dsp_ce_y),
.ce_p (dsp_ce_y_dly),
.ce_ctrl (dsp_ce_y),
.ab (dsp_y_y_x),
diff --git a/rtl/modexpng_reductor.v b/rtl/modexpng_reductor.v
index 0b4f62e..17fec1b 100644
--- a/rtl/modexpng_reductor.v
+++ b/rtl/modexpng_reductor.v
@@ -300,9 +300,7 @@ module modexpng_reductor
`MODEXPNG_DSP_SLICE_ADDSUB dsp_lsb_x
(
.clk (clk),
- .ce_ab1 (1'b0),
- .ce_ab2 (lsb_ce),
- .ce_c (lsb_ce),
+ .ce_abc (lsb_ce),
.ce_p (lsb_ce_dly),
.ce_ctrl (lsb_ce),
.ab (lsb_ax),
@@ -319,9 +317,7 @@ module modexpng_reductor
`MODEXPNG_DSP_SLICE_ADDSUB dsp_lsb_y
(
.clk (clk),
- .ce_ab1 (1'b0),
- .ce_ab2 (lsb_ce),
- .ce_c (lsb_ce),
+ .ce_abc (lsb_ce),
.ce_p (lsb_ce_dly),
.ce_ctrl (lsb_ce),
.ab (lsb_ay),
@@ -332,7 +328,7 @@ module modexpng_reductor
.carry_in_sel (DSP48E1_CARRYINSEL_CARRYIN),
.casc_p_in (),
.casc_p_out (lsb2msb_py_casc),
- .carry_out ()
+ .carry_out ()
);
always @(posedge clk or negedge rst_n)
@@ -387,9 +383,7 @@ module modexpng_reductor
`MODEXPNG_DSP_SLICE_ADDSUB dsp_msb_x
(
.clk (clk),
- .ce_ab1 (1'b0),
- .ce_ab2 (msb_ce),
- .ce_c (msb_ce),
+ .ce_abc (msb_ce),
.ce_p (msb_ce_dly1),
.ce_ctrl (msb_ce),
.ab (msb_ax),
@@ -406,9 +400,7 @@ module modexpng_reductor
`MODEXPNG_DSP_SLICE_ADDSUB dsp_msb_y
(
.clk (clk),
- .ce_ab1 (1'b0),
- .ce_ab2 (msb_ce),
- .ce_c (msb_ce),
+ .ce_abc (msb_ce),
.ce_p (msb_ce_dly1),
.ce_ctrl (msb_ce),
.ab (msb_ay),