Add CellTypes support for $specify2 and $specify3
[yosys.git] / kernel / satgen.h
index a079b42f0352ac0e4adc5fe7c60d9ecc47cc5aad..210cca3f3c89d82b0aca25dbd8da94c7a6f058be 100644 (file)
@@ -1,12 +1,12 @@
-/*
+/* -*- c++ -*-
  *  yosys -- Yosys Open SYnthesis Suite
  *
  *  Copyright (C) 2012  Clifford Wolf <clifford@clifford.at>
- *  
+ *
  *  Permission to use, copy, modify, and/or distribute this software for any
  *  purpose with or without fee is hereby granted, provided that the above
  *  copyright notice and this permission notice appear in all copies.
- *  
+ *
  *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 #include "kernel/rtlil.h"
 #include "kernel/sigtools.h"
 #include "kernel/celltypes.h"
+#include "kernel/macc.h"
 
 #include "libs/ezsat/ezminisat.h"
-typedef ezMiniSAT ezDefaultSAT;
+
+YOSYS_NAMESPACE_BEGIN
+
+// defined in kernel/register.cc
+extern struct SatSolver *yosys_satsolver_list;
+extern struct SatSolver *yosys_satsolver;
+
+struct SatSolver
+{
+       string name;
+       SatSolver *next;
+       virtual ezSAT *create() = 0;
+
+       SatSolver(string name) : name(name) {
+               next = yosys_satsolver_list;
+               yosys_satsolver_list = this;
+       }
+
+       virtual ~SatSolver() {
+               auto p = &yosys_satsolver_list;
+               while (*p) {
+                       if (*p == this)
+                               *p = next;
+                       else
+                               p = &(*p)->next;
+               }
+               if (yosys_satsolver == this)
+                       yosys_satsolver = yosys_satsolver_list;
+       }
+};
+
+struct ezSatPtr : public std::unique_ptr<ezSAT> {
+       ezSatPtr() : unique_ptr<ezSAT>(yosys_satsolver->create()) { }
+};
 
 struct SatGen
 {
@@ -34,6 +68,9 @@ struct SatGen
        std::string prefix;
        SigPool initial_state;
        std::map<std::string, RTLIL::SigSpec> asserts_a, asserts_en;
+       std::map<std::string, RTLIL::SigSpec> assumes_a, assumes_en;
+       std::map<std::string, std::map<RTLIL::SigBit, int>> imported_signals;
+       std::map<std::pair<std::string, int>, bool> initstates;
        bool ignore_div_by_zero;
        bool model_undef;
 
@@ -48,23 +85,24 @@ struct SatGen
                this->prefix = prefix;
        }
 
-       std::vector<int> importSigSpecWorker(RTLIL::SigSpec &sig, std::string &pf, bool undef_mode, bool dup_undef)
+       std::vector<int> importSigSpecWorker(RTLIL::SigSpec sig, std::string &pf, bool undef_mode, bool dup_undef)
        {
                log_assert(!undef_mode || model_undef);
                sigmap->apply(sig);
 
                std::vector<int> vec;
-               vec.reserve(SIZE(sig));
+               vec.reserve(GetSize(sig));
 
                for (auto &bit : sig)
                        if (bit.wire == NULL) {
                                if (model_undef && dup_undef && bit == RTLIL::State::Sx)
                                        vec.push_back(ez->frozen_literal());
                                else
-                                       vec.push_back(bit == (undef_mode ? RTLIL::State::Sx : RTLIL::State::S1) ? ez->TRUE : ez->FALSE);
+                                       vec.push_back(bit == (undef_mode ? RTLIL::State::Sx : RTLIL::State::S1) ? ez->CONST_TRUE : ez->CONST_FALSE);
                        } else {
-                               std::string name = pf + stringf(bit.wire->width == 1 ?  "%s" : "%s [%d]", RTLIL::id2cstr(bit.wire->name), bit.offset);
+                               std::string name = pf + (bit.wire->width == 1 ? stringf("%s", log_id(bit.wire)) : stringf("%s [%d]", log_id(bit.wire->name), bit.offset));
                                vec.push_back(ez->frozen_literal(name));
+                               imported_signals[pf][bit] = vec.back();
                        }
                return vec;
        }
@@ -90,6 +128,34 @@ struct SatGen
                return importSigSpecWorker(sig, pf, true, false);
        }
 
+       int importSigBit(RTLIL::SigBit bit, int timestep = -1)
+       {
+               log_assert(timestep != 0);
+               std::string pf = prefix + (timestep == -1 ? "" : stringf("@%d:", timestep));
+               return importSigSpecWorker(bit, pf, false, false).front();
+       }
+
+       int importDefSigBit(RTLIL::SigBit bit, int timestep = -1)
+       {
+               log_assert(timestep != 0);
+               std::string pf = prefix + (timestep == -1 ? "" : stringf("@%d:", timestep));
+               return importSigSpecWorker(bit, pf, false, true).front();
+       }
+
+       int importUndefSigBit(RTLIL::SigBit bit, int timestep = -1)
+       {
+               log_assert(timestep != 0);
+               std::string pf = "undef:" + prefix + (timestep == -1 ? "" : stringf("@%d:", timestep));
+               return importSigSpecWorker(bit, pf, true, false).front();
+       }
+
+       bool importedSigBit(RTLIL::SigBit bit, int timestep = -1)
+       {
+               log_assert(timestep != 0);
+               std::string pf = prefix + (timestep == -1 ? "" : stringf("@%d:", timestep));
+               return imported_signals[pf].count(bit) != 0;
+       }
+
        void getAsserts(RTLIL::SigSpec &sig_a, RTLIL::SigSpec &sig_en, int timestep = -1)
        {
                std::string pf = prefix + (timestep == -1 ? "" : stringf("@%d:", timestep));
@@ -97,6 +163,13 @@ struct SatGen
                sig_en = asserts_en[pf];
        }
 
+       void getAssumes(RTLIL::SigSpec &sig_a, RTLIL::SigSpec &sig_en, int timestep = -1)
+       {
+               std::string pf = prefix + (timestep == -1 ? "" : stringf("@%d:", timestep));
+               sig_a = assumes_a[pf];
+               sig_en = assumes_en[pf];
+       }
+
        int importAsserts(int timestep = -1)
        {
                std::vector<int> check_bits, enable_bits;
@@ -111,6 +184,20 @@ struct SatGen
                return ez->vec_reduce_and(ez->vec_or(check_bits, ez->vec_not(enable_bits)));
        }
 
+       int importAssumes(int timestep = -1)
+       {
+               std::vector<int> check_bits, enable_bits;
+               std::string pf = prefix + (timestep == -1 ? "" : stringf("@%d:", timestep));
+               if (model_undef) {
+                       check_bits = ez->vec_and(ez->vec_not(importUndefSigSpec(assumes_a[pf], timestep)), importDefSigSpec(assumes_a[pf], timestep));
+                       enable_bits = ez->vec_and(ez->vec_not(importUndefSigSpec(assumes_en[pf], timestep)), importDefSigSpec(assumes_en[pf], timestep));
+               } else {
+                       check_bits = importDefSigSpec(assumes_a[pf], timestep);
+                       enable_bits = importDefSigSpec(assumes_en[pf], timestep);
+               }
+               return ez->vec_reduce_and(ez->vec_or(check_bits, ez->vec_not(enable_bits)));
+       }
+
        int signals_eq(RTLIL::SigSpec lhs, RTLIL::SigSpec rhs, int timestep_lhs = -1, int timestep_rhs = -1)
        {
                if (timestep_rhs < 0)
@@ -140,9 +227,9 @@ struct SatGen
                if (!forced_signed && cell->parameters.count("\\A_SIGNED") > 0 && cell->parameters.count("\\B_SIGNED") > 0)
                        is_signed = cell->parameters["\\A_SIGNED"].as_bool() && cell->parameters["\\B_SIGNED"].as_bool();
                while (vec_a.size() < vec_b.size() || vec_a.size() < y_width)
-                       vec_a.push_back(is_signed && vec_a.size() > 0 ? vec_a.back() : ez->FALSE);
+                       vec_a.push_back(is_signed && vec_a.size() > 0 ? vec_a.back() : ez->CONST_FALSE);
                while (vec_b.size() < vec_a.size() || vec_b.size() < y_width)
-                       vec_b.push_back(is_signed && vec_b.size() > 0 ? vec_b.back() : ez->FALSE);
+                       vec_b.push_back(is_signed && vec_b.size() > 0 ? vec_b.back() : ez->CONST_FALSE);
        }
 
        void extendSignalWidth(std::vector<int> &vec_a, std::vector<int> &vec_b, std::vector<int> &vec_y, RTLIL::Cell *cell, bool forced_signed = false)
@@ -156,7 +243,7 @@ struct SatGen
        {
                bool is_signed = forced_signed || (cell->parameters.count("\\A_SIGNED") > 0 && cell->parameters["\\A_SIGNED"].as_bool());
                while (vec_a.size() < vec_y.size())
-                       vec_a.push_back(is_signed && vec_a.size() > 0 ? vec_a.back() : ez->FALSE);
+                       vec_a.push_back(is_signed && vec_a.size() > 0 ? vec_a.back() : ez->CONST_FALSE);
                while (vec_y.size() < vec_a.size())
                        vec_y.push_back(ez->literal());
        }
@@ -175,16 +262,28 @@ struct SatGen
                }
        }
 
+       void undefGating(int y, int yy, int undef)
+       {
+               ez->assume(ez->OR(undef, ez->IFF(y, yy)));
+       }
+
+       void setInitState(int timestep)
+       {
+               auto key = make_pair(prefix, timestep);
+               log_assert(initstates.count(key) == 0 || initstates.at(key) == true);
+               initstates[key] = true;
+       }
+
        bool importCell(RTLIL::Cell *cell, int timestep = -1)
        {
                bool arith_undef_handled = false;
-               bool is_arith_compare = cell->type == "$lt" || cell->type == "$le" || cell->type == "$ge" || cell->type == "$gt";
+               bool is_arith_compare = cell->type.in("$lt", "$le", "$ge", "$gt");
 
-               if (model_undef && (cell->type == "$add" || cell->type == "$sub" || cell->type == "$mul" || cell->type == "$div" || cell->type == "$mod" || is_arith_compare))
+               if (model_undef && (cell->type.in("$add", "$sub", "$mul", "$div", "$mod") || is_arith_compare))
                {
-                       std::vector<int> undef_a = importUndefSigSpec(cell->get("\\A"), timestep);
-                       std::vector<int> undef_b = importUndefSigSpec(cell->get("\\B"), timestep);
-                       std::vector<int> undef_y = importUndefSigSpec(cell->get("\\Y"), timestep);
+                       std::vector<int> undef_a = importUndefSigSpec(cell->getPort("\\A"), timestep);
+                       std::vector<int> undef_b = importUndefSigSpec(cell->getPort("\\B"), timestep);
+                       std::vector<int> undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep);
                        if (is_arith_compare)
                                extendSignalWidth(undef_a, undef_b, cell, true);
                        else
@@ -195,13 +294,13 @@ struct SatGen
                        int undef_y_bit = ez->OR(undef_any_a, undef_any_b);
 
                        if (cell->type == "$div" || cell->type == "$mod") {
-                               std::vector<int> b = importSigSpec(cell->get("\\B"), timestep);
+                               std::vector<int> b = importSigSpec(cell->getPort("\\B"), timestep);
                                undef_y_bit = ez->OR(undef_y_bit, ez->NOT(ez->expression(ezSAT::OpOr, b)));
                        }
 
                        if (is_arith_compare) {
                                for (size_t i = 1; i < undef_y.size(); i++)
-                                       ez->SET(ez->FALSE, undef_y.at(i));
+                                       ez->SET(ez->CONST_FALSE, undef_y.at(i));
                                ez->SET(undef_y_bit, undef_y.at(0));
                        } else {
                                std::vector<int> undef_y_bits(undef_y.size(), undef_y_bit);
@@ -211,25 +310,32 @@ struct SatGen
                        arith_undef_handled = true;
                }
 
-               if (cell->type == "$_AND_" || cell->type == "$_OR_" || cell->type == "$_XOR_" ||
-                               cell->type == "$and" || cell->type == "$or" || cell->type == "$xor" || cell->type == "$xnor" ||
-                               cell->type == "$add" || cell->type == "$sub")
+               if (cell->type.in("$_AND_", "$_NAND_", "$_OR_", "$_NOR_", "$_XOR_", "$_XNOR_", "$_ANDNOT_", "$_ORNOT_",
+                               "$and", "$or", "$xor", "$xnor", "$add", "$sub"))
                {
-                       std::vector<int> a = importDefSigSpec(cell->get("\\A"), timestep);
-                       std::vector<int> b = importDefSigSpec(cell->get("\\B"), timestep);
-                       std::vector<int> y = importDefSigSpec(cell->get("\\Y"), timestep);
+                       std::vector<int> a = importDefSigSpec(cell->getPort("\\A"), timestep);
+                       std::vector<int> b = importDefSigSpec(cell->getPort("\\B"), timestep);
+                       std::vector<int> y = importDefSigSpec(cell->getPort("\\Y"), timestep);
                        extendSignalWidth(a, b, y, cell);
 
                        std::vector<int> yy = model_undef ? ez->vec_var(y.size()) : y;
 
                        if (cell->type == "$and" || cell->type == "$_AND_")
                                ez->assume(ez->vec_eq(ez->vec_and(a, b), yy));
+                       if (cell->type == "$_NAND_")
+                               ez->assume(ez->vec_eq(ez->vec_not(ez->vec_and(a, b)), yy));
                        if (cell->type == "$or" || cell->type == "$_OR_")
                                ez->assume(ez->vec_eq(ez->vec_or(a, b), yy));
+                       if (cell->type == "$_NOR_")
+                               ez->assume(ez->vec_eq(ez->vec_not(ez->vec_or(a, b)), yy));
                        if (cell->type == "$xor" || cell->type == "$_XOR_")
                                ez->assume(ez->vec_eq(ez->vec_xor(a, b), yy));
-                       if (cell->type == "$xnor")
+                       if (cell->type == "$xnor" || cell->type == "$_XNOR_")
                                ez->assume(ez->vec_eq(ez->vec_not(ez->vec_xor(a, b)), yy));
+                       if (cell->type == "$_ANDNOT_")
+                               ez->assume(ez->vec_eq(ez->vec_and(a, ez->vec_not(b)), yy));
+                       if (cell->type == "$_ORNOT_")
+                               ez->assume(ez->vec_eq(ez->vec_or(a, ez->vec_not(b)), yy));
                        if (cell->type == "$add")
                                ez->assume(ez->vec_eq(ez->vec_add(a, b), yy));
                        if (cell->type == "$sub")
@@ -237,27 +343,40 @@ struct SatGen
 
                        if (model_undef && !arith_undef_handled)
                        {
-                               std::vector<int> undef_a = importUndefSigSpec(cell->get("\\A"), timestep);
-                               std::vector<int> undef_b = importUndefSigSpec(cell->get("\\B"), timestep);
-                               std::vector<int> undef_y = importUndefSigSpec(cell->get("\\Y"), timestep);
+                               std::vector<int> undef_a = importUndefSigSpec(cell->getPort("\\A"), timestep);
+                               std::vector<int> undef_b = importUndefSigSpec(cell->getPort("\\B"), timestep);
+                               std::vector<int> undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep);
                                extendSignalWidth(undef_a, undef_b, undef_y, cell, false);
 
-                               if (cell->type == "$and" || cell->type == "$_AND_") {
+                               if (cell->type.in("$and", "$_AND_", "$_NAND_")) {
                                        std::vector<int> a0 = ez->vec_and(ez->vec_not(a), ez->vec_not(undef_a));
                                        std::vector<int> b0 = ez->vec_and(ez->vec_not(b), ez->vec_not(undef_b));
                                        std::vector<int> yX = ez->vec_and(ez->vec_or(undef_a, undef_b), ez->vec_not(ez->vec_or(a0, b0)));
                                        ez->assume(ez->vec_eq(yX, undef_y));
                                }
-                               else if (cell->type == "$or" || cell->type == "$_OR_") {
+                               else if (cell->type.in("$or", "$_OR_", "$_NOR_")) {
                                        std::vector<int> a1 = ez->vec_and(a, ez->vec_not(undef_a));
                                        std::vector<int> b1 = ez->vec_and(b, ez->vec_not(undef_b));
                                        std::vector<int> yX = ez->vec_and(ez->vec_or(undef_a, undef_b), ez->vec_not(ez->vec_or(a1, b1)));
                                        ez->assume(ez->vec_eq(yX, undef_y));
                                }
-                               else if (cell->type == "$xor" || cell->type == "$_XOR_" || cell->type == "$xnor") {
+                               else if (cell->type.in("$xor", "$xnor", "$_XOR_", "$_XNOR_")) {
                                        std::vector<int> yX = ez->vec_or(undef_a, undef_b);
                                        ez->assume(ez->vec_eq(yX, undef_y));
                                }
+                               else if (cell->type == "$_ANDNOT_") {
+                                       std::vector<int> a0 = ez->vec_and(ez->vec_not(a), ez->vec_not(undef_a));
+                                       std::vector<int> b1 = ez->vec_and(b, ez->vec_not(undef_b));
+                                       std::vector<int> yX = ez->vec_and(ez->vec_or(undef_a, undef_b), ez->vec_not(ez->vec_or(a0, b1)));
+                                       ez->assume(ez->vec_eq(yX, undef_y));
+                               }
+
+                               else if (cell->type == "$_ORNOT_") {
+                                       std::vector<int> a1 = ez->vec_and(a, ez->vec_not(undef_a));
+                                       std::vector<int> b0 = ez->vec_and(ez->vec_not(b), ez->vec_not(undef_b));
+                                       std::vector<int> yX = ez->vec_and(ez->vec_or(undef_a, undef_b), ez->vec_not(ez->vec_or(a1, b0)));
+                                       ez->assume(ez->vec_eq(yX, undef_y));
+                               }
                                else
                                        log_abort();
 
@@ -265,25 +384,91 @@ struct SatGen
                        }
                        else if (model_undef)
                        {
-                               std::vector<int> undef_y = importUndefSigSpec(cell->get("\\Y"), timestep);
+                               std::vector<int> undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep);
                                undefGating(y, yy, undef_y);
                        }
                        return true;
                }
 
-               if (cell->type == "$_INV_" || cell->type == "$not")
+               if (cell->type.in("$_AOI3_", "$_OAI3_", "$_AOI4_", "$_OAI4_"))
                {
-                       std::vector<int> a = importDefSigSpec(cell->get("\\A"), timestep);
-                       std::vector<int> y = importDefSigSpec(cell->get("\\Y"), timestep);
+                       bool aoi_mode = cell->type.in("$_AOI3_", "$_AOI4_");
+                       bool three_mode = cell->type.in("$_AOI3_", "$_OAI3_");
+
+                       int a = importDefSigSpec(cell->getPort("\\A"), timestep).at(0);
+                       int b = importDefSigSpec(cell->getPort("\\B"), timestep).at(0);
+                       int c = importDefSigSpec(cell->getPort("\\C"), timestep).at(0);
+                       int d = three_mode ? (aoi_mode ? ez->CONST_TRUE : ez->CONST_FALSE) : importDefSigSpec(cell->getPort("\\D"), timestep).at(0);
+                       int y = importDefSigSpec(cell->getPort("\\Y"), timestep).at(0);
+                       int yy = model_undef ? ez->literal() : y;
+
+                       if (cell->type.in("$_AOI3_", "$_AOI4_"))
+                               ez->assume(ez->IFF(ez->NOT(ez->OR(ez->AND(a, b), ez->AND(c, d))), yy));
+                       else
+                               ez->assume(ez->IFF(ez->NOT(ez->AND(ez->OR(a, b), ez->OR(c, d))), yy));
+
+                       if (model_undef)
+                       {
+                               int undef_a = importUndefSigSpec(cell->getPort("\\A"), timestep).at(0);
+                               int undef_b = importUndefSigSpec(cell->getPort("\\B"), timestep).at(0);
+                               int undef_c = importUndefSigSpec(cell->getPort("\\C"), timestep).at(0);
+                               int undef_d = three_mode ? ez->CONST_FALSE : importUndefSigSpec(cell->getPort("\\D"), timestep).at(0);
+                               int undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep).at(0);
+
+                               if (aoi_mode)
+                               {
+                                       int a0 = ez->AND(ez->NOT(a), ez->NOT(undef_a));
+                                       int b0 = ez->AND(ez->NOT(b), ez->NOT(undef_b));
+                                       int c0 = ez->AND(ez->NOT(c), ez->NOT(undef_c));
+                                       int d0 = ez->AND(ez->NOT(d), ez->NOT(undef_d));
+
+                                       int ab = ez->AND(a, b), cd = ez->AND(c, d);
+                                       int undef_ab = ez->AND(ez->OR(undef_a, undef_b), ez->NOT(ez->OR(a0, b0)));
+                                       int undef_cd = ez->AND(ez->OR(undef_c, undef_d), ez->NOT(ez->OR(c0, d0)));
+
+                                       int ab1 = ez->AND(ab, ez->NOT(undef_ab));
+                                       int cd1 = ez->AND(cd, ez->NOT(undef_cd));
+                                       int yX = ez->AND(ez->OR(undef_ab, undef_cd), ez->NOT(ez->OR(ab1, cd1)));
+
+                                       ez->assume(ez->IFF(yX, undef_y));
+                               }
+                               else
+                               {
+                                       int a1 = ez->AND(a, ez->NOT(undef_a));
+                                       int b1 = ez->AND(b, ez->NOT(undef_b));
+                                       int c1 = ez->AND(c, ez->NOT(undef_c));
+                                       int d1 = ez->AND(d, ez->NOT(undef_d));
+
+                                       int ab = ez->OR(a, b), cd = ez->OR(c, d);
+                                       int undef_ab = ez->AND(ez->OR(undef_a, undef_b), ez->NOT(ez->OR(a1, b1)));
+                                       int undef_cd = ez->AND(ez->OR(undef_c, undef_d), ez->NOT(ez->OR(c1, d1)));
+
+                                       int ab0 = ez->AND(ez->NOT(ab), ez->NOT(undef_ab));
+                                       int cd0 = ez->AND(ez->NOT(cd), ez->NOT(undef_cd));
+                                       int yX = ez->AND(ez->OR(undef_ab, undef_cd), ez->NOT(ez->OR(ab0, cd0)));
+
+                                       ez->assume(ez->IFF(yX, undef_y));
+                               }
+
+                               undefGating(y, yy, undef_y);
+                       }
+
+                       return true;
+               }
+
+               if (cell->type == "$_NOT_" || cell->type == "$not")
+               {
+                       std::vector<int> a = importDefSigSpec(cell->getPort("\\A"), timestep);
+                       std::vector<int> y = importDefSigSpec(cell->getPort("\\Y"), timestep);
                        extendSignalWidthUnary(a, y, cell);
 
                        std::vector<int> yy = model_undef ? ez->vec_var(y.size()) : y;
                        ez->assume(ez->vec_eq(ez->vec_not(a), yy));
 
                        if (model_undef) {
-                               std::vector<int> undef_a = importUndefSigSpec(cell->get("\\A"), timestep);
-                               std::vector<int> undef_y = importUndefSigSpec(cell->get("\\Y"), timestep);
-                               extendSignalWidthUnary(undef_a, undef_y, cell, true);
+                               std::vector<int> undef_a = importUndefSigSpec(cell->getPort("\\A"), timestep);
+                               std::vector<int> undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep);
+                               extendSignalWidthUnary(undef_a, undef_y, cell, false);
                                ez->assume(ez->vec_eq(undef_a, undef_y));
                                undefGating(y, yy, undef_y);
                        }
@@ -292,20 +477,20 @@ struct SatGen
 
                if (cell->type == "$_MUX_" || cell->type == "$mux")
                {
-                       std::vector<int> a = importDefSigSpec(cell->get("\\A"), timestep);
-                       std::vector<int> b = importDefSigSpec(cell->get("\\B"), timestep);
-                       std::vector<int> s = importDefSigSpec(cell->get("\\S"), timestep);
-                       std::vector<int> y = importDefSigSpec(cell->get("\\Y"), timestep);
+                       std::vector<int> a = importDefSigSpec(cell->getPort("\\A"), timestep);
+                       std::vector<int> b = importDefSigSpec(cell->getPort("\\B"), timestep);
+                       std::vector<int> s = importDefSigSpec(cell->getPort("\\S"), timestep);
+                       std::vector<int> y = importDefSigSpec(cell->getPort("\\Y"), timestep);
 
                        std::vector<int> yy = model_undef ? ez->vec_var(y.size()) : y;
                        ez->assume(ez->vec_eq(ez->vec_ite(s.at(0), b, a), yy));
 
                        if (model_undef)
                        {
-                               std::vector<int> undef_a = importUndefSigSpec(cell->get("\\A"), timestep);
-                               std::vector<int> undef_b = importUndefSigSpec(cell->get("\\B"), timestep);
-                               std::vector<int> undef_s = importUndefSigSpec(cell->get("\\S"), timestep);
-                               std::vector<int> undef_y = importUndefSigSpec(cell->get("\\Y"), timestep);
+                               std::vector<int> undef_a = importUndefSigSpec(cell->getPort("\\A"), timestep);
+                               std::vector<int> undef_b = importUndefSigSpec(cell->getPort("\\B"), timestep);
+                               std::vector<int> undef_s = importUndefSigSpec(cell->getPort("\\S"), timestep);
+                               std::vector<int> undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep);
 
                                std::vector<int> unequal_ab = ez->vec_not(ez->vec_iff(a, b));
                                std::vector<int> undef_ab = ez->vec_or(unequal_ab, ez->vec_or(undef_a, undef_b));
@@ -316,12 +501,12 @@ struct SatGen
                        return true;
                }
 
-               if (cell->type == "$pmux" || cell->type == "$safe_pmux")
+               if (cell->type == "$pmux")
                {
-                       std::vector<int> a = importDefSigSpec(cell->get("\\A"), timestep);
-                       std::vector<int> b = importDefSigSpec(cell->get("\\B"), timestep);
-                       std::vector<int> s = importDefSigSpec(cell->get("\\S"), timestep);
-                       std::vector<int> y = importDefSigSpec(cell->get("\\Y"), timestep);
+                       std::vector<int> a = importDefSigSpec(cell->getPort("\\A"), timestep);
+                       std::vector<int> b = importDefSigSpec(cell->getPort("\\B"), timestep);
+                       std::vector<int> s = importDefSigSpec(cell->getPort("\\S"), timestep);
+                       std::vector<int> y = importDefSigSpec(cell->getPort("\\Y"), timestep);
 
                        std::vector<int> yy = model_undef ? ez->vec_var(y.size()) : y;
 
@@ -330,25 +515,19 @@ struct SatGen
                                std::vector<int> part_of_b(b.begin()+i*a.size(), b.begin()+(i+1)*a.size());
                                tmp = ez->vec_ite(s.at(i), part_of_b, tmp);
                        }
-                       if (cell->type == "$safe_pmux")
-                               tmp = ez->vec_ite(ez->onehot(s, true), tmp, a);
                        ez->assume(ez->vec_eq(tmp, yy));
 
                        if (model_undef)
                        {
-                               std::vector<int> undef_a = importUndefSigSpec(cell->get("\\A"), timestep);
-                               std::vector<int> undef_b = importUndefSigSpec(cell->get("\\B"), timestep);
-                               std::vector<int> undef_s = importUndefSigSpec(cell->get("\\S"), timestep);
-                               std::vector<int> undef_y = importUndefSigSpec(cell->get("\\Y"), timestep);
-
-                               int maybe_one_hot = ez->FALSE;
-                               int maybe_many_hot = ez->FALSE;
+                               std::vector<int> undef_a = importUndefSigSpec(cell->getPort("\\A"), timestep);
+                               std::vector<int> undef_b = importUndefSigSpec(cell->getPort("\\B"), timestep);
+                               std::vector<int> undef_s = importUndefSigSpec(cell->getPort("\\S"), timestep);
+                               std::vector<int> undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep);
 
-                               int sure_one_hot = ez->FALSE;
-                               int sure_many_hot = ez->FALSE;
+                               int maybe_a = ez->CONST_TRUE;
 
-                               std::vector<int> bits_set = std::vector<int>(undef_y.size(), ez->FALSE);
-                               std::vector<int> bits_clr = std::vector<int>(undef_y.size(), ez->FALSE);
+                               std::vector<int> bits_set = std::vector<int>(undef_y.size(), ez->CONST_FALSE);
+                               std::vector<int> bits_clr = std::vector<int>(undef_y.size(), ez->CONST_FALSE);
 
                                for (size_t i = 0; i < s.size(); i++)
                                {
@@ -358,22 +537,10 @@ struct SatGen
                                        int maybe_s = ez->OR(s.at(i), undef_s.at(i));
                                        int sure_s = ez->AND(s.at(i), ez->NOT(undef_s.at(i)));
 
-                                       maybe_one_hot = ez->OR(maybe_one_hot, maybe_s);
-                                       maybe_many_hot = ez->OR(maybe_many_hot, ez->AND(maybe_one_hot, maybe_s));
-
-                                       sure_one_hot = ez->OR(sure_one_hot, sure_s);
-                                       sure_many_hot = ez->OR(sure_many_hot, ez->AND(sure_one_hot, sure_s));
-
-                                       bits_set = ez->vec_ite(maybe_s, ez->vec_or(bits_set, ez->vec_or(bits_set, ez->vec_or(part_of_b, part_of_undef_b))), bits_set);
-                                       bits_clr = ez->vec_ite(maybe_s, ez->vec_or(bits_clr, ez->vec_or(bits_clr, ez->vec_or(ez->vec_not(part_of_b), part_of_undef_b))), bits_clr);
-                               }
-
-                               int maybe_a = ez->NOT(maybe_one_hot);
+                                       maybe_a = ez->AND(maybe_a, ez->NOT(sure_s));
 
-                               if (cell->type == "$safe_pmux") {
-                                       maybe_a = ez->OR(maybe_a, maybe_many_hot);
-                                       bits_set = ez->vec_ite(sure_many_hot, ez->vec_or(a, undef_a), bits_set);
-                                       bits_clr = ez->vec_ite(sure_many_hot, ez->vec_or(ez->vec_not(a), undef_a), bits_clr);
+                                       bits_set = ez->vec_ite(maybe_s, ez->vec_or(bits_set, ez->vec_or(part_of_b, part_of_undef_b)), bits_set);
+                                       bits_clr = ez->vec_ite(maybe_s, ez->vec_or(bits_clr, ez->vec_or(ez->vec_not(part_of_b), part_of_undef_b)), bits_clr);
                                }
 
                                bits_set = ez->vec_ite(maybe_a, ez->vec_or(bits_set, ez->vec_or(bits_set, ez->vec_or(a, undef_a))), bits_set);
@@ -385,28 +552,28 @@ struct SatGen
                        return true;
                }
 
-               if (cell->type == "$pos" || cell->type == "$bu0" || cell->type == "$neg")
+               if (cell->type == "$pos" || cell->type == "$neg")
                {
-                       std::vector<int> a = importDefSigSpec(cell->get("\\A"), timestep);
-                       std::vector<int> y = importDefSigSpec(cell->get("\\Y"), timestep);
+                       std::vector<int> a = importDefSigSpec(cell->getPort("\\A"), timestep);
+                       std::vector<int> y = importDefSigSpec(cell->getPort("\\Y"), timestep);
                        extendSignalWidthUnary(a, y, cell);
 
                        std::vector<int> yy = model_undef ? ez->vec_var(y.size()) : y;
 
-                       if (cell->type == "$pos" || cell->type == "$bu0") {
+                       if (cell->type == "$pos") {
                                ez->assume(ez->vec_eq(a, yy));
                        } else {
-                               std::vector<int> zero(a.size(), ez->FALSE);
+                               std::vector<int> zero(a.size(), ez->CONST_FALSE);
                                ez->assume(ez->vec_eq(ez->vec_sub(zero, a), yy));
                        }
 
                        if (model_undef)
                        {
-                               std::vector<int> undef_a = importUndefSigSpec(cell->get("\\A"), timestep);
-                               std::vector<int> undef_y = importUndefSigSpec(cell->get("\\Y"), timestep);
-                               extendSignalWidthUnary(undef_a, undef_y, cell, cell->type != "$bu0");
+                               std::vector<int> undef_a = importUndefSigSpec(cell->getPort("\\A"), timestep);
+                               std::vector<int> undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep);
+                               extendSignalWidthUnary(undef_a, undef_y, cell);
 
-                               if (cell->type == "$pos" || cell->type == "$bu0") {
+                               if (cell->type == "$pos") {
                                        ez->assume(ez->vec_eq(undef_a, undef_y));
                                } else {
                                        int undef_any_a = ez->expression(ezSAT::OpOr, undef_a);
@@ -422,8 +589,8 @@ struct SatGen
                if (cell->type == "$reduce_and" || cell->type == "$reduce_or" || cell->type == "$reduce_xor" ||
                                cell->type == "$reduce_xnor" || cell->type == "$reduce_bool" || cell->type == "$logic_not")
                {
-                       std::vector<int> a = importDefSigSpec(cell->get("\\A"), timestep);
-                       std::vector<int> y = importDefSigSpec(cell->get("\\Y"), timestep);
+                       std::vector<int> a = importDefSigSpec(cell->getPort("\\A"), timestep);
+                       std::vector<int> y = importDefSigSpec(cell->getPort("\\Y"), timestep);
 
                        std::vector<int> yy = model_undef ? ez->vec_var(y.size()) : y;
 
@@ -438,12 +605,12 @@ struct SatGen
                        if (cell->type == "$logic_not")
                                ez->SET(ez->NOT(ez->expression(ez->OpOr, a)), yy.at(0));
                        for (size_t i = 1; i < y.size(); i++)
-                               ez->SET(ez->FALSE, yy.at(i));
+                               ez->SET(ez->CONST_FALSE, yy.at(i));
 
                        if (model_undef)
                        {
-                               std::vector<int> undef_a = importUndefSigSpec(cell->get("\\A"), timestep);
-                               std::vector<int> undef_y = importUndefSigSpec(cell->get("\\Y"), timestep);
+                               std::vector<int> undef_a = importUndefSigSpec(cell->getPort("\\A"), timestep);
+                               std::vector<int> undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep);
                                int aX = ez->expression(ezSAT::OpOr, undef_a);
 
                                if (cell->type == "$reduce_and") {
@@ -460,7 +627,7 @@ struct SatGen
                                        log_abort();
 
                                for (size_t i = 1; i < undef_y.size(); i++)
-                                       ez->SET(ez->FALSE, undef_y.at(i));
+                                       ez->SET(ez->CONST_FALSE, undef_y.at(i));
 
                                undefGating(y, yy, undef_y);
                        }
@@ -469,12 +636,12 @@ struct SatGen
 
                if (cell->type == "$logic_and" || cell->type == "$logic_or")
                {
-                       std::vector<int> vec_a = importDefSigSpec(cell->get("\\A"), timestep);
-                       std::vector<int> vec_b = importDefSigSpec(cell->get("\\B"), timestep);
+                       std::vector<int> vec_a = importDefSigSpec(cell->getPort("\\A"), timestep);
+                       std::vector<int> vec_b = importDefSigSpec(cell->getPort("\\B"), timestep);
 
                        int a = ez->expression(ez->OpOr, vec_a);
                        int b = ez->expression(ez->OpOr, vec_b);
-                       std::vector<int> y = importDefSigSpec(cell->get("\\Y"), timestep);
+                       std::vector<int> y = importDefSigSpec(cell->getPort("\\Y"), timestep);
 
                        std::vector<int> yy = model_undef ? ez->vec_var(y.size()) : y;
 
@@ -483,13 +650,13 @@ struct SatGen
                        else
                                ez->SET(ez->expression(ez->OpOr, a, b), yy.at(0));
                        for (size_t i = 1; i < y.size(); i++)
-                               ez->SET(ez->FALSE, yy.at(i));
+                               ez->SET(ez->CONST_FALSE, yy.at(i));
 
                        if (model_undef)
                        {
-                               std::vector<int> undef_a = importUndefSigSpec(cell->get("\\A"), timestep);
-                               std::vector<int> undef_b = importUndefSigSpec(cell->get("\\B"), timestep);
-                               std::vector<int> undef_y = importUndefSigSpec(cell->get("\\Y"), timestep);
+                               std::vector<int> undef_a = importUndefSigSpec(cell->getPort("\\A"), timestep);
+                               std::vector<int> undef_b = importUndefSigSpec(cell->getPort("\\B"), timestep);
+                               std::vector<int> undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep);
 
                                int a0 = ez->NOT(ez->OR(ez->expression(ezSAT::OpOr, vec_a), ez->expression(ezSAT::OpOr, undef_a)));
                                int b0 = ez->NOT(ez->OR(ez->expression(ezSAT::OpOr, vec_b), ez->expression(ezSAT::OpOr, undef_b)));
@@ -506,7 +673,7 @@ struct SatGen
                                        log_abort();
 
                                for (size_t i = 1; i < undef_y.size(); i++)
-                                       ez->SET(ez->FALSE, undef_y.at(i));
+                                       ez->SET(ez->CONST_FALSE, undef_y.at(i));
 
                                undefGating(y, yy, undef_y);
                        }
@@ -516,16 +683,16 @@ struct SatGen
                if (cell->type == "$lt" || cell->type == "$le" || cell->type == "$eq" || cell->type == "$ne" || cell->type == "$eqx" || cell->type == "$nex" || cell->type == "$ge" || cell->type == "$gt")
                {
                        bool is_signed = cell->parameters["\\A_SIGNED"].as_bool() && cell->parameters["\\B_SIGNED"].as_bool();
-                       std::vector<int> a = importDefSigSpec(cell->get("\\A"), timestep);
-                       std::vector<int> b = importDefSigSpec(cell->get("\\B"), timestep);
-                       std::vector<int> y = importDefSigSpec(cell->get("\\Y"), timestep);
+                       std::vector<int> a = importDefSigSpec(cell->getPort("\\A"), timestep);
+                       std::vector<int> b = importDefSigSpec(cell->getPort("\\B"), timestep);
+                       std::vector<int> y = importDefSigSpec(cell->getPort("\\Y"), timestep);
                        extendSignalWidth(a, b, cell);
 
                        std::vector<int> yy = model_undef ? ez->vec_var(y.size()) : y;
 
                        if (model_undef && (cell->type == "$eqx" || cell->type == "$nex")) {
-                               std::vector<int> undef_a = importUndefSigSpec(cell->get("\\A"), timestep);
-                               std::vector<int> undef_b = importUndefSigSpec(cell->get("\\B"), timestep);
+                               std::vector<int> undef_a = importUndefSigSpec(cell->getPort("\\A"), timestep);
+                               std::vector<int> undef_b = importUndefSigSpec(cell->getPort("\\B"), timestep);
                                extendSignalWidth(undef_a, undef_b, cell, true);
                                a = ez->vec_or(a, undef_a);
                                b = ez->vec_or(b, undef_b);
@@ -544,13 +711,13 @@ struct SatGen
                        if (cell->type == "$gt")
                                ez->SET(is_signed ? ez->vec_gt_signed(a, b) : ez->vec_gt_unsigned(a, b), yy.at(0));
                        for (size_t i = 1; i < y.size(); i++)
-                               ez->SET(ez->FALSE, yy.at(i));
+                               ez->SET(ez->CONST_FALSE, yy.at(i));
 
                        if (model_undef && (cell->type == "$eqx" || cell->type == "$nex"))
                        {
-                               std::vector<int> undef_a = importUndefSigSpec(cell->get("\\A"), timestep);
-                               std::vector<int> undef_b = importUndefSigSpec(cell->get("\\B"), timestep);
-                               std::vector<int> undef_y = importUndefSigSpec(cell->get("\\Y"), timestep);
+                               std::vector<int> undef_a = importUndefSigSpec(cell->getPort("\\A"), timestep);
+                               std::vector<int> undef_b = importUndefSigSpec(cell->getPort("\\B"), timestep);
+                               std::vector<int> undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep);
                                extendSignalWidth(undef_a, undef_b, cell, true);
 
                                if (cell->type == "$eqx")
@@ -559,15 +726,15 @@ struct SatGen
                                        yy.at(0) = ez->OR(yy.at(0), ez->vec_ne(undef_a, undef_b));
 
                                for (size_t i = 0; i < y.size(); i++)
-                                       ez->SET(ez->FALSE, undef_y.at(i));
+                                       ez->SET(ez->CONST_FALSE, undef_y.at(i));
 
                                ez->assume(ez->vec_eq(y, yy));
                        }
                        else if (model_undef && (cell->type == "$eq" || cell->type == "$ne"))
                        {
-                               std::vector<int> undef_a = importUndefSigSpec(cell->get("\\A"), timestep);
-                               std::vector<int> undef_b = importUndefSigSpec(cell->get("\\B"), timestep);
-                               std::vector<int> undef_y = importUndefSigSpec(cell->get("\\Y"), timestep);
+                               std::vector<int> undef_a = importUndefSigSpec(cell->getPort("\\A"), timestep);
+                               std::vector<int> undef_b = importUndefSigSpec(cell->getPort("\\B"), timestep);
+                               std::vector<int> undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep);
                                extendSignalWidth(undef_a, undef_b, cell, true);
 
                                int undef_any_a = ez->expression(ezSAT::OpOr, undef_a);
@@ -581,7 +748,7 @@ struct SatGen
                                int undef_y_bit = ez->AND(undef_any, ez->NOT(masked_ne));
 
                                for (size_t i = 1; i < undef_y.size(); i++)
-                                       ez->SET(ez->FALSE, undef_y.at(i));
+                                       ez->SET(ez->CONST_FALSE, undef_y.at(i));
                                ez->SET(undef_y_bit, undef_y.at(0));
 
                                undefGating(y, yy, undef_y);
@@ -589,7 +756,7 @@ struct SatGen
                        else
                        {
                                if (model_undef) {
-                                       std::vector<int> undef_y = importUndefSigSpec(cell->get("\\Y"), timestep);
+                                       std::vector<int> undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep);
                                        undefGating(y, yy, undef_y);
                                }
                                log_assert(!model_undef || arith_undef_handled);
@@ -599,67 +766,71 @@ struct SatGen
 
                if (cell->type == "$shl" || cell->type == "$shr" || cell->type == "$sshl" || cell->type == "$sshr" || cell->type == "$shift" || cell->type == "$shiftx")
                {
-                       std::vector<int> a = importDefSigSpec(cell->get("\\A"), timestep);
-                       std::vector<int> b = importDefSigSpec(cell->get("\\B"), timestep);
-                       std::vector<int> y = importDefSigSpec(cell->get("\\Y"), timestep);
+                       std::vector<int> a = importDefSigSpec(cell->getPort("\\A"), timestep);
+                       std::vector<int> b = importDefSigSpec(cell->getPort("\\B"), timestep);
+                       std::vector<int> y = importDefSigSpec(cell->getPort("\\Y"), timestep);
+
+                       int extend_bit = ez->CONST_FALSE;
 
-                       char shift_left = cell->type == "$shl" || cell->type == "$sshl";
-                       bool sign_extend = cell->type == "$sshr" && cell->parameters["\\A_SIGNED"].as_bool();
-                       bool shift_shiftx = cell->type == "$shift" || cell->type == "$shiftx";
+                       if (!cell->type.in("$shift", "$shiftx") && cell->parameters["\\A_SIGNED"].as_bool())
+                               extend_bit = a.back();
 
                        while (y.size() < a.size())
                                y.push_back(ez->literal());
                        while (y.size() > a.size())
-                               a.push_back(cell->parameters["\\A_SIGNED"].as_bool() ? a.back() : ez->FALSE);
+                               a.push_back(extend_bit);
 
                        std::vector<int> yy = model_undef ? ez->vec_var(y.size()) : y;
+                       std::vector<int> shifted_a;
 
-                       std::vector<int> tmp = a;
-                       for (size_t i = 0; i < b.size(); i++)
-                       {
-                               bool shift_left_this = shift_left;
-                               if (shift_shiftx && i == b.size()-1 && cell->parameters["\\B_SIGNED"].as_bool())
-                                       shift_left_this = true;
-
-                               std::vector<int> tmp_shifted(tmp.size());
-                               for (size_t j = 0; j < tmp.size(); j++) {
-                                       int idx = j + (1 << (i > 30 ? 30 : i)) * (shift_left_this ? -1 : +1);
-                                       tmp_shifted.at(j) = (0 <= idx && idx < int(tmp.size())) ? tmp.at(idx) : sign_extend ? tmp.back() : ez->FALSE;
-                               }
-                               tmp = ez->vec_ite(b.at(i), tmp_shifted, tmp);
-                       }
-                       ez->assume(ez->vec_eq(tmp, yy));
+                       if (cell->type == "$shl" || cell->type == "$sshl")
+                               shifted_a = ez->vec_shift_left(a, b, false, ez->CONST_FALSE, ez->CONST_FALSE);
+
+                       if (cell->type == "$shr")
+                               shifted_a = ez->vec_shift_right(a, b, false, ez->CONST_FALSE, ez->CONST_FALSE);
+
+                       if (cell->type == "$sshr")
+                               shifted_a = ez->vec_shift_right(a, b, false, cell->parameters["\\A_SIGNED"].as_bool() ? a.back() : ez->CONST_FALSE, ez->CONST_FALSE);
+
+                       if (cell->type == "$shift" || cell->type == "$shiftx")
+                               shifted_a = ez->vec_shift_right(a, b, cell->parameters["\\B_SIGNED"].as_bool(), ez->CONST_FALSE, ez->CONST_FALSE);
+
+                       ez->assume(ez->vec_eq(shifted_a, yy));
 
                        if (model_undef)
                        {
-                               std::vector<int> undef_a = importUndefSigSpec(cell->get("\\A"), timestep);
-                               std::vector<int> undef_b = importUndefSigSpec(cell->get("\\B"), timestep);
-                               std::vector<int> undef_y = importUndefSigSpec(cell->get("\\Y"), timestep);
+                               std::vector<int> undef_a = importUndefSigSpec(cell->getPort("\\A"), timestep);
+                               std::vector<int> undef_b = importUndefSigSpec(cell->getPort("\\B"), timestep);
+                               std::vector<int> undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep);
+                               std::vector<int> undef_a_shifted;
+
+                               extend_bit = cell->type == "$shiftx" ? ez->CONST_TRUE : ez->CONST_FALSE;
+                               if (!cell->type.in("$shift", "$shiftx") && cell->parameters["\\A_SIGNED"].as_bool())
+                                       extend_bit = undef_a.back();
 
                                while (undef_y.size() < undef_a.size())
                                        undef_y.push_back(ez->literal());
                                while (undef_y.size() > undef_a.size())
-                                       undef_a.push_back(cell->parameters["\\A_SIGNED"].as_bool() ? undef_a.back() : ez->FALSE);
+                                       undef_a.push_back(extend_bit);
 
-                               tmp = undef_a;
-                               for (size_t i = 0; i < b.size(); i++)
-                               {
-                                       bool shift_left_this = shift_left;
-                                       if (shift_shiftx && i == b.size()-1 && cell->parameters["\\B_SIGNED"].as_bool())
-                                               shift_left_this = true;
-
-                                       std::vector<int> tmp_shifted(tmp.size());
-                                       for (size_t j = 0; j < tmp.size(); j++) {
-                                               int idx = j + (1 << (i > 30 ? 30 : i)) * (shift_left_this ? -1 : +1);
-                                               tmp_shifted.at(j) = (0 <= idx && idx < int(tmp.size())) ? tmp.at(idx) :
-                                                               sign_extend ? tmp.back() : cell->type == "$shiftx" ? ez->TRUE : ez->FALSE;
-                                       }
-                                       tmp = ez->vec_ite(b.at(i), tmp_shifted, tmp);
-                               }
+                               if (cell->type == "$shl" || cell->type == "$sshl")
+                                       undef_a_shifted = ez->vec_shift_left(undef_a, b, false, ez->CONST_FALSE, ez->CONST_FALSE);
+
+                               if (cell->type == "$shr")
+                                       undef_a_shifted = ez->vec_shift_right(undef_a, b, false, ez->CONST_FALSE, ez->CONST_FALSE);
+
+                               if (cell->type == "$sshr")
+                                       undef_a_shifted = ez->vec_shift_right(undef_a, b, false, cell->parameters["\\A_SIGNED"].as_bool() ? undef_a.back() : ez->CONST_FALSE, ez->CONST_FALSE);
+
+                               if (cell->type == "$shift")
+                                       undef_a_shifted = ez->vec_shift_right(undef_a, b, cell->parameters["\\B_SIGNED"].as_bool(), ez->CONST_FALSE, ez->CONST_FALSE);
+
+                               if (cell->type == "$shiftx")
+                                       undef_a_shifted = ez->vec_shift_right(undef_a, b, cell->parameters["\\B_SIGNED"].as_bool(), ez->CONST_TRUE, ez->CONST_TRUE);
 
                                int undef_any_b = ez->expression(ezSAT::OpOr, undef_b);
                                std::vector<int> undef_all_y_bits(undef_y.size(), undef_any_b);
-                               ez->assume(ez->vec_eq(ez->vec_or(tmp, undef_all_y_bits), undef_y));
+                               ez->assume(ez->vec_eq(ez->vec_or(undef_a_shifted, undef_all_y_bits), undef_y));
                                undefGating(y, yy, undef_y);
                        }
                        return true;
@@ -667,17 +838,17 @@ struct SatGen
 
                if (cell->type == "$mul")
                {
-                       std::vector<int> a = importDefSigSpec(cell->get("\\A"), timestep);
-                       std::vector<int> b = importDefSigSpec(cell->get("\\B"), timestep);
-                       std::vector<int> y = importDefSigSpec(cell->get("\\Y"), timestep);
+                       std::vector<int> a = importDefSigSpec(cell->getPort("\\A"), timestep);
+                       std::vector<int> b = importDefSigSpec(cell->getPort("\\B"), timestep);
+                       std::vector<int> y = importDefSigSpec(cell->getPort("\\Y"), timestep);
                        extendSignalWidth(a, b, y, cell);
 
                        std::vector<int> yy = model_undef ? ez->vec_var(y.size()) : y;
 
-                       std::vector<int> tmp(a.size(), ez->FALSE);
+                       std::vector<int> tmp(a.size(), ez->CONST_FALSE);
                        for (int i = 0; i < int(a.size()); i++)
                        {
-                               std::vector<int> shifted_a(a.size(), ez->FALSE);
+                               std::vector<int> shifted_a(a.size(), ez->CONST_FALSE);
                                for (int j = i; j < int(a.size()); j++)
                                        shifted_a.at(j) = a.at(j-i);
                                tmp = ez->vec_ite(b.at(i), ez->vec_add(tmp, shifted_a), tmp);
@@ -686,17 +857,87 @@ struct SatGen
 
                        if (model_undef) {
                                log_assert(arith_undef_handled);
-                               std::vector<int> undef_y = importUndefSigSpec(cell->get("\\Y"), timestep);
+                               std::vector<int> undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep);
                                undefGating(y, yy, undef_y);
                        }
                        return true;
                }
 
+               if (cell->type == "$macc")
+               {
+                       std::vector<int> a = importDefSigSpec(cell->getPort("\\A"), timestep);
+                       std::vector<int> b = importDefSigSpec(cell->getPort("\\B"), timestep);
+                       std::vector<int> y = importDefSigSpec(cell->getPort("\\Y"), timestep);
+
+                       Macc macc;
+                       macc.from_cell(cell);
+
+                       std::vector<int> tmp(GetSize(y), ez->CONST_FALSE);
+
+                       for (auto &port : macc.ports)
+                       {
+                               std::vector<int> in_a = importDefSigSpec(port.in_a, timestep);
+                               std::vector<int> in_b = importDefSigSpec(port.in_b, timestep);
+
+                               while (GetSize(in_a) < GetSize(y))
+                                       in_a.push_back(port.is_signed && !in_a.empty() ? in_a.back() : ez->CONST_FALSE);
+                               in_a.resize(GetSize(y));
+
+                               if (GetSize(in_b))
+                               {
+                                       while (GetSize(in_b) < GetSize(y))
+                                               in_b.push_back(port.is_signed && !in_b.empty() ? in_b.back() : ez->CONST_FALSE);
+                                       in_b.resize(GetSize(y));
+
+                                       for (int i = 0; i < GetSize(in_b); i++) {
+                                               std::vector<int> shifted_a(in_a.size(), ez->CONST_FALSE);
+                                               for (int j = i; j < int(in_a.size()); j++)
+                                                       shifted_a.at(j) = in_a.at(j-i);
+                                               if (port.do_subtract)
+                                                       tmp = ez->vec_ite(in_b.at(i), ez->vec_sub(tmp, shifted_a), tmp);
+                                               else
+                                                       tmp = ez->vec_ite(in_b.at(i), ez->vec_add(tmp, shifted_a), tmp);
+                                       }
+                               }
+                               else
+                               {
+                                       if (port.do_subtract)
+                                               tmp = ez->vec_sub(tmp, in_a);
+                                       else
+                                               tmp = ez->vec_add(tmp, in_a);
+                               }
+                       }
+
+                       for (int i = 0; i < GetSize(b); i++) {
+                               std::vector<int> val(GetSize(y), ez->CONST_FALSE);
+                               val.at(0) = b.at(i);
+                               tmp = ez->vec_add(tmp, val);
+                       }
+
+                       if (model_undef)
+                       {
+                               std::vector<int> undef_a = importUndefSigSpec(cell->getPort("\\A"), timestep);
+                               std::vector<int> undef_b = importUndefSigSpec(cell->getPort("\\B"), timestep);
+
+                               int undef_any_a = ez->expression(ezSAT::OpOr, undef_a);
+                               int undef_any_b = ez->expression(ezSAT::OpOr, undef_b);
+
+                               std::vector<int> undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep);
+                               ez->assume(ez->vec_eq(undef_y, std::vector<int>(GetSize(y), ez->OR(undef_any_a, undef_any_b))));
+
+                               undefGating(y, tmp, undef_y);
+                       }
+                       else
+                               ez->assume(ez->vec_eq(y, tmp));
+
+                       return true;
+               }
+
                if (cell->type == "$div" || cell->type == "$mod")
                {
-                       std::vector<int> a = importDefSigSpec(cell->get("\\A"), timestep);
-                       std::vector<int> b = importDefSigSpec(cell->get("\\B"), timestep);
-                       std::vector<int> y = importDefSigSpec(cell->get("\\Y"), timestep);
+                       std::vector<int> a = importDefSigSpec(cell->getPort("\\A"), timestep);
+                       std::vector<int> b = importDefSigSpec(cell->getPort("\\B"), timestep);
+                       std::vector<int> y = importDefSigSpec(cell->getPort("\\Y"), timestep);
                        extendSignalWidth(a, b, y, cell);
 
                        std::vector<int> yy = model_undef ? ez->vec_var(y.size()) : y;
@@ -711,14 +952,14 @@ struct SatGen
                        }
 
                        std::vector<int> chain_buf = a_u;
-                       std::vector<int> y_u(a_u.size(), ez->FALSE);
+                       std::vector<int> y_u(a_u.size(), ez->CONST_FALSE);
                        for (int i = int(a.size())-1; i >= 0; i--)
                        {
-                               chain_buf.insert(chain_buf.end(), chain_buf.size(), ez->FALSE);
+                               chain_buf.insert(chain_buf.end(), chain_buf.size(), ez->CONST_FALSE);
 
-                               std::vector<int> b_shl(i, ez->FALSE);
+                               std::vector<int> b_shl(i, ez->CONST_FALSE);
                                b_shl.insert(b_shl.end(), b_u.begin(), b_u.end());
-                               b_shl.insert(b_shl.end(), chain_buf.size()-b_shl.size(), ez->FALSE);
+                               b_shl.insert(b_shl.end(), chain_buf.size()-b_shl.size(), ez->CONST_FALSE);
 
                                y_u.at(i) = ez->vec_ge_unsigned(chain_buf, b_shl);
                                chain_buf = ez->vec_ite(y_u.at(i), ez->vec_sub(chain_buf, b_shl), chain_buf);
@@ -745,46 +986,312 @@ struct SatGen
                                std::vector<int> div_zero_result;
                                if (cell->type == "$div") {
                                        if (cell->parameters["\\A_SIGNED"].as_bool() && cell->parameters["\\B_SIGNED"].as_bool()) {
-                                               std::vector<int> all_ones(y.size(), ez->TRUE);
-                                               std::vector<int> only_first_one(y.size(), ez->FALSE);
-                                               only_first_one.at(0) = ez->TRUE;
+                                               std::vector<int> all_ones(y.size(), ez->CONST_TRUE);
+                                               std::vector<int> only_first_one(y.size(), ez->CONST_FALSE);
+                                               only_first_one.at(0) = ez->CONST_TRUE;
                                                div_zero_result = ez->vec_ite(a.back(), only_first_one, all_ones);
                                        } else {
-                                               div_zero_result.insert(div_zero_result.end(), cell->get("\\A").size(), ez->TRUE);
-                                               div_zero_result.insert(div_zero_result.end(), y.size() - div_zero_result.size(), ez->FALSE);
+                                               div_zero_result.insert(div_zero_result.end(), cell->getPort("\\A").size(), ez->CONST_TRUE);
+                                               div_zero_result.insert(div_zero_result.end(), y.size() - div_zero_result.size(), ez->CONST_FALSE);
                                        }
                                } else {
-                                       int copy_a_bits = std::min(cell->get("\\A").size(), cell->get("\\B").size());
+                                       int copy_a_bits = min(cell->getPort("\\A").size(), cell->getPort("\\B").size());
                                        div_zero_result.insert(div_zero_result.end(), a.begin(), a.begin() + copy_a_bits);
                                        if (cell->parameters["\\A_SIGNED"].as_bool() && cell->parameters["\\B_SIGNED"].as_bool())
                                                div_zero_result.insert(div_zero_result.end(), y.size() - div_zero_result.size(), div_zero_result.back());
                                        else
-                                               div_zero_result.insert(div_zero_result.end(), y.size() - div_zero_result.size(), ez->FALSE);
+                                               div_zero_result.insert(div_zero_result.end(), y.size() - div_zero_result.size(), ez->CONST_FALSE);
                                }
                                ez->assume(ez->vec_eq(yy, ez->vec_ite(ez->expression(ezSAT::OpOr, b), y_tmp, div_zero_result)));
                        }
 
                        if (model_undef) {
                                log_assert(arith_undef_handled);
-                               std::vector<int> undef_y = importUndefSigSpec(cell->get("\\Y"), timestep);
+                               std::vector<int> undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep);
+                               undefGating(y, yy, undef_y);
+                       }
+                       return true;
+               }
+
+               if (cell->type == "$lut")
+               {
+                       std::vector<int> a = importDefSigSpec(cell->getPort("\\A"), timestep);
+                       std::vector<int> y = importDefSigSpec(cell->getPort("\\Y"), timestep);
+
+                       std::vector<int> lut;
+                       for (auto bit : cell->getParam("\\LUT").bits)
+                               lut.push_back(bit == RTLIL::S1 ? ez->CONST_TRUE : ez->CONST_FALSE);
+                       while (GetSize(lut) < (1 << GetSize(a)))
+                               lut.push_back(ez->CONST_FALSE);
+                       lut.resize(1 << GetSize(a));
+
+                       if (model_undef)
+                       {
+                               std::vector<int> undef_a = importUndefSigSpec(cell->getPort("\\A"), timestep);
+                               std::vector<int> t(lut), u(GetSize(t), ez->CONST_FALSE);
+
+                               for (int i = GetSize(a)-1; i >= 0; i--)
+                               {
+                                       std::vector<int> t0(t.begin(), t.begin() + GetSize(t)/2);
+                                       std::vector<int> t1(t.begin() + GetSize(t)/2, t.end());
+
+                                       std::vector<int> u0(u.begin(), u.begin() + GetSize(u)/2);
+                                       std::vector<int> u1(u.begin() + GetSize(u)/2, u.end());
+
+                                       t = ez->vec_ite(a[i], t1, t0);
+                                       u = ez->vec_ite(undef_a[i], ez->vec_or(ez->vec_xor(t0, t1), ez->vec_or(u0, u1)), ez->vec_ite(a[i], u1, u0));
+                               }
+
+                               log_assert(GetSize(t) == 1);
+                               log_assert(GetSize(u) == 1);
+                               undefGating(y, t, u);
+                               ez->assume(ez->vec_eq(importUndefSigSpec(cell->getPort("\\Y"), timestep), u));
+                       }
+                       else
+                       {
+                               std::vector<int> t = lut;
+                               for (int i = GetSize(a)-1; i >= 0; i--)
+                               {
+                                       std::vector<int> t0(t.begin(), t.begin() + GetSize(t)/2);
+                                       std::vector<int> t1(t.begin() + GetSize(t)/2, t.end());
+                                       t = ez->vec_ite(a[i], t1, t0);
+                               }
+
+                               log_assert(GetSize(t) == 1);
+                               ez->assume(ez->vec_eq(y, t));
+                       }
+                       return true;
+               }
+
+               if (cell->type == "$sop")
+               {
+                       std::vector<int> a = importDefSigSpec(cell->getPort("\\A"), timestep);
+                       int y = importDefSigSpec(cell->getPort("\\Y"), timestep).at(0);
+
+                       int width = cell->getParam("\\WIDTH").as_int();
+                       int depth = cell->getParam("\\DEPTH").as_int();
+
+                       vector<State> table_raw = cell->getParam("\\TABLE").bits;
+                       while (GetSize(table_raw) < 2*width*depth)
+                               table_raw.push_back(State::S0);
+
+                       vector<vector<int>> table(depth);
+
+                       for (int i = 0; i < depth; i++)
+                       for (int j = 0; j < width; j++)
+                       {
+                               bool pat0 = (table_raw[2*width*i + 2*j + 0] == State::S1);
+                               bool pat1 = (table_raw[2*width*i + 2*j + 1] == State::S1);
+
+                               if (pat0 && !pat1)
+                                       table.at(i).push_back(0);
+                               else if (!pat0 && pat1)
+                                       table.at(i).push_back(1);
+                               else
+                                       table.at(i).push_back(-1);
+                       }
+
+                       if (model_undef)
+                       {
+                               std::vector<int> products, undef_products;
+                               std::vector<int> undef_a = importUndefSigSpec(cell->getPort("\\A"), timestep);
+                               int undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep).at(0);
+
+                               for (int i = 0; i < depth; i++)
+                               {
+                                       std::vector<int> cmp_a, cmp_ua, cmp_b;
+
+                                       for (int j = 0; j < width; j++)
+                                               if (table.at(i).at(j) >= 0) {
+                                                       cmp_a.push_back(a.at(j));
+                                                       cmp_ua.push_back(undef_a.at(j));
+                                                       cmp_b.push_back(table.at(i).at(j) ? ez->CONST_TRUE : ez->CONST_FALSE);
+                                               }
+
+                                       std::vector<int> masked_a = ez->vec_or(cmp_a, cmp_ua);
+                                       std::vector<int> masked_b = ez->vec_or(cmp_b, cmp_ua);
+
+                                       int masked_eq = ez->vec_eq(masked_a, masked_b);
+                                       int any_undef = ez->expression(ezSAT::OpOr, cmp_ua);
+
+                                       undef_products.push_back(ez->AND(any_undef, masked_eq));
+                                       products.push_back(ez->AND(ez->NOT(any_undef), masked_eq));
+                               }
+
+                               int yy = ez->expression(ezSAT::OpOr, products);
+                               ez->SET(undef_y, ez->AND(ez->NOT(yy), ez->expression(ezSAT::OpOr, undef_products)));
+                               undefGating(y, yy, undef_y);
+                       }
+                       else
+                       {
+                               std::vector<int> products;
+
+                               for (int i = 0; i < depth; i++)
+                               {
+                                       std::vector<int> cmp_a, cmp_b;
+
+                                       for (int j = 0; j < width; j++)
+                                               if (table.at(i).at(j) >= 0) {
+                                                       cmp_a.push_back(a.at(j));
+                                                       cmp_b.push_back(table.at(i).at(j) ? ez->CONST_TRUE : ez->CONST_FALSE);
+                                               }
+
+                                       products.push_back(ez->vec_eq(cmp_a, cmp_b));
+                               }
+
+                               ez->SET(y, ez->expression(ezSAT::OpOr, products));
+                       }
+
+                       return true;
+               }
+
+               if (cell->type == "$fa")
+               {
+                       std::vector<int> a = importDefSigSpec(cell->getPort("\\A"), timestep);
+                       std::vector<int> b = importDefSigSpec(cell->getPort("\\B"), timestep);
+                       std::vector<int> c = importDefSigSpec(cell->getPort("\\C"), timestep);
+                       std::vector<int> y = importDefSigSpec(cell->getPort("\\Y"), timestep);
+                       std::vector<int> x = importDefSigSpec(cell->getPort("\\X"), timestep);
+
+                       std::vector<int> yy = model_undef ? ez->vec_var(y.size()) : y;
+                       std::vector<int> xx = model_undef ? ez->vec_var(x.size()) : x;
+
+                       std::vector<int> t1 = ez->vec_xor(a, b);
+                       ez->assume(ez->vec_eq(yy, ez->vec_xor(t1, c)));
+
+                       std::vector<int> t2 = ez->vec_and(a, b);
+                       std::vector<int> t3 = ez->vec_and(c, t1);
+                       ez->assume(ez->vec_eq(xx, ez->vec_or(t2, t3)));
+
+                       if (model_undef)
+                       {
+                               std::vector<int> undef_a = importUndefSigSpec(cell->getPort("\\A"), timestep);
+                               std::vector<int> undef_b = importUndefSigSpec(cell->getPort("\\B"), timestep);
+                               std::vector<int> undef_c = importUndefSigSpec(cell->getPort("\\C"), timestep);
+
+                               std::vector<int> undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep);
+                               std::vector<int> undef_x = importUndefSigSpec(cell->getPort("\\X"), timestep);
+
+                               ez->assume(ez->vec_eq(undef_y, ez->vec_or(ez->vec_or(undef_a, undef_b), undef_c)));
+                               ez->assume(ez->vec_eq(undef_x, undef_y));
+
                                undefGating(y, yy, undef_y);
+                               undefGating(x, xx, undef_x);
+                       }
+                       return true;
+               }
+
+               if (cell->type == "$lcu")
+               {
+                       std::vector<int> p = importDefSigSpec(cell->getPort("\\P"), timestep);
+                       std::vector<int> g = importDefSigSpec(cell->getPort("\\G"), timestep);
+                       std::vector<int> ci = importDefSigSpec(cell->getPort("\\CI"), timestep);
+                       std::vector<int> co = importDefSigSpec(cell->getPort("\\CO"), timestep);
+
+                       std::vector<int> yy = model_undef ? ez->vec_var(co.size()) : co;
+
+                       for (int i = 0; i < GetSize(co); i++)
+                               ez->SET(yy[i], ez->OR(g[i], ez->AND(p[i], i ? yy[i-1] : ci[0])));
+
+                       if (model_undef)
+                       {
+                               std::vector<int> undef_p = importUndefSigSpec(cell->getPort("\\P"), timestep);
+                               std::vector<int> undef_g = importUndefSigSpec(cell->getPort("\\G"), timestep);
+                               std::vector<int> undef_ci = importUndefSigSpec(cell->getPort("\\CI"), timestep);
+                               std::vector<int> undef_co = importUndefSigSpec(cell->getPort("\\CO"), timestep);
+
+                               int undef_any_p = ez->expression(ezSAT::OpOr, undef_p);
+                               int undef_any_g = ez->expression(ezSAT::OpOr, undef_g);
+                               int undef_any_ci = ez->expression(ezSAT::OpOr, undef_ci);
+                               int undef_co_bit = ez->OR(undef_any_p, undef_any_g, undef_any_ci);
+
+                               std::vector<int> undef_co_bits(undef_co.size(), undef_co_bit);
+                               ez->assume(ez->vec_eq(undef_co_bits, undef_co));
+
+                               undefGating(co, yy, undef_co);
+                       }
+                       return true;
+               }
+
+               if (cell->type == "$alu")
+               {
+                       std::vector<int> a = importDefSigSpec(cell->getPort("\\A"), timestep);
+                       std::vector<int> b = importDefSigSpec(cell->getPort("\\B"), timestep);
+                       std::vector<int> y = importDefSigSpec(cell->getPort("\\Y"), timestep);
+                       std::vector<int> x = importDefSigSpec(cell->getPort("\\X"), timestep);
+                       std::vector<int> ci = importDefSigSpec(cell->getPort("\\CI"), timestep);
+                       std::vector<int> bi = importDefSigSpec(cell->getPort("\\BI"), timestep);
+                       std::vector<int> co = importDefSigSpec(cell->getPort("\\CO"), timestep);
+
+                       extendSignalWidth(a, b, y, cell);
+                       extendSignalWidth(a, b, x, cell);
+                       extendSignalWidth(a, b, co, cell);
+
+                       std::vector<int> def_y = model_undef ? ez->vec_var(y.size()) : y;
+                       std::vector<int> def_x = model_undef ? ez->vec_var(x.size()) : x;
+                       std::vector<int> def_co = model_undef ? ez->vec_var(co.size()) : co;
+
+                       log_assert(GetSize(y) == GetSize(x));
+                       log_assert(GetSize(y) == GetSize(co));
+                       log_assert(GetSize(ci) == 1);
+                       log_assert(GetSize(bi) == 1);
+
+                       for (int i = 0; i < GetSize(y); i++)
+                       {
+                               int s1 = a.at(i), s2 = ez->XOR(b.at(i), bi.at(0)), s3 = i ? co.at(i-1) : ci.at(0);
+                               ez->SET(def_x.at(i), ez->XOR(s1, s2));
+                               ez->SET(def_y.at(i), ez->XOR(def_x.at(i), s3));
+                               ez->SET(def_co.at(i), ez->OR(ez->AND(s1, s2), ez->AND(s1, s3), ez->AND(s2, s3)));
+                       }
+
+                       if (model_undef)
+                       {
+                               std::vector<int> undef_a = importUndefSigSpec(cell->getPort("\\A"), timestep);
+                               std::vector<int> undef_b = importUndefSigSpec(cell->getPort("\\B"), timestep);
+                               std::vector<int> undef_ci = importUndefSigSpec(cell->getPort("\\CI"), timestep);
+                               std::vector<int> undef_bi = importUndefSigSpec(cell->getPort("\\BI"), timestep);
+
+                               std::vector<int> undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep);
+                               std::vector<int> undef_x = importUndefSigSpec(cell->getPort("\\X"), timestep);
+                               std::vector<int> undef_co = importUndefSigSpec(cell->getPort("\\CO"), timestep);
+
+                               extendSignalWidth(undef_a, undef_b, undef_y, cell);
+                               extendSignalWidth(undef_a, undef_b, undef_x, cell);
+                               extendSignalWidth(undef_a, undef_b, undef_co, cell);
+
+                               std::vector<int> all_inputs_undef;
+                               all_inputs_undef.insert(all_inputs_undef.end(), undef_a.begin(), undef_a.end());
+                               all_inputs_undef.insert(all_inputs_undef.end(), undef_b.begin(), undef_b.end());
+                               all_inputs_undef.insert(all_inputs_undef.end(), undef_ci.begin(), undef_ci.end());
+                               all_inputs_undef.insert(all_inputs_undef.end(), undef_bi.begin(), undef_bi.end());
+                               int undef_any = ez->expression(ezSAT::OpOr, all_inputs_undef);
+
+                               for (int i = 0; i < GetSize(undef_y); i++) {
+                                       ez->SET(undef_y.at(i), undef_any);
+                                       ez->SET(undef_x.at(i), ez->OR(undef_a.at(i), undef_b.at(i), undef_bi.at(0)));
+                                       ez->SET(undef_co.at(i), undef_any);
+                               }
+
+                               undefGating(y, def_y, undef_y);
+                               undefGating(x, def_x, undef_x);
+                               undefGating(co, def_co, undef_co);
                        }
                        return true;
                }
 
                if (cell->type == "$slice")
                {
-                       RTLIL::SigSpec a = cell->get("\\A");
-                       RTLIL::SigSpec y = cell->get("\\Y");
+                       RTLIL::SigSpec a = cell->getPort("\\A");
+                       RTLIL::SigSpec y = cell->getPort("\\Y");
                        ez->assume(signals_eq(a.extract(cell->parameters.at("\\OFFSET").as_int(), y.size()), y, timestep));
                        return true;
                }
 
                if (cell->type == "$concat")
                {
-                       RTLIL::SigSpec a = cell->get("\\A");
-                       RTLIL::SigSpec b = cell->get("\\B");
-                       RTLIL::SigSpec y = cell->get("\\Y");
+                       RTLIL::SigSpec a = cell->getPort("\\A");
+                       RTLIL::SigSpec b = cell->getPort("\\B");
+                       RTLIL::SigSpec y = cell->getPort("\\Y");
 
                        RTLIL::SigSpec ab = a;
                        ab.append(b);
@@ -793,24 +1300,24 @@ struct SatGen
                        return true;
                }
 
-               if (timestep > 0 && (cell->type == "$dff" || cell->type == "$_DFF_N_" || cell->type == "$_DFF_P_"))
+               if (timestep > 0 && cell->type.in("$ff", "$dff", "$_FF_", "$_DFF_N_", "$_DFF_P_"))
                {
                        if (timestep == 1)
                        {
-                               initial_state.add((*sigmap)(cell->get("\\Q")));
+                               initial_state.add((*sigmap)(cell->getPort("\\Q")));
                        }
                        else
                        {
-                               std::vector<int> d = importDefSigSpec(cell->get("\\D"), timestep-1);
-                               std::vector<int> q = importDefSigSpec(cell->get("\\Q"), timestep);
+                               std::vector<int> d = importDefSigSpec(cell->getPort("\\D"), timestep-1);
+                               std::vector<int> q = importDefSigSpec(cell->getPort("\\Q"), timestep);
 
                                std::vector<int> qq = model_undef ? ez->vec_var(q.size()) : q;
                                ez->assume(ez->vec_eq(d, qq));
 
                                if (model_undef)
                                {
-                                       std::vector<int> undef_d = importUndefSigSpec(cell->get("\\D"), timestep-1);
-                                       std::vector<int> undef_q = importUndefSigSpec(cell->get("\\Q"), timestep);
+                                       std::vector<int> undef_d = importUndefSigSpec(cell->getPort("\\D"), timestep-1);
+                                       std::vector<int> undef_q = importUndefSigSpec(cell->getPort("\\Q"), timestep);
 
                                        ez->assume(ez->vec_eq(undef_d, undef_q));
                                        undefGating(q, qq, undef_q);
@@ -819,11 +1326,84 @@ struct SatGen
                        return true;
                }
 
+               if (cell->type == "$anyconst")
+               {
+                       if (timestep < 2)
+                               return true;
+
+                       std::vector<int> d = importDefSigSpec(cell->getPort("\\Y"), timestep-1);
+                       std::vector<int> q = importDefSigSpec(cell->getPort("\\Y"), timestep);
+
+                       std::vector<int> qq = model_undef ? ez->vec_var(q.size()) : q;
+                       ez->assume(ez->vec_eq(d, qq));
+
+                       if (model_undef)
+                       {
+                               std::vector<int> undef_d = importUndefSigSpec(cell->getPort("\\Y"), timestep-1);
+                               std::vector<int> undef_q = importUndefSigSpec(cell->getPort("\\Y"), timestep);
+
+                               ez->assume(ez->vec_eq(undef_d, undef_q));
+                               undefGating(q, qq, undef_q);
+                       }
+                       return true;
+               }
+
+               if (cell->type == "$anyseq")
+               {
+                       return true;
+               }
+
+               if (cell->type == "$_BUF_" || cell->type == "$equiv")
+               {
+                       std::vector<int> a = importDefSigSpec(cell->getPort("\\A"), timestep);
+                       std::vector<int> y = importDefSigSpec(cell->getPort("\\Y"), timestep);
+                       extendSignalWidthUnary(a, y, cell);
+
+                       std::vector<int> yy = model_undef ? ez->vec_var(y.size()) : y;
+                       ez->assume(ez->vec_eq(a, yy));
+
+                       if (model_undef) {
+                               std::vector<int> undef_a = importUndefSigSpec(cell->getPort("\\A"), timestep);
+                               std::vector<int> undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep);
+                               extendSignalWidthUnary(undef_a, undef_y, cell, false);
+                               ez->assume(ez->vec_eq(undef_a, undef_y));
+                               undefGating(y, yy, undef_y);
+                       }
+                       return true;
+               }
+
+               if (cell->type == "$initstate")
+               {
+                       auto key = make_pair(prefix, timestep);
+                       if (initstates.count(key) == 0)
+                               initstates[key] = false;
+
+                       std::vector<int> y = importDefSigSpec(cell->getPort("\\Y"), timestep);
+                       log_assert(GetSize(y) == 1);
+                       ez->SET(y[0], initstates[key] ? ez->CONST_TRUE : ez->CONST_FALSE);
+
+                       if (model_undef) {
+                               std::vector<int> undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep);
+                               log_assert(GetSize(undef_y) == 1);
+                               ez->SET(undef_y[0], ez->CONST_FALSE);
+                       }
+
+                       return true;
+               }
+
                if (cell->type == "$assert")
                {
                        std::string pf = prefix + (timestep == -1 ? "" : stringf("@%d:", timestep));
-                       asserts_a[pf].append((*sigmap)(cell->get("\\A")));
-                       asserts_en[pf].append((*sigmap)(cell->get("\\EN")));
+                       asserts_a[pf].append((*sigmap)(cell->getPort("\\A")));
+                       asserts_en[pf].append((*sigmap)(cell->getPort("\\EN")));
+                       return true;
+               }
+
+               if (cell->type == "$assume")
+               {
+                       std::string pf = prefix + (timestep == -1 ? "" : stringf("@%d:", timestep));
+                       assumes_a[pf].append((*sigmap)(cell->getPort("\\A")));
+                       assumes_en[pf].append((*sigmap)(cell->getPort("\\EN")));
                        return true;
                }
 
@@ -833,5 +1413,6 @@ struct SatGen
        }
 };
 
-#endif
+YOSYS_NAMESPACE_END
 
+#endif