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/pcf.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/pcf.cc')
| -rw-r--r-- | ice40/pcf.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ice40/pcf.cc b/ice40/pcf.cc index a854a780..8c61eb23 100644 --- a/ice40/pcf.cc +++ b/ice40/pcf.cc @@ -51,15 +51,15 @@ bool apply_pcf(Context *ctx, std::string filename, std::istream &in) bool nowarn = false; if (cmd == "set_io") { size_t args_end = 1; - std::vector<std::pair<IdString, std::string>> extra_attrs; + std::vector<std::pair<IdString, Property>> extra_attrs; while (args_end < words.size() && words.at(args_end).at(0) == '-') { const auto &setting = words.at(args_end); if (setting == "-pullup") { const auto &value = words.at(++args_end); if (value == "yes" || value == "1") - extra_attrs.emplace_back(std::make_pair(ctx->id("PULLUP"), "1")); + extra_attrs.emplace_back(std::make_pair(ctx->id("PULLUP"), Property::State::S1)); else if (value == "no" || value == "0") - extra_attrs.emplace_back(std::make_pair(ctx->id("PULLUP"), "0")); + extra_attrs.emplace_back(std::make_pair(ctx->id("PULLUP"), Property::State::S0)); else log_error("Invalid value '%s' for -pullup (on line %d)\n", value.c_str(), lineno); } else if (setting == "-pullup_resistor") { @@ -96,7 +96,7 @@ bool apply_pcf(Context *ctx, std::string filename, std::istream &in) log_error("duplicate pin constraint on '%s' (on line %d)\n", cell.c_str(), lineno); fnd_cell->second->attrs[ctx->id("BEL")] = ctx->getBelName(pin_bel).str(ctx); log_info("constrained '%s' to bel '%s'\n", cell.c_str(), - fnd_cell->second->attrs[ctx->id("BEL")].c_str()); + fnd_cell->second->attrs[ctx->id("BEL")].as_string().c_str()); for (const auto &attr : extra_attrs) fnd_cell->second->attrs[attr.first] = attr.second; } |