From: Clifford Wolf <clifford@clifford.at>
Date: Sun, 24 Mar 2013 09:43:05 +0000 (+0100)
Subject: Fixed stdcells.v for $adff with undef reset value
X-Git-Tag: yosys-0.2.0~696
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6960df7285fc7f2c703f349bea841800737f8dca;p=yosys.git

Fixed stdcells.v for $adff with undef reset value
---

diff --git a/techlibs/stdcells.v b/techlibs/stdcells.v
index 9733c370c..e4a034c6e 100644
--- a/techlibs/stdcells.v
+++ b/techlibs/stdcells.v
@@ -1305,69 +1305,74 @@ output [WIDTH-1:0] Q;
 genvar i;
 generate
 	for (i = 0; i < WIDTH; i = i + 1) begin:V
-		if (CLK_POLARITY == 0 && ARST_POLARITY == 0 && ARST_VALUE[i] == 0) begin:NN0
-			 \$_DFF_NN0_ ff (
-				.D(D[i]),
-				.Q(Q[i]),
-				.C(CLK),
-				.R(ARST)
-			);
-		end
-		if (CLK_POLARITY == 0 && ARST_POLARITY == 0 && ARST_VALUE[i] != 0) begin:NN1
-			 \$_DFF_NN1_ ff (
-				.D(D[i]),
-				.Q(Q[i]),
-				.C(CLK),
-				.R(ARST)
-			);
-		end
-		if (CLK_POLARITY == 0 && ARST_POLARITY != 0 && ARST_VALUE[i] == 0) begin:NP0
-			 \$_DFF_NP0_ ff (
-				.D(D[i]),
-				.Q(Q[i]),
-				.C(CLK),
-				.R(ARST)
-			);
-		end
-		if (CLK_POLARITY == 0 && ARST_POLARITY != 0 && ARST_VALUE[i] != 0) begin:NP1
-			 \$_DFF_NP1_ ff (
-				.D(D[i]),
-				.Q(Q[i]),
-				.C(CLK),
-				.R(ARST)
-			);
-		end
-		if (CLK_POLARITY != 0 && ARST_POLARITY == 0 && ARST_VALUE[i] == 0) begin:PN0
-			 \$_DFF_PN0_ ff (
-				.D(D[i]),
-				.Q(Q[i]),
-				.C(CLK),
-				.R(ARST)
-			);
-		end
-		if (CLK_POLARITY != 0 && ARST_POLARITY == 0 && ARST_VALUE[i] != 0) begin:PN1
-			 \$_DFF_PN1_ ff (
-				.D(D[i]),
-				.Q(Q[i]),
-				.C(CLK),
-				.R(ARST)
-			);
-		end
-		if (CLK_POLARITY != 0 && ARST_POLARITY != 0 && ARST_VALUE[i] == 0) begin:PP0
-			 \$_DFF_PP0_ ff (
-				.D(D[i]),
-				.Q(Q[i]),
-				.C(CLK),
-				.R(ARST)
-			);
-		end
-		if (CLK_POLARITY != 0 && ARST_POLARITY != 0 && ARST_VALUE[i] != 0) begin:PP1
-			 \$_DFF_PP1_ ff (
-				.D(D[i]),
-				.Q(Q[i]),
-				.C(CLK),
-				.R(ARST)
-			);
+		if (CLK_POLARITY == 0) begin:N
+			if (ARST_POLARITY == 0) begin:NN
+				if (ARST_VALUE[i] == 0) begin:NN0
+					 \$_DFF_NN0_ ff (
+						.D(D[i]),
+						.Q(Q[i]),
+						.C(CLK),
+						.R(ARST)
+					);
+				end else begin:NN1
+					 \$_DFF_NN1_ ff (
+						.D(D[i]),
+						.Q(Q[i]),
+						.C(CLK),
+						.R(ARST)
+					);
+				end
+			end else begin:NP
+				if (ARST_VALUE[i] == 0) begin:NP0
+					 \$_DFF_NP0_ ff (
+						.D(D[i]),
+						.Q(Q[i]),
+						.C(CLK),
+						.R(ARST)
+					);
+				end else begin:NP1
+					 \$_DFF_NP1_ ff (
+						.D(D[i]),
+						.Q(Q[i]),
+						.C(CLK),
+						.R(ARST)
+					);
+				end
+			end
+		end else begin:P
+			if (ARST_POLARITY == 0) begin:PN
+				if (ARST_VALUE[i] == 0) begin:PN0
+					 \$_DFF_PN0_ ff (
+						.D(D[i]),
+						.Q(Q[i]),
+						.C(CLK),
+						.R(ARST)
+					);
+				end else begin:PN1
+					 \$_DFF_PN1_ ff (
+						.D(D[i]),
+						.Q(Q[i]),
+						.C(CLK),
+						.R(ARST)
+					);
+				end
+			end else begin:PP
+				if (ARST_VALUE[i] == 0) begin:PP0
+					 \$_DFF_PP0_ ff (
+						.D(D[i]),
+						.Q(Q[i]),
+						.C(CLK),
+						.R(ARST)
+					);
+				end else begin:PP1
+					 \$_DFF_PP1_ ff (
+						.D(D[i]),
+						.Q(Q[i]),
+						.C(CLK),
+						.R(ARST)
+					);
+				end
+			end
 		end
 	end
 endgenerate