From 745d56149d276f52146e302d59f74ede8d1875ba Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Fri, 18 Sep 2015 12:00:37 +0200 Subject: Renamed GreenPAK4 cells, improved GP4 DFF mapping --- techlibs/greenpak4/cells_map.v | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'techlibs/greenpak4/cells_map.v') diff --git a/techlibs/greenpak4/cells_map.v b/techlibs/greenpak4/cells_map.v index 976687434..667d853da 100644 --- a/techlibs/greenpak4/cells_map.v +++ b/techlibs/greenpak4/cells_map.v @@ -1,5 +1,5 @@ module \$_DFF_P_ (input D, C, output Q); - DFF _TECHMAP_REPLACE_ ( + GP_DFF _TECHMAP_REPLACE_ ( .D(D), .Q(Q), .CLK(C), @@ -8,6 +8,16 @@ module \$_DFF_P_ (input D, C, output Q); ); endmodule +module \$_DFFSR_PNN_ (input C, S, R, D, output Q); + GP_DFF _TECHMAP_REPLACE_ ( + .D(D), + .Q(Q), + .CLK(C), + .nRSTZ(R), + .nSETZ(S) + ); +endmodule + module \$lut (A, Y); parameter WIDTH = 0; parameter LUT = 0; @@ -17,19 +27,19 @@ module \$lut (A, Y); generate if (WIDTH == 1) begin - LUT2 #(.INIT(LUT)) _TECHMAP_REPLACE_ (.OUT(Y), + GP_2LUT #(.INIT({2'b00, LUT})) _TECHMAP_REPLACE_ (.OUT(Y), .IN0(A[0]), .IN1(1'b0)); end else if (WIDTH == 2) begin - LUT2 #(.INIT(LUT)) _TECHMAP_REPLACE_ (.OUT(Y), + GP_2LUT #(.INIT(LUT)) _TECHMAP_REPLACE_ (.OUT(Y), .IN0(A[0]), .IN1(A[1])); end else if (WIDTH == 3) begin - LUT3 #(.INIT(LUT)) _TECHMAP_REPLACE_ (.OUT(Y), + GP_3LUT #(.INIT(LUT)) _TECHMAP_REPLACE_ (.OUT(Y), .IN0(A[0]), .IN1(A[1]), .IN2(A[2])); end else if (WIDTH == 4) begin - LUT4 #(.INIT(LUT)) _TECHMAP_REPLACE_ (.OUT(Y), + GP_4LUT #(.INIT(LUT)) _TECHMAP_REPLACE_ (.OUT(Y), .IN0(A[0]), .IN1(A[1]), .IN2(A[2]), .IN3(A[3])); end else begin wire _TECHMAP_FAIL_ = 1; -- cgit v1.2.3