From 6f41e5277d1d41db7a620c73cf1b65558b55f236 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Tue, 30 Aug 2016 19:09:56 +0200
Subject: Removed $aconst cell type

---
 frontends/ast/genrtlil.cc          |  6 +++---
 frontends/ast/simplify.cc          |  4 ++--
 frontends/verilog/verilog_parser.y |  2 +-
 kernel/celltypes.h                 |  1 -
 kernel/rtlil.cc                    |  2 +-
 manual/CHAPTER_CellLib.tex         |  2 +-
 techlibs/common/simlib.v           | 12 ------------
 7 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc
index 516a9efc3..569d2b6ab 100644
--- a/frontends/ast/genrtlil.cc
+++ b/frontends/ast/genrtlil.cc
@@ -754,7 +754,7 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 		break;
 
 	case AST_FCALL:
-		if (str == "\\$anyconst" || str == "\\$aconst") {
+		if (str == "\\$anyconst") {
 			if (GetSize(children) == 1) {
 				while (children[0]->simplify(true, false, false, 1, -1, false, true) == true) { }
 				if (children[0]->type != AST_CONSTANT)
@@ -1447,9 +1447,9 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 		} break;
 
 	case AST_FCALL: {
-			if (str == "\\$anyconst" || str == "\\$aconst")
+			if (str == "\\$anyconst")
 			{
-				string myid = stringf("%s$%d", RTLIL::unescape_id(str).c_str(), autoidx++);
+				string myid = stringf("%s$%d", str.c_str() + 1, autoidx++);
 				int width = width_hint;
 
 				if (GetSize(children) > 1)
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 0c46b6238..aa2afa4ce 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -1672,8 +1672,8 @@ skip_dynamic_range_lvalue_expansion:;
 				goto apply_newNode;
 			}
 
-			// $anyconst and $aconst are mapped in AstNode::genRTLIL()
-			if (str == "\\$anyconst" || str == "\\$aconst")
+			// $anyconst is mapped in AstNode::genRTLIL()
+			if (str == "\\$anyconst")
 				return false;
 
 			if (str == "\\$clog2")
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index 28b7cd5de..c730ce5b2 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -1229,7 +1229,7 @@ rvalue:
 		$$ = new AstNode(AST_IDENTIFIER, $2);
 		$$->str = *$1;
 		delete $1;
-		if ($2 == nullptr && formal_mode && ($$->str == "\\$initstate" || $$->str == "\\$anyconst" || $$->str == "\\$aconst"))
+		if ($2 == nullptr && formal_mode && ($$->str == "\\$initstate" || $$->str == "\\$anyconst"))
 			$$->type = AST_FCALL;
 	} |
 	hierarchical_id non_opt_multirange {
diff --git a/kernel/celltypes.h b/kernel/celltypes.h
index ebc7b3824..900c12d01 100644
--- a/kernel/celltypes.h
+++ b/kernel/celltypes.h
@@ -118,7 +118,6 @@ struct CellTypes
 		setup_type("$assume", {A, EN}, pool<RTLIL::IdString>(), true);
 		setup_type("$initstate", pool<RTLIL::IdString>(), {Y}, true);
 		setup_type("$anyconst", pool<RTLIL::IdString>(), {Y}, true);
-		setup_type("$aconst", pool<RTLIL::IdString>(), {Y}, true);
 		setup_type("$equiv", {A, B}, {Y}, true);
 	}
 
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index de492bcc6..41b4b93f0 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -1030,7 +1030,7 @@ namespace {
 				return;
 			}
 
-			if (cell->type.in("$aconst", "$anyconst")) {
+			if (cell->type == "$anyconst") {
 				port("\\Y", param("\\WIDTH"));
 				check_expected();
 				return;
diff --git a/manual/CHAPTER_CellLib.tex b/manual/CHAPTER_CellLib.tex
index a839e0c43..bd73ae23c 100644
--- a/manual/CHAPTER_CellLib.tex
+++ b/manual/CHAPTER_CellLib.tex
@@ -421,7 +421,7 @@ pass. The combinatorial logic cells can be mapped to physical cells from a Liber
 using the {\tt abc} pass.
 
 \begin{fixme}
-Add information about {\tt \$assert}, {\tt \$assume}, {\tt \$equiv}, {\tt \$initstate}, {\tt \$aconst}, and {\tt \$anyconst} cells.
+Add information about {\tt \$assert}, {\tt \$assume}, {\tt \$equiv}, {\tt \$initstate}, and {\tt \$anyconst} cells.
 \end{fixme}
 
 \begin{fixme}
diff --git a/techlibs/common/simlib.v b/techlibs/common/simlib.v
index d0a6cd495..922a47cab 100644
--- a/techlibs/common/simlib.v
+++ b/techlibs/common/simlib.v
@@ -1322,18 +1322,6 @@ endmodule
 
 // --------------------------------------------------------
 
-module \$aconst (Y);
-
-parameter WIDTH = 0;
-
-output [WIDTH-1:0] Y;
-
-assign Y = 'bx;
-
-endmodule
-
-// --------------------------------------------------------
-
 module \$anyconst (Y);
 
 parameter WIDTH = 0;
-- 
cgit v1.2.3