diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-06-18 13:13:51 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2018-06-18 13:13:51 +0200 |
| commit | 2f5e9542c2d9132b2c01d4dbc8c4d2dff97c60cf (patch) | |
| tree | da4733a6f5865d6067b663d001e1cf7d19170b88 /ice40 | |
| parent | e0aa5c969e9dc84d5d39f51c5ffe0fa9b7316838 (diff) | |
| parent | bb4c70381338e1a84920cc2d62648910528fee1c (diff) | |
| download | nextpnr-2f5e9542c2d9132b2c01d4dbc8c4d2dff97c60cf.tar.gz nextpnr-2f5e9542c2d9132b2c01d4dbc8c4d2dff97c60cf.tar.bz2 nextpnr-2f5e9542c2d9132b2c01d4dbc8c4d2dff97c60cf.zip | |
Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr
Diffstat (limited to 'ice40')
| -rw-r--r-- | ice40/cells.cc | 3 | ||||
| -rw-r--r-- | ice40/chip.h | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/ice40/cells.cc b/ice40/cells.cc index b11a2a77..fb264051 100644 --- a/ice40/cells.cc +++ b/ice40/cells.cc @@ -147,7 +147,8 @@ void dff_to_lc(CellInfo *dff, CellInfo *lc, bool pass_thru_lut) if (citer != config.end()) { if ((config.end() - citer) >= 2) { - assert(*(citer++) == 'S'); + char c = *(citer++); + assert(c == 'S'); lc->params["ASYNC_SR"] = "0"; } else { lc->params["ASYNC_SR"] = "1"; diff --git a/ice40/chip.h b/ice40/chip.h index 9d647756..d3eb7c70 100644 --- a/ice40/chip.h +++ b/ice40/chip.h @@ -743,4 +743,15 @@ struct Chip NEXTPNR_NAMESPACE_END +namespace std { +template <> struct hash<NEXTPNR_NAMESPACE_PREFIX BelType> +{ + std::size_t operator()(NEXTPNR_NAMESPACE_PREFIX BelType bt) const + noexcept + { + return std::hash<int>()(int(bt)); + } +}; +} // namespace std + #endif |