4 files changed, 68 insertions, 4 deletions

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 00c116115..d9003f28c 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -42,11 +42,58 @@ int RTLIL::IdString::last_created_idx_ptr_;
 #endif
 
 #define X(_id) IdString RTLIL::ID::_id;
-#include "constids.inc"
+#include "kernel/constids.inc"
 #undef X
 
 dict<std::string, std::string> RTLIL::constpad;
 
+const pool<IdString> &RTLIL::builtin_ff_cell_types() {
+	static const pool<IdString> res = {
+		ID($sr),
+		ID($ff),
+		ID($dff),
+		ID($dffe),
+		ID($dffsr),
+		ID($adff),
+		ID($dlatch),
+		ID($dlatchsr),
+		ID($_DFFE_NN_),
+		ID($_DFFE_NP_),
+		ID($_DFFE_PN_),
+		ID($_DFFE_PP_),
+		ID($_DFFSR_NNN_),
+		ID($_DFFSR_NNP_),
+		ID($_DFFSR_NPN_),
+		ID($_DFFSR_NPP_),
+		ID($_DFFSR_PNN_),
+		ID($_DFFSR_PNP_),
+		ID($_DFFSR_PPN_),
+		ID($_DFFSR_PPP_),
+		ID($_DFF_NN0_),
+		ID($_DFF_NN1_),
+		ID($_DFF_NP0_),
+		ID($_DFF_NP1_),
+		ID($_DFF_N_),
+		ID($_DFF_PN0_),
+		ID($_DFF_PN1_),
+		ID($_DFF_PP0_),
+		ID($_DFF_PP1_),
+		ID($_DFF_P_),
+		ID($_DLATCHSR_NNN_),
+		ID($_DLATCHSR_NNP_),
+		ID($_DLATCHSR_NPN_),
+		ID($_DLATCHSR_NPP_),
+		ID($_DLATCHSR_PNN_),
+		ID($_DLATCHSR_PNP_),
+		ID($_DLATCHSR_PPN_),
+		ID($_DLATCHSR_PPP_),
+		ID($_DLATCH_N_),
+		ID($_DLATCH_P_),
+		ID($_FF_),
+	};
+	return res;
+}
+
 RTLIL::Const::Const()
 {
 	flags = RTLIL::CONST_FLAG_NONE;
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 7279835ea..17f038e36 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -377,12 +377,14 @@ namespace RTLIL
 
 	namespace ID {
 #define X(_id) extern IdString _id;
-#include "constids.inc"
+#include "kernel/constids.inc"
 #undef X
 	};
 
 	extern dict<std::string, std::string> constpad;
 
+	const pool<IdString> &builtin_ff_cell_types();
+
 	static inline std::string escape_id(const std::string &str) {
 		if (str.size() > 0 && str[0] != '\\' && str[0] != '$')
 			return "\\" + str;
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index 380f7030b..01131601f 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -516,7 +516,7 @@ void yosys_setup()
 	already_setup = true;
 
 #define X(_id) RTLIL::ID::_id = "\\" # _id;
-#include "constids.inc"
+#include "kernel/constids.inc"
 #undef X
 
 	#ifdef WITH_PYTHON
@@ -835,7 +835,7 @@ std::string proc_share_dirname()
 	std::string proc_share_path = proc_self_path + "share/";
 	if (check_file_exists(proc_share_path, true))
 		return proc_share_path;
-	proc_share_path = proc_self_path + "../share/yosys/";
+	proc_share_path = proc_self_path + "../share/" + proc_program_prefix()+ "yosys/";
 	if (check_file_exists(proc_share_path, true))
 		return proc_share_path;
 #    ifdef YOSYS_DATDIR
@@ -848,6 +848,15 @@ std::string proc_share_dirname()
 }
 #endif
 
+std::string proc_program_prefix()
+{
+	std::string program_prefix;
+#ifdef YOSYS_PROGRAM_PREFIX
+	program_prefix = YOSYS_PROGRAM_PREFIX;
+#endif
+	return program_prefix;
+}
+
 bool fgetline(FILE *f, std::string &buffer)
 {
 	buffer = "";
@@ -1034,6 +1043,8 @@ void run_backend(std::string filename, std::string command, RTLIL::Design *desig
 			command = "verilog";
 		else if (filename.size() > 3 && filename.compare(filename.size()-3, std::string::npos, ".il") == 0)
 			command = "ilang";
+		else if (filename.size() > 3 && filename.compare(filename.size()-3, std::string::npos, ".cc") == 0)
+			command = "cxxrtl";
 		else if (filename.size() > 4 && filename.compare(filename.size()-4, std::string::npos, ".aig") == 0)
 			command = "aiger";
 		else if (filename.size() > 5 && filename.compare(filename.size()-5, std::string::npos, ".blif") == 0)
diff --git a/kernel/yosys.h b/kernel/yosys.h
index 16e0aaf1c..5ad47054c 100644
--- a/kernel/yosys.h
+++ b/kernel/yosys.h
@@ -207,6 +207,7 @@ namespace RTLIL {
 	struct SigSpec;
 	struct Wire;
 	struct Cell;
+	struct Memory;
 	struct Module;
 	struct Design;
 	struct Monitor;
@@ -229,6 +230,7 @@ using RTLIL::Design;
 namespace hashlib {
 	template<> struct hash_ops<RTLIL::Wire*> : hash_obj_ops {};
 	template<> struct hash_ops<RTLIL::Cell*> : hash_obj_ops {};
+	template<> struct hash_ops<RTLIL::Memory*> : hash_obj_ops {};
 	template<> struct hash_ops<RTLIL::Module*> : hash_obj_ops {};
 	template<> struct hash_ops<RTLIL::Design*> : hash_obj_ops {};
 	template<> struct hash_ops<RTLIL::Monitor*> : hash_obj_ops {};
@@ -236,6 +238,7 @@ namespace hashlib {
 
 	template<> struct hash_ops<const RTLIL::Wire*> : hash_obj_ops {};
 	template<> struct hash_ops<const RTLIL::Cell*> : hash_obj_ops {};
+	template<> struct hash_ops<const RTLIL::Memory*> : hash_obj_ops {};
 	template<> struct hash_ops<const RTLIL::Module*> : hash_obj_ops {};
 	template<> struct hash_ops<const RTLIL::Design*> : hash_obj_ops {};
 	template<> struct hash_ops<const RTLIL::Monitor*> : hash_obj_ops {};
@@ -321,6 +324,7 @@ namespace ID = RTLIL::ID;
 RTLIL::Design *yosys_get_design();
 std::string proc_self_dirname();
 std::string proc_share_dirname();
+std::string proc_program_prefix();
 const char *create_prompt(RTLIL::Design *design, int recursion_counter);
 std::vector<std::string> glob_filename(const std::string &filename_pattern);
 void rewrite_filename(std::string &filename);