riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

In `pool`, construct `entry_t`s in-place and add an rvalue-accepting-and-forwarding `insert()` method.

This commit is contained in:
Alberto Gonzalez 2020-04-20 02:16:55 +00:00
parent 2b1fb8c0a0
commit 95b94ad19b
No known key found for this signature in database
GPG Key ID: 8395A8BA109708B2
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
kernel/hashlib.h
View File

@ -745,11 +745,24 @@ protected:
int do_insert(const K &value, int &hash) int do_insert(const K &value, int &hash)
{ {
if (hashtable.empty()) { if (hashtable.empty()) {
entries.push_back(entry_t(value, -1)); entries.emplace_back(value, -1);
do_rehash(); do_rehash();
hash = do_hash(value); hash = do_hash(value);
} else { } else {
entries.push_back(entry_t(value, hashtable[hash])); entries.emplace_back(value, hashtable[hash]);
hashtable[hash] = entries.size() - 1;
}
return entries.size() - 1;
}
int do_insert(K &&value, int &hash)
{
if (hashtable.empty()) {
entries.emplace_back(std::forward<K>(value), -1);
do_rehash();
hash = do_hash(value);
} else {
entries.emplace_back(std::forward<K>(value), hashtable[hash]);
hashtable[hash] = entries.size() - 1; hashtable[hash] = entries.size() - 1;
} }
return entries.size() - 1; return entries.size() - 1;
@ -847,6 +860,16 @@ public:
return std::pair<iterator, bool>(iterator(this, i), true); return std::pair<iterator, bool>(iterator(this, i), true);
} }
std::pair<iterator, bool> insert(K &&value)
{
int hash = do_hash(value);
int i = do_lookup(value, hash);
if (i >= 0)
return std::pair<iterator, bool>(iterator(this, i), false);
i = do_insert(std::forward<K>(value), hash);
return std::pair<iterator, bool>(iterator(this, i), true);
}
int erase(const K &key) int erase(const K &key)
{ {
int hash = do_hash(key); int hash = do_hash(key);