diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-06-17 14:30:26 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2018-06-17 14:30:26 +0200 |
| commit | 3b5c33d685b1330747612e4cebb422b09b2bd8de (patch) | |
| tree | 78e2ae6163b15b6e8f9fa194e8e13cba8bbe30c5 /ice40/chip.cc | |
| parent | 84defd3fee71ab48c46fa1ba7c4acd49fba3cc5f (diff) | |
| download | nextpnr-3b5c33d685b1330747612e4cebb422b09b2bd8de.tar.gz nextpnr-3b5c33d685b1330747612e4cebb422b09b2bd8de.tar.bz2 nextpnr-3b5c33d685b1330747612e4cebb422b09b2bd8de.zip | |
Move WireInfoPOD into ChipDB binary blob
Signed-off-by: Clifford Wolf <clifford@clifford.at>
Diffstat (limited to 'ice40/chip.cc')
| -rw-r--r-- | ice40/chip.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ice40/chip.cc b/ice40/chip.cc index 82756531..7b1afd2e 100644 --- a/ice40/chip.cc +++ b/ice40/chip.cc @@ -209,7 +209,7 @@ WireId Chip::getWireByName(IdString name) const if (wire_by_name.empty()) { for (int i = 0; i < chip_info.num_wires; i++) - wire_by_name[chip_info.wire_data[i].name] = i; + wire_by_name[chip_info.wire_data[i].name.get()] = i; } auto it = wire_by_name.find(name); @@ -248,11 +248,11 @@ IdString Chip::getPipName(PipId pip) const int y = chip_info.pip_data[pip.index].y; std::string src_name = - chip_info.wire_data[chip_info.pip_data[pip.index].src].name; + chip_info.wire_data[chip_info.pip_data[pip.index].src].name.get(); std::replace(src_name.begin(), src_name.end(), '/', '.'); std::string dst_name = - chip_info.wire_data[chip_info.pip_data[pip.index].dst].name; + chip_info.wire_data[chip_info.pip_data[pip.index].dst].name.get(); std::replace(dst_name.begin(), dst_name.end(), '/', '.'); return "X" + std::to_string(x) + "/Y" + std::to_string(y) + "/" + src_name + |