portugalfuturista/seL4
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Verification: popcount- Avoid conflict variable names/types

Browse source
This commit is contained in:
Hesham Almatary 2017-06-29 12:04:35 +10:00
parent d3e90341d6
commit 3aa244cc14
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/util.h
View file

@ -125,17 +125,17 @@ int __builtin_popcountl (unsigned long x);
/** DONT_TRANSLATE */
static inline long
CONST popcountl(unsigned long v)
CONST popcountl(unsigned long mask)
{
#ifndef __POPCNT__
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
unsigned int count; // c accumulates the total bits set in v
for (count = 0; mask; count++) {
mask &= mask - 1; // clear the least significant bit set
}
return c;
return count;
#else
return __builtin_popcountl(x);
return __builtin_popcountl(mask);
#endif
}