diff options
| author | David Shah <dave@ds0.me> | 2019-08-07 10:40:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-07 10:40:25 +0100 |
| commit | eaef3b600e2e8c4633db25edd4ad017b59a1cc79 (patch) | |
| tree | 66a6e88614d99dfdf8c15ac3a1d1a13339784f9c /ice40/chains.cc | |
| parent | 1ecf271cb32f9f78ea082788c6534f2523144d01 (diff) | |
| parent | 8eef6ac55e48aa181d1e268fcec004a58f9d8db4 (diff) | |
| download | nextpnr-eaef3b600e2e8c4633db25edd4ad017b59a1cc79.tar.gz nextpnr-eaef3b600e2e8c4633db25edd4ad017b59a1cc79.tar.bz2 nextpnr-eaef3b600e2e8c4633db25edd4ad017b59a1cc79.zip | |
Merge pull request #306 from YosysHQ/dave/jsonfix
Major improvements to constants/Property
Diffstat (limited to 'ice40/chains.cc')
| -rw-r--r-- | ice40/chains.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ice40/chains.cc b/ice40/chains.cc index b3b54d6b..1b556f65 100644 --- a/ice40/chains.cc +++ b/ice40/chains.cc @@ -91,8 +91,8 @@ class ChainConstrainer { NPNR_ASSERT(cout_port.net != nullptr); std::unique_ptr<CellInfo> lc = create_ice_cell(ctx, ctx->id("ICESTORM_LC")); - lc->params[ctx->id("LUT_INIT")] = "65280"; // 0xff00: O = I3 - lc->params[ctx->id("CARRY_ENABLE")] = "1"; + lc->params[ctx->id("LUT_INIT")] = Property(65280, 16); // 0xff00: O = I3 + lc->params[ctx->id("CARRY_ENABLE")] = Property::State::S1; lc->ports.at(id_O).net = cout_port.net; std::unique_ptr<NetInfo> co_i3_net(new NetInfo()); co_i3_net->name = ctx->id(lc->name.str(ctx) + "$I3"); @@ -167,9 +167,9 @@ class ChainConstrainer { NPNR_ASSERT(cin_port.net != nullptr); std::unique_ptr<CellInfo> lc = create_ice_cell(ctx, ctx->id("ICESTORM_LC")); - lc->params[ctx->id("CARRY_ENABLE")] = "1"; - lc->params[ctx->id("CIN_CONST")] = "1"; - lc->params[ctx->id("CIN_SET")] = "1"; + lc->params[ctx->id("CARRY_ENABLE")] = Property::State::S1; + lc->params[ctx->id("CIN_CONST")] = Property::State::S1; + lc->params[ctx->id("CIN_SET")] = Property::State::S1; lc->ports.at(ctx->id("I1")).net = cin_port.net; cin_port.net->users.erase(std::remove_if(cin_port.net->users.begin(), cin_port.net->users.end(), [cin_cell, cin_port](const PortRef &usr) { |