mirror of https://github.com/YosysHQ/yosys.git
Fix static initialization, fixes mingw build
This commit is contained in:
parent
da0682b99a
commit
4db820e9d4
|
@ -34,26 +34,6 @@ struct LUTType {
|
||||||
IdString output_param;
|
IdString output_param;
|
||||||
};
|
};
|
||||||
|
|
||||||
static const dict<IdString, LUTType> lut_types = {
|
|
||||||
{ID(CC_LUT2), {{
|
|
||||||
{ID(I0), {0, ID(INIT)}},
|
|
||||||
{ID(I1), {1, ID(INIT)}},
|
|
||||||
}, ID(INIT)}},
|
|
||||||
{ID(CC_L2T4), {{
|
|
||||||
{ID(I0), {0, ID(INIT_L00)}},
|
|
||||||
{ID(I1), {1, ID(INIT_L00)}},
|
|
||||||
{ID(I2), {0, ID(INIT_L01)}},
|
|
||||||
{ID(I3), {1, ID(INIT_L01)}},
|
|
||||||
}, ID(INIT_L10)}},
|
|
||||||
{ID(CC_L2T5), {{
|
|
||||||
{ID(I0), {0, ID(INIT_L02)}},
|
|
||||||
{ID(I1), {1, ID(INIT_L02)}},
|
|
||||||
{ID(I2), {0, ID(INIT_L03)}},
|
|
||||||
{ID(I3), {1, ID(INIT_L03)}},
|
|
||||||
{ID(I4), {0, ID(INIT_L20)}},
|
|
||||||
}, ID(INIT_L20)}},
|
|
||||||
};
|
|
||||||
|
|
||||||
struct FoldInvWorker {
|
struct FoldInvWorker {
|
||||||
FoldInvWorker(Module *module) : module(module), sigmap(module) {};
|
FoldInvWorker(Module *module) : module(module), sigmap(module) {};
|
||||||
Module *module;
|
Module *module;
|
||||||
|
@ -64,6 +44,27 @@ struct FoldInvWorker {
|
||||||
// Mapping from inverter input to inverter
|
// Mapping from inverter input to inverter
|
||||||
dict<SigBit, Cell*> inverter_input;
|
dict<SigBit, Cell*> inverter_input;
|
||||||
|
|
||||||
|
const dict<IdString, LUTType> lut_types = {
|
||||||
|
{ID(CC_LUT2), {{
|
||||||
|
{ID(I0), {0, ID(INIT)}},
|
||||||
|
{ID(I1), {1, ID(INIT)}},
|
||||||
|
}, ID(INIT)}},
|
||||||
|
{ID(CC_L2T4), {{
|
||||||
|
{ID(I0), {0, ID(INIT_L00)}},
|
||||||
|
{ID(I1), {1, ID(INIT_L00)}},
|
||||||
|
{ID(I2), {0, ID(INIT_L01)}},
|
||||||
|
{ID(I3), {1, ID(INIT_L01)}},
|
||||||
|
}, ID(INIT_L10)}},
|
||||||
|
{ID(CC_L2T5), {{
|
||||||
|
{ID(I0), {0, ID(INIT_L02)}},
|
||||||
|
{ID(I1), {1, ID(INIT_L02)}},
|
||||||
|
{ID(I2), {0, ID(INIT_L03)}},
|
||||||
|
{ID(I3), {1, ID(INIT_L03)}},
|
||||||
|
{ID(I4), {0, ID(INIT_L20)}},
|
||||||
|
}, ID(INIT_L20)}},
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
void find_inverted_bits()
|
void find_inverted_bits()
|
||||||
{
|
{
|
||||||
for (auto cell : module->selected_cells()) {
|
for (auto cell : module->selected_cells()) {
|
||||||
|
|
Loading…
Reference in New Issue