From ecb8b20f6231bf27b7500728a07b710ae812d48a Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 26 Nov 2025 00:50:41 +0100
Subject: [PATCH] yosys: use newcelltypes for yosys_celltypes users

---
 frontends/aiger/aigerparse.cc | 2 +-
 kernel/rtlil.cc               | 2 +-
 passes/cmds/check.cc          | 2 +-
 passes/cmds/select.cc         | 6 +++---
 passes/cmds/torder.cc         | 2 +-
 passes/equiv/equiv.h          | 1 +
 passes/sat/sim.cc             | 1 +
 passes/techmap/abc9_ops.cc    | 2 +-
 8 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/frontends/aiger/aigerparse.cc b/frontends/aiger/aigerparse.cc
index e55349aa7..9931ef78f 100644
--- a/frontends/aiger/aigerparse.cc
+++ b/frontends/aiger/aigerparse.cc
@@ -37,7 +37,7 @@
 
 #include "kernel/yosys.h"
 #include "kernel/sigtools.h"
-#include "kernel/celltypes.h"
+#include "kernel/newcelltypes.h"
 #include "aigerparse.h"
 
 YOSYS_NAMESPACE_BEGIN
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index c59c0b1f7..61dac3313 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -19,7 +19,7 @@
 
 #include "kernel/yosys.h"
 #include "kernel/macc.h"
-#include "kernel/celltypes.h"
+#include "kernel/newcelltypes.h"
 #include "kernel/binding.h"
 #include "kernel/sigtools.h"
 #include "frontends/verilog/verilog_frontend.h"
diff --git a/passes/cmds/check.cc b/passes/cmds/check.cc
index b7a5feb57..1019c2955 100644
--- a/passes/cmds/check.cc
+++ b/passes/cmds/check.cc
@@ -20,7 +20,7 @@
 #include "kernel/yosys.h"
 #include "kernel/sigtools.h"
 #include "kernel/celledges.h"
-#include "kernel/celltypes.h"
+#include "kernel/newcelltypes.h"
 #include "kernel/utils.h"
 #include "kernel/log_help.h"
 
diff --git a/passes/cmds/select.cc b/passes/cmds/select.cc
index 0df47664f..2359efe03 100644
--- a/passes/cmds/select.cc
+++ b/passes/cmds/select.cc
@@ -18,7 +18,7 @@
  */
 
 #include "kernel/yosys.h"
-#include "kernel/celltypes.h"
+#include "kernel/newcelltypes.h"
 #include "kernel/sigtools.h"
 #include "kernel/log_help.h"
 
@@ -488,7 +488,7 @@ static int parse_comma_list(std::set<RTLIL::IdString> &tokens, const std::string
 	}
 }
 
-static int select_op_expand(RTLIL::Design *design, RTLIL::Selection &lhs, std::vector<expand_rule_t> &rules, std::set<RTLIL::IdString> &limits, int max_objects, char mode, CellTypes &ct, bool eval_only)
+static int select_op_expand(RTLIL::Design *design, RTLIL::Selection &lhs, std::vector<expand_rule_t> &rules, std::set<RTLIL::IdString> &limits, int max_objects, char mode, NewCellTypes &ct, bool eval_only)
 {
 	int sel_objects = 0;
 	bool is_input, is_output;
@@ -564,7 +564,7 @@ static void select_op_expand(RTLIL::Design *design, const std::string &arg, char
 	std::vector<expand_rule_t> rules;
 	std::set<RTLIL::IdString> limits;
 
-	CellTypes ct;
+	NewCellTypes ct;
 
 	if (mode != 'x')
 		ct.setup(design);
diff --git a/passes/cmds/torder.cc b/passes/cmds/torder.cc
index 537b6793d..52c00072f 100644
--- a/passes/cmds/torder.cc
+++ b/passes/cmds/torder.cc
@@ -18,7 +18,7 @@
  */
 
 #include "kernel/yosys.h"
-#include "kernel/celltypes.h"
+#include "kernel/newcelltypes.h"
 #include "kernel/sigtools.h"
 #include "kernel/utils.h"
 #include "kernel/log_help.h"
diff --git a/passes/equiv/equiv.h b/passes/equiv/equiv.h
index 95d4b25e9..055dc440b 100644
--- a/passes/equiv/equiv.h
+++ b/passes/equiv/equiv.h
@@ -5,6 +5,7 @@
 #include "kernel/yosys_common.h"
 #include "kernel/sigtools.h"
 #include "kernel/satgen.h"
+#include "kernel/newcelltypes.h"
 
 YOSYS_NAMESPACE_BEGIN
 
diff --git a/passes/sat/sim.cc b/passes/sat/sim.cc
index 27d6d12c1..d78da892f 100644
--- a/passes/sat/sim.cc
+++ b/passes/sat/sim.cc
@@ -20,6 +20,7 @@
 #include "kernel/yosys.h"
 #include "kernel/sigtools.h"
 #include "kernel/celltypes.h"
+#include "kernel/newcelltypes.h"
 #include "kernel/mem.h"
 #include "kernel/fstdata.h"
 #include "kernel/ff.h"
diff --git a/passes/techmap/abc9_ops.cc b/passes/techmap/abc9_ops.cc
index 8d3869ece..75efd230a 100644
--- a/passes/techmap/abc9_ops.cc
+++ b/passes/techmap/abc9_ops.cc
@@ -21,7 +21,7 @@
 #include "kernel/register.h"
 #include "kernel/sigtools.h"
 #include "kernel/utils.h"
-#include "kernel/celltypes.h"
+#include "kernel/newcelltypes.h"
 #include "kernel/timinginfo.h"
 
 USING_YOSYS_NAMESPACE