aboutsummaryrefslogtreecommitdiffstats
path: root/techlibs/ice40/cells_map.v
diff options
context:
space:
mode:
authorEddie Hung <eddie@fpgeh.com>2019-08-19 10:07:27 -0700
committerEddie Hung <eddie@fpgeh.com>2019-08-19 10:07:27 -0700
commit2f4e0a5388c58726ec8b3d073e3ebc51897fd13c (patch)
treebb5f6bb14eb4bd83a7e302b7e4666c716234beee /techlibs/ice40/cells_map.v
parente301440a0bae76dcff159c77274c91aad40021c0 (diff)
parent98a54353b7d893752d856b3726853d4921c6aa1f (diff)
downloadyosys-2f4e0a5388c58726ec8b3d073e3ebc51897fd13c.tar.gz
yosys-2f4e0a5388c58726ec8b3d073e3ebc51897fd13c.tar.bz2
yosys-2f4e0a5388c58726ec8b3d073e3ebc51897fd13c.zip
Merge remote-tracking branch 'origin/master' into xaig_dff
Diffstat (limited to 'techlibs/ice40/cells_map.v')
-rw-r--r--techlibs/ice40/cells_map.v23
1 files changed, 9 insertions, 14 deletions
diff --git a/techlibs/ice40/cells_map.v b/techlibs/ice40/cells_map.v
index b4b831165..662423f0a 100644
--- a/techlibs/ice40/cells_map.v
+++ b/techlibs/ice40/cells_map.v
@@ -62,26 +62,21 @@ module \$lut (A, Y);
endmodule
`endif
-`ifdef _ABC
-module \$__ICE40_FULL_ADDER (output CO, O, input A, B, CI);
+`ifndef NO_ADDER
+module \$__ICE40_CARRY_WRAPPER (output CO, O, input A, B, CI, I0, I3);
+ parameter LUT = 0;
SB_CARRY carry (
.I0(A),
.I1(B),
.CI(CI),
.CO(CO)
);
- SB_LUT4 #(
- // I0: 1010 1010 1010 1010
- // I1: 1100 1100 1100 1100
- // I2: 1111 0000 1111 0000
- // I3: 1111 1111 0000 0000
- .LUT_INIT(16'b 0110_1001_1001_0110)
- ) adder (
- .I0(1'b0),
- .I1(A),
- .I2(B),
- .I3(CI),
- .O(O)
+ \$lut #(
+ .WIDTH(4),
+ .LUT(LUT)
+ ) lut (
+ .A({I0,A,B,I3}),
+ .Y(O)
);
endmodule
`endif