diff options
author | Eddie Hung <eddie@fpgeh.com> | 2019-08-20 12:00:12 -0700 |
---|---|---|
committer | Eddie Hung <eddie@fpgeh.com> | 2019-08-20 12:00:12 -0700 |
commit | c4d4c6db3f4bff22b2fa3a152c5c33d648af81f8 (patch) | |
tree | b465265f1bc72f0b943fc6e4be7f4661e4e5734d /techlibs | |
parent | 1f03154a0cc08c1bde59036d6b0a4a40a3898c3d (diff) | |
parent | 14c03861b6d178c85d6963e673ed51bc142457e1 (diff) | |
download | yosys-c4d4c6db3f4bff22b2fa3a152c5c33d648af81f8.tar.gz yosys-c4d4c6db3f4bff22b2fa3a152c5c33d648af81f8.tar.bz2 yosys-c4d4c6db3f4bff22b2fa3a152c5c33d648af81f8.zip |
Merge remote-tracking branch 'origin/master' into xaig_dff
Diffstat (limited to 'techlibs')
-rw-r--r-- | techlibs/ecp5/cells_sim.v | 4 | ||||
-rw-r--r-- | techlibs/ice40/cells_sim.v | 4 | ||||
-rw-r--r-- | techlibs/xilinx/cells_sim.v | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/techlibs/ecp5/cells_sim.v b/techlibs/ecp5/cells_sim.v index 864a3550f..2fcb0369e 100644 --- a/techlibs/ecp5/cells_sim.v +++ b/techlibs/ecp5/cells_sim.v @@ -17,10 +17,10 @@ endmodule // --------------------------------------- (* abc_box_id=1, lib_whitebox *) module CCU2C( - (* abc_carry_in *) input CIN, + (* abc_carry *) input CIN, input A0, B0, C0, D0, A1, B1, C1, D1, output S0, S1, - (* abc_carry_out *) output COUT + (* abc_carry *) output COUT ); parameter [15:0] INIT0 = 16'h0000; parameter [15:0] INIT1 = 16'h0000; diff --git a/techlibs/ice40/cells_sim.v b/techlibs/ice40/cells_sim.v index 5b18fec27..ab04808f4 100644 --- a/techlibs/ice40/cells_sim.v +++ b/techlibs/ice40/cells_sim.v @@ -143,11 +143,11 @@ endmodule (* abc_box_id = 1, lib_whitebox *) module \$__ICE40_FULL_ADDER ( - (* abc_carry_out *) output CO, + (* abc_carry *) output CO, output O, input A, input B, - (* abc_carry_in *) input CI + (* abc_carry *) input CI ); SB_CARRY carry ( .I0(A), diff --git a/techlibs/xilinx/cells_sim.v b/techlibs/xilinx/cells_sim.v index e5d9f480b..dd5a76752 100644 --- a/techlibs/xilinx/cells_sim.v +++ b/techlibs/xilinx/cells_sim.v @@ -183,9 +183,9 @@ endmodule (* abc_box_id = 4, lib_whitebox *) module CARRY4( - (* abc_carry_out *) output [3:0] CO, + (* abc_carry *) output [3:0] CO, output [3:0] O, - (* abc_carry_in *) input CI, + (* abc_carry *) input CI, input CYINIT, input [3:0] DI, S ); |