Merge branch 'YosysHQ:main' into main

Silimate · Oct 28, 2024 · d63c793 · d63c793
2 parents cff6506 + c07c216
commit d63c793
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 874 deletions.
diff --git a/backends/aiger2/aiger.cc b/backends/aiger2/aiger.cc
@@ -387,7 +387,7 @@ struct Index {
 					if (/* 4 input types */ cell->type.in(ID($_AOI4_), ID($_OAI4_)))
 						d = visit(cursor, cell->getPort(ID::D)[obit]);
 					else
-						d = cell->type == ID($_AOI3_) ? 1 : 0;
+						d = cell->type == ID($_AOI3_) ? CTRUE : CFALSE;
 
 					if (/* aoi */ cell->type.in(ID($_AOI3_), ID($_AOI4_)))
 						return NOT(OR(AND(a, b), AND(c, d)));

diff --git a/kernel/constids.inc b/kernel/constids.inc
@@ -154,7 +154,6 @@ X(PORTID)
 X(PRIORITY)
 X(PRIORITY_MASK)
 X(Q)
-X(qwp_position)
 X(R)
 X(ram_block)
 X(ram_style)

diff --git a/passes/cmds/Makefile.inc b/passes/cmds/Makefile.inc
@@ -32,7 +32,6 @@ OBJS += passes/cmds/cover.o
 OBJS += passes/cmds/trace.o
 OBJS += passes/cmds/plugin.o
 OBJS += passes/cmds/check.o
-OBJS += passes/cmds/qwp.o
 OBJS += passes/cmds/edgetypes.o
 OBJS += passes/cmds/portlist.o
 OBJS += passes/cmds/chformal.o