diff options
| author | Moritz Fischer | 2012-05-07 21:25:28 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2012-05-07 21:25:28 -0400 |
| commit | 231b177ae5c2ef7726cfc18b709ba850c021cf1b (patch) | |
| tree | 9376897174a453e535af577272ec0b525017c9a0 | |
| parent | f9f1508e2ffdea0104fea8b54cbce78916aa18f7 (diff) | |
| download | gnuradio-231b177ae5c2ef7726cfc18b709ba850c021cf1b.tar.gz gnuradio-231b177ae5c2ef7726cfc18b709ba850c021cf1b.tar.bz2 gnuradio-231b177ae5c2ef7726cfc18b709ba850c021cf1b.zip | |
volk: fixed popcnt.
| -rw-r--r-- | volk/include/volk/volk_64u_popcnt_a.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/volk/include/volk/volk_64u_popcnt_a.h b/volk/include/volk/volk_64u_popcnt_a.h index 7d7359ccf..5e68ed208 100644 --- a/volk/include/volk/volk_64u_popcnt_a.h +++ b/volk/include/volk/volk_64u_popcnt_a.h @@ -14,7 +14,7 @@ static inline void volk_64u_popcnt_a_generic(uint64_t* ret, const uint64_t value // This is faster than a lookup table //uint32_t retVal = valueVector[0]; - uint32_t retVal = (uint32_t)(value && 0x00000000FFFFFFFF); + uint32_t retVal = (uint32_t)(value & 0x00000000FFFFFFFF); retVal = (retVal & 0x55555555) + (retVal >> 1 & 0x55555555); retVal = (retVal & 0x33333333) + (retVal >> 2 & 0x33333333); @@ -24,7 +24,7 @@ static inline void volk_64u_popcnt_a_generic(uint64_t* ret, const uint64_t value uint64_t retVal64 = retVal; //retVal = valueVector[1]; - retVal = (uint32_t)((value && 0xFFFFFFFF00000000) >> 31); + retVal = (uint32_t)((value & 0xFFFFFFFF00000000) >> 31); retVal = (retVal & 0x55555555) + (retVal >> 1 & 0x55555555); retVal = (retVal & 0x33333333) + (retVal >> 2 & 0x33333333); retVal = (retVal + (retVal >> 4)) & 0x0F0F0F0F; |