Moved some stuff to kernel/yosys.{h,cc}, using Yosys:: namespace

4 files changed, 4 insertions, 4 deletions

diff --git a/passes/memory/memory_collect.cc b/passes/memory/memory_collect.cc
index 40c68abc1..aecb7bd6c 100644
--- a/passes/memory/memory_collect.cc
+++ b/passes/memory/memory_collect.cc
@@ -126,7 +126,7 @@ static void handle_memory(RTLIL::Module *module, RTLIL::Memory *memory)
 	}
 
 	std::stringstream sstr;
-	sstr << "$mem$" << memory->name << "$" << (RTLIL::autoidx++);
+	sstr << "$mem$" << memory->name << "$" << (autoidx++);
 
 	RTLIL::Cell *mem = module->addCell(sstr.str(), "$mem");
 	mem->parameters["\\MEMID"] = RTLIL::Const(memory->name);
diff --git a/passes/memory/memory_dff.cc b/passes/memory/memory_dff.cc
index 325056170..6cbce781f 100644
--- a/passes/memory/memory_dff.cc
+++ b/passes/memory/memory_dff.cc
@@ -113,7 +113,7 @@ static void disconnect_dff(RTLIL::Module *module, RTLIL::SigSpec sig)
 	sig.sort_and_unify();
 
 	std::stringstream sstr;
-	sstr << "$memory_dff_disconnected$" << (RTLIL::autoidx++);
+	sstr << "$memory_dff_disconnected$" << (autoidx++);
 
 	RTLIL::SigSpec new_sig = module->addWire(sstr.str(), sig.size());
 
diff --git a/passes/memory/memory_map.cc b/passes/memory/memory_map.cc
index 49291656c..0000bd507 100644
--- a/passes/memory/memory_map.cc
+++ b/passes/memory/memory_map.cc
@@ -41,7 +41,7 @@ static std::string genid(std::string name, std::string token1 = "", int i = -1,
 	if (k >= 0)
 		sstr << "[" << k << "]";
 
-	sstr << token4 << "$" << (RTLIL::autoidx++);
+	sstr << token4 << "$" << (autoidx++);
 	return sstr.str();
 }
 
diff --git a/passes/memory/memory_unpack.cc b/passes/memory/memory_unpack.cc
index cdf7db04b..3f675edea 100644
--- a/passes/memory/memory_unpack.cc
+++ b/passes/memory/memory_unpack.cc
@@ -31,7 +31,7 @@ static void handle_memory(RTLIL::Module *module, RTLIL::Cell *memory)
 	RTLIL::IdString mem_name = RTLIL::escape_id(memory->parameters.at("\\MEMID").decode_string());
 
 	while (module->memories.count(mem_name) != 0)
-		mem_name += stringf("_%d", RTLIL::autoidx++);
+		mem_name += stringf("_%d", autoidx++);
 
 	RTLIL::Memory *mem = new RTLIL::Memory;
 	mem->name = mem_name;