diff options
Diffstat (limited to 'rtl')
| -rw-r--r-- | rtl/curve/curve_dbl_add_384.v | 45 | ||||
| -rw-r--r-- | rtl/curve/curve_mul_384.v | 8 |
2 files changed, 36 insertions, 17 deletions
diff --git a/rtl/curve/curve_dbl_add_384.v b/rtl/curve/curve_dbl_add_384.v index d14bbc7..cc983f3 100644 --- a/rtl/curve/curve_dbl_add_384.v +++ b/rtl/curve/curve_dbl_add_384.v @@ -6,7 +6,7 @@ // // Authors: Pavel Shatov // -// Copyright (c) 2016, NORDUnet A/S +// Copyright (c) 2016, 2018 NORDUnet A/S // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are met: @@ -424,11 +424,30 @@ module curve_dbl_add_384 // // uOP Trigger Logic // - reg uop_trig; + (* EQUIVALENT_REGISTER_REMOVAL="NO" *) reg uop_trig_fsm; + (* EQUIVALENT_REGISTER_REMOVAL="NO" *) reg uop_trig_cmp; + (* EQUIVALENT_REGISTER_REMOVAL="NO" *) reg uop_trig_mov; + (* EQUIVALENT_REGISTER_REMOVAL="NO" *) reg uop_trig_add; + (* EQUIVALENT_REGISTER_REMOVAL="NO" *) reg uop_trig_sub; + (* EQUIVALENT_REGISTER_REMOVAL="NO" *) reg uop_trig_mul; + always @(posedge clk or negedge rst_n) // - if (rst_n == 1'b0) uop_trig <= 1'b0; - else uop_trig <= (fsm_state == FSM_STATE_FETCH) ? 1'b1 : 1'b0; + if (rst_n == 1'b0) begin + uop_trig_fsm <= 1'b0; + uop_trig_cmp <= 1'b0; + uop_trig_mov <= 1'b0; + uop_trig_add <= 1'b0; + uop_trig_sub <= 1'b0; + uop_trig_mul <= 1'b0; + end else begin + uop_trig_fsm <= (fsm_state == FSM_STATE_FETCH) ? 1'b1 : 1'b0; + uop_trig_cmp <= (fsm_state == FSM_STATE_FETCH) ? 1'b1 : 1'b0; + uop_trig_mov <= (fsm_state == FSM_STATE_FETCH) ? 1'b1 : 1'b0; + uop_trig_add <= (fsm_state == FSM_STATE_FETCH) ? 1'b1 : 1'b0; + uop_trig_sub <= (fsm_state == FSM_STATE_FETCH) ? 1'b1 : 1'b0; + uop_trig_mul <= (fsm_state == FSM_STATE_FETCH) ? 1'b1 : 1'b0; + end // @@ -453,7 +472,7 @@ module curve_dbl_add_384 else case (fsm_state) FSM_STATE_STALL: fsm_state <= ena ? FSM_STATE_FETCH : FSM_STATE_STALL; FSM_STATE_FETCH: fsm_state <= FSM_STATE_EXECUTE; - FSM_STATE_EXECUTE: fsm_state <= (!uop_trig && uop_done) ? fsm_state_next : FSM_STATE_EXECUTE; + FSM_STATE_EXECUTE: fsm_state <= (!uop_trig_fsm && uop_done) ? fsm_state_next : FSM_STATE_EXECUTE; default: fsm_state <= FSM_STATE_STALL; endcase @@ -466,7 +485,7 @@ module curve_dbl_add_384 if (fsm_state == FSM_STATE_STALL) uop_addr <= 5'd0; else if (fsm_state == FSM_STATE_EXECUTE) - if (!uop_trig && uop_done) + if (!uop_trig_fsm && uop_done) uop_addr <= (uop_opcode == OPCODE_RDY) ? 5'd0 : uop_addr + 1'b1; @@ -489,11 +508,11 @@ module curve_dbl_add_384 // // Helper Modules Enable Logic // - assign mw_cmp_ena = uop_opcode[0] & uop_trig; - assign mw_mov_ena = uop_opcode[1] & uop_trig; - assign mod_add_ena = uop_opcode[2] & uop_trig; - assign mod_sub_ena = uop_opcode[3] & uop_trig; - assign mod_mul_ena = uop_opcode[4] & uop_trig; + assign mw_cmp_ena = uop_opcode[0] & uop_trig_cmp; + assign mw_mov_ena = uop_opcode[1] & uop_trig_mov; + assign mod_add_ena = uop_opcode[2] & uop_trig_add; + assign mod_sub_ena = uop_opcode[3] & uop_trig_sub; + assign mod_mul_ena = uop_opcode[4] & uop_trig_mul; // @@ -830,7 +849,7 @@ module curve_dbl_add_384 // if ( (fsm_state == FSM_STATE_EXECUTE) && (uop_opcode == OPCODE_CMP) && - (uop_done && !uop_trig) ) begin + (uop_done && !uop_trig_cmp) ) begin if ( (uop_src_a == UOP_SRC_PZ) && (uop_src_b == UOP_SRC_ZERO) ) flag_pz_is_zero <= !mw_cmp_out_l && mw_cmp_out_e && !mw_cmp_out_g; @@ -860,7 +879,7 @@ module curve_dbl_add_384 if (ena) rdy_reg <= 1'b0; /* set flag */ - if ((fsm_state == FSM_STATE_EXECUTE) && !uop_trig && uop_done) + if ((fsm_state == FSM_STATE_EXECUTE) && !uop_trig_fsm && uop_done) if (uop_opcode == OPCODE_RDY) rdy_reg <= 1'b1; end diff --git a/rtl/curve/curve_mul_384.v b/rtl/curve/curve_mul_384.v index 5b8faf1..e9a531a 100644 --- a/rtl/curve/curve_mul_384.v +++ b/rtl/curve/curve_mul_384.v @@ -230,7 +230,7 @@ module curve_mul_384 wire [19: 0] op_rom_conv_data; reg [19: 0] op_rom_mux_data; - (* RAM_STYLE="BLOCK" *) + (* EQUIVALENT_REGISTER_REMOVAL="NO" *) uop_init_rom op_rom_init ( .clk (clk), @@ -238,7 +238,7 @@ module curve_mul_384 .data (op_rom_init_data) ); - (* RAM_STYLE="BLOCK" *) + (* EQUIVALENT_REGISTER_REMOVAL="NO" *) uop_dbl_rom op_rom_dbl ( .clk (clk), @@ -246,7 +246,7 @@ module curve_mul_384 .data (op_rom_dbl_data) ); - (* RAM_STYLE="BLOCK" *) + (* EQUIVALENT_REGISTER_REMOVAL="NO" *) uop_add_rom op_rom_add ( .clk (clk), @@ -254,7 +254,7 @@ module curve_mul_384 .data (op_rom_add_data) ); - (* RAM_STYLE="BLOCK" *) + (* EQUIVALENT_REGISTER_REMOVAL="NO" *) uop_conv_rom op_rom_conv ( .clk (clk), |