diff options
author | Keith Rothman <537074+litghost@users.noreply.github.com> | 2021-01-28 19:08:14 -0800 |
---|---|---|
committer | Keith Rothman <537074+litghost@users.noreply.github.com> | 2021-02-02 07:34:56 -0800 |
commit | d03d9d839b7e49a4bf3428e949bda85574adf403 (patch) | |
tree | 9d680a06ccd312bc057544a093d28bee9979b607 /ecp5 | |
parent | 71e210dd4b12f1e91630f83396be236034f68e30 (diff) | |
download | nextpnr-d03d9d839b7e49a4bf3428e949bda85574adf403.tar.gz nextpnr-d03d9d839b7e49a4bf3428e949bda85574adf403.tar.bz2 nextpnr-d03d9d839b7e49a4bf3428e949bda85574adf403.zip |
Working compile of ECP5.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
Diffstat (limited to 'ecp5')
-rw-r--r-- | ecp5/arch.cc | 2 | ||||
-rw-r--r-- | ecp5/archdefs.h | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/ecp5/arch.cc b/ecp5/arch.cc index 4368f0d0..b40b0002 100644 --- a/ecp5/arch.cc +++ b/ecp5/arch.cc @@ -126,7 +126,7 @@ Arch::Arch(ArchArgs args) : args(args) PartitionId partition; partition.name = bel_type; - partitions.push_back(partitions); + partitions.push_back(partition); } } diff --git a/ecp5/archdefs.h b/ecp5/archdefs.h index b0e01e4d..5bfe13d2 100644 --- a/ecp5/archdefs.h +++ b/ecp5/archdefs.h @@ -131,6 +131,10 @@ struct PartitionId { bool operator==(const PartitionId &other) const { return (name == other.name); } bool operator!=(const PartitionId &other) const { return (name != other.name); } + bool operator<(const PartitionId &other) const + { + return name < other.name; + } }; struct GroupId @@ -269,4 +273,14 @@ template <> struct hash<NEXTPNR_NAMESPACE_PREFIX DecalId> } }; +template <> struct hash<NEXTPNR_NAMESPACE_PREFIX PartitionId> +{ + std::size_t operator()(const NEXTPNR_NAMESPACE_PREFIX PartitionId &partition) const noexcept + { + std::size_t seed = 0; + boost::hash_combine(seed, hash<NEXTPNR_NAMESPACE_PREFIX IdString>()(partition.name)); + return seed; + } +}; + } // namespace std |