dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use bitmath builtins for SetBitIterator when available

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-11-01 22:11:27 +00:00
parent e1e7b67270
commit d585ce75dd
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/bitmath_func.hpp
View File

@@ -377,7 +377,11 @@ struct SetBitIterator {
bool operator==(const Iterator &other) const bool operator==(const Iterator &other) const
{ {
#ifdef WITH_BITMATH_BUILTINS
return this->bitset == other.bitset;
#else
return this->bitset == other.bitset && (this->bitset == 0 || this->bitpos == other.bitpos); return this->bitset == other.bitset && (this->bitset == 0 || this->bitpos == other.bitpos);
#endif
} }
bool operator!=(const Iterator &other) const { return !(*this == other); } bool operator!=(const Iterator &other) const { return !(*this == other); }
Tbitpos operator*() const { return this->bitpos; } Tbitpos operator*() const { return this->bitpos; }
@@ -388,12 +392,29 @@ struct SetBitIterator {
Tbitpos bitpos; Tbitpos bitpos;
void Validate() void Validate()
{ {
#ifdef WITH_BITMATH_BUILTINS
if (this->bitset != 0) {
typename std::make_unsigned<Tbitset>::type unsigned_value = this->bitset;
if (sizeof(Tbitset) <= sizeof(unsigned int)) {
bitpos = static_cast<Tbitpos>(__builtin_ctz(unsigned_value));
} else if (sizeof(Tbitset) == sizeof(unsigned long)) {
bitpos = static_cast<Tbitpos>(__builtin_ctzl(unsigned_value));
} else {
bitpos = static_cast<Tbitpos>(__builtin_ctzll(unsigned_value));
}
}
#else
while (this->bitset != 0 && (this->bitset & 1) == 0) this->Next(); while (this->bitset != 0 && (this->bitset & 1) == 0) this->Next();
#endif
} }
void Next() void Next()
{ {
#ifdef WITH_BITMATH_BUILTINS
this->bitset = static_cast<Tbitset>(this->bitset ^ (this->bitset & -this->bitset));
#else
this->bitset = static_cast<Tbitset>(this->bitset >> 1); this->bitset = static_cast<Tbitset>(this->bitset >> 1);
this->bitpos++; this->bitpos++;
#endif
} }
}; };