aboutsummaryrefslogtreecommitdiffstats
path: root/techlibs/xilinx/cells_map.v
diff options
context:
space:
mode:
authorEddie Hung <eddie@fpgeh.com>2019-07-08 23:02:57 -0700
committerEddie Hung <eddie@fpgeh.com>2019-07-08 23:02:57 -0700
commit939a225f921efc4276121fe957f545a98d252fa0 (patch)
treed97808e40628963ed827254943ce8f3d3e97a8a6 /techlibs/xilinx/cells_map.v
parentde404535538fe4d2548be82724515961e6e92519 (diff)
downloadyosys-939a225f921efc4276121fe957f545a98d252fa0.tar.gz
yosys-939a225f921efc4276121fe957f545a98d252fa0.tar.bz2
yosys-939a225f921efc4276121fe957f545a98d252fa0.zip
Less thinking
Diffstat (limited to 'techlibs/xilinx/cells_map.v')
-rw-r--r--techlibs/xilinx/cells_map.v6
1 files changed, 3 insertions, 3 deletions
diff --git a/techlibs/xilinx/cells_map.v b/techlibs/xilinx/cells_map.v
index 63095880e..7c67c7a79 100644
--- a/techlibs/xilinx/cells_map.v
+++ b/techlibs/xilinx/cells_map.v
@@ -196,11 +196,11 @@ module \$__XILINX_SHIFTX (A, B, Y);
else if (A_WIDTH == 2) begin
MUXF7 fpga_hard_mux (.I0(A[0]), .I1(A[1]), .S(B[0]), .O(Y));
end
- else if (A_WIDTH <= 2 ** 2) begin
+ else if (A_WIDTH <= 4) begin
wire [4-1:0] Ax = {{(4-A_WIDTH){A[A_WIDTH-1]}}, A};
\$__XILINX_MUXF78 fpga_hard_mux (.I0(Ax[0]), .I1(Ax[1]), .I2(Ax[2]), .I3(Ax[3]), .S0(B[0]), .S1(B[1]), .O(Y));
end
- else if (A_WIDTH <= 2 ** 3) begin
+ else if (A_WIDTH <= 8) begin
// Rather than extend with 1'bx which gets flattened to 1'b0
// causing the "don't care" status to get lost, extend with MSB
// so that we can recognise again later when mapping MUXF78
@@ -211,7 +211,7 @@ module \$__XILINX_SHIFTX (A, B, Y);
wire T3 = B[0] ? Ax[7] : Ax[6];
\$__XILINX_MUXF78 fpga_hard_mux (.I0(T0), .I1(T1), .I2(T2), .I3(T3), .S0(B[1]), .S1(B[2]), .O(Y));
end
- else if (A_WIDTH <= 2 ** 4) begin
+ else if (A_WIDTH <= 16) begin
// Rather than extend with 1'bx which gets flattened to 1'b0
// causing the "don't care" status to get lost, extend with MSB
// so that we can recognise again later when mapping MUXF78