diff options
| author | David Shah <davey1576@gmail.com> | 2018-07-08 12:48:25 +0200 |
|---|---|---|
| committer | David Shah <davey1576@gmail.com> | 2018-07-11 10:42:09 +0200 |
| commit | 59cb1600d9995eb52af41caea7bc364dcf47ea35 (patch) | |
| tree | bc23f8ff53aa5eeb6283e58e6f4f9554221f81cc /ecp5 | |
| parent | 93f379a488ae9f4c103c6d61cad49fba8012bc5a (diff) | |
| download | nextpnr-59cb1600d9995eb52af41caea7bc364dcf47ea35.tar.gz nextpnr-59cb1600d9995eb52af41caea7bc364dcf47ea35.tar.bz2 nextpnr-59cb1600d9995eb52af41caea7bc364dcf47ea35.zip | |
ecp5: Fixing arch bugs
Signed-off-by: David Shah <davey1576@gmail.com>
Diffstat (limited to 'ecp5')
| -rw-r--r-- | ecp5/arch.cc | 6 | ||||
| -rw-r--r-- | ecp5/archdefs.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ecp5/arch.cc b/ecp5/arch.cc index a200e102..6708c339 100644 --- a/ecp5/arch.cc +++ b/ecp5/arch.cc @@ -272,7 +272,11 @@ BelId Arch::getPackagePinBel(const std::string &pin) const { return BelId(); } std::string Arch::getBelPackagePin(BelId bel) const { return ""; } // ----------------------------------------------------------------------- -void Arch::estimatePosition(BelId bel, int &x, int &y, bool &gb) const {} +void Arch::estimatePosition(BelId bel, int &x, int &y, bool &gb) const { + x = bel.location.x; + y = bel.location.y; + gb = false; +} delay_t Arch::estimateDelay(WireId src, WireId dst) const { return 1; } diff --git a/ecp5/archdefs.h b/ecp5/archdefs.h index b05ac22c..4facc786 100644 --- a/ecp5/archdefs.h +++ b/ecp5/archdefs.h @@ -71,7 +71,7 @@ struct Location Location(const Location &loc) : x(loc.x), y(loc.y){}; bool operator==(const Location &other) const { return x == other.x && y == other.y; } - bool operator!=(const Location &other) const { return x != other.x || y == other.y; } + bool operator!=(const Location &other) const { return x != other.x || y != other.y; } }; inline Location operator+(const Location &a, const Location &b) { return Location(a.x + b.x, a.y + b.y); } |