diff options
| author | gatecat <gatecat@ds0.me> | 2021-02-23 22:49:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-23 22:49:35 +0000 |
| commit | 5de19786322412ce151b0341ed714dcdb03433cc (patch) | |
| tree | 3b47b5005ea27d98030fe99c84742ce2e5b6d003 | |
| parent | 85af066d4f5a189ccdc6c7d6bafabb319a946901 (diff) | |
| parent | bf458cbc5a71980a9500206723386ad5488dfe80 (diff) | |
| download | nextpnr-5de19786322412ce151b0341ed714dcdb03433cc.tar.gz nextpnr-5de19786322412ce151b0341ed714dcdb03433cc.tar.bz2 nextpnr-5de19786322412ce151b0341ed714dcdb03433cc.zip | |
Merge pull request #596 from litghost/make_clang_format
Run "make clangformat" to fix formatting in new Bits library.
| -rw-r--r-- | common/bits.cc | 14 | ||||
| -rw-r--r-- | common/bits.h | 13 |
2 files changed, 16 insertions, 11 deletions
diff --git a/common/bits.cc b/common/bits.cc index 1fe65544..36c7539a 100644 --- a/common/bits.cc +++ b/common/bits.cc @@ -24,7 +24,8 @@ namespace nextpnr { -int Bits::generic_popcount(unsigned int v) { +int Bits::generic_popcount(unsigned int v) +{ unsigned int c; // c accumulates the total bits set in v for (c = 0; v; c++) { v &= v - 1; // clear the least significant bit set @@ -33,13 +34,14 @@ int Bits::generic_popcount(unsigned int v) { return c; } -int Bits::generic_ctz(unsigned int x) { - if(x == 0) { +int Bits::generic_ctz(unsigned int x) +{ + if (x == 0) { throw std::runtime_error("Cannot call ctz with arg = 0"); } - for(size_t i = 0; i < std::numeric_limits<unsigned int>::digits; ++i) { - if((x & (1 << i)) != 0) { + for (size_t i = 0; i < std::numeric_limits<unsigned int>::digits; ++i) { + if ((x & (1 << i)) != 0) { return i; } } @@ -48,4 +50,4 @@ int Bits::generic_ctz(unsigned int x) { throw std::runtime_error("Unreachable!"); } -}; +}; // namespace nextpnr diff --git a/common/bits.h b/common/bits.h index 1abf6735..d1598a8e 100644 --- a/common/bits.h +++ b/common/bits.h @@ -34,18 +34,20 @@ #if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86)) #include <intrin.h> -#pragma intrinsic(_BitScanForward,_BitScanReverse,__popcnt) +#pragma intrinsic(_BitScanForward, _BitScanReverse, __popcnt) #endif // Uses plain nextpnr namespace to avoid header inclusion nightmare that is // "nextpnr.h". namespace nextpnr { -struct Bits { +struct Bits +{ static int generic_popcount(unsigned int x); static int generic_ctz(unsigned int x); - static int popcount(unsigned int x) { + static int popcount(unsigned int x) + { #if defined(__GNUC__) || defined(__clang__) return __builtin_popcount(x); #elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86)) @@ -55,7 +57,8 @@ struct Bits { #endif } - static int ctz(unsigned int x) { + static int ctz(unsigned int x) + { #if defined(__GNUC__) || defined(__clang__) return __builtin_ctz(x); #elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86)) @@ -68,6 +71,6 @@ struct Bits { } }; -}; +}; // namespace nextpnr #endif /* BITS_H */ |