From 8ebba8a35f0a5dbf3a044ab84575edfc46c99d77 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Wed, 12 Oct 2016 01:18:39 +0200
Subject: Added $ff and $_FF_ cell types

---
 backends/blif/blif.cc |  6 ++++++
 backends/smt2/smt2.cc | 10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'backends')

diff --git a/backends/blif/blif.cc b/backends/blif/blif.cc
index 6a379e67f..0dc17c92a 100644
--- a/backends/blif/blif.cc
+++ b/backends/blif/blif.cc
@@ -315,6 +315,12 @@ struct BlifDumper
 				continue;
 			}
 
+			if (!config->icells_mode && cell->type == "$_FF_") {
+				f << stringf(".latch %s %s%s\n", cstr(cell->getPort("\\D")), cstr(cell->getPort("\\Q")),
+						cstr_init(cell->getPort("\\Q")));
+				continue;
+			}
+
 			if (!config->icells_mode && cell->type == "$_DFF_N_") {
 				f << stringf(".latch %s %s fe %s%s\n", cstr(cell->getPort("\\D")), cstr(cell->getPort("\\Q")),
 						cstr(cell->getPort("\\C")), cstr_init(cell->getPort("\\Q")));
diff --git a/backends/smt2/smt2.cc b/backends/smt2/smt2.cc
index 9a25f3a23..487f5befb 100644
--- a/backends/smt2/smt2.cc
+++ b/backends/smt2/smt2.cc
@@ -379,7 +379,7 @@ struct Smt2Worker
 			return;
 		}
 
-		if (cell->type == "$_DFF_P_" || cell->type == "$_DFF_N_")
+		if (cell->type.in("$_FF_", "$_DFF_P_", "$_DFF_N_"))
 		{
 			registers.insert(cell);
 			decls.push_back(stringf("(declare-fun |%s#%d| (|%s_s|) Bool) ; %s\n",
@@ -407,7 +407,7 @@ struct Smt2Worker
 
 		if (bvmode)
 		{
-			if (cell->type == "$dff")
+			if (cell->type.in("$ff", "$dff"))
 			{
 				registers.insert(cell);
 				decls.push_back(stringf("(declare-fun |%s#%d| (|%s_s|) (_ BitVec %d)) ; %s\n",
@@ -596,7 +596,7 @@ struct Smt2Worker
 
 		pool<SigBit> reg_bits;
 		for (auto cell : module->cells())
-			if (cell->type.in("$_DFF_P_", "$_DFF_N_", "$dff")) {
+			if (cell->type.in("$ff", "$dff", "$_FF_", "$_DFF_P_", "$_DFF_N_")) {
 				// not using sigmap -- we want the net directly at the dff output
 				for (auto bit : cell->getPort("\\Q"))
 					reg_bits.insert(bit);
@@ -674,14 +674,14 @@ struct Smt2Worker
 
 			for (auto cell : this_regs)
 			{
-				if (cell->type == "$_DFF_P_" || cell->type == "$_DFF_N_")
+				if (cell->type.in("$_FF_", "$_DFF_P_", "$_DFF_N_"))
 				{
 					std::string expr_d = get_bool(cell->getPort("\\D"));
 					std::string expr_q = get_bool(cell->getPort("\\Q"), "next_state");
 					trans.push_back(stringf("  (= %s %s) ; %s %s\n", expr_d.c_str(), expr_q.c_str(), get_id(cell), log_signal(cell->getPort("\\Q"))));
 				}
 
-				if (cell->type == "$dff")
+				if (cell->type.in("$ff", "$dff"))
 				{
 					std::string expr_d = get_bv(cell->getPort("\\D"));
 					std::string expr_q = get_bv(cell->getPort("\\Q"), "next_state");
-- 
cgit v1.2.3