mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-05-24 03:36:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[misc] miscellaneous code cleanup and fixes

Browse source 
* Don't use hDrive handle for longer than necessary
* Move all the popcount() function calls into missing.h
* Ensure that the thread_affinity[] array is properly sized
* Improve timeouts for conflicting process search
This commit is contained in:
Pete Batard 2020-09-09 17:00:39 +01:00
parent 7df88aa931
commit b3caf638b6
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
6 changed files with 25 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/missing.h
View file

@ -76,9 +76,18 @@
/*
* Nibbled from https://github.com/hanji/popcnt/blob/master/populationcount.cpp
* Since MSVC x86_32 does not have intrinsic popcount64 and I don't have all day
* Since MSVC x86_32 and/or ARM don't have intrinsic popcount and I don't have all day
*/
static __inline int popcnt64(register uint64_t u)
static __inline uint8_t popcnt8(uint8_t val)
{
static const uint8_t nibble_lookup[16] = {
0, 1, 1, 2, 1, 2, 2, 3,
1, 2, 2, 3, 2, 3, 3, 4
};
return nibble_lookup[val & 0x0F] + nibble_lookup[val >> 4];
}
static __inline uint8_t popcnt64(register uint64_t u)
{
u = (u & 0x5555555555555555) + ((u >> 1) & 0x5555555555555555);
u = (u & 0x3333333333333333) + ((u >> 2) & 0x3333333333333333);
@ -86,7 +95,7 @@ static __inline int popcnt64(register uint64_t u)
u = (u & 0x00ff00ff00ff00ff) + ((u >> 8) & 0x00ff00ff00ff00ff);
u = (u & 0x0000ffff0000ffff) + ((u >> 16) & 0x0000ffff0000ffff);
u = (u & 0x00000000ffffffff) + ((u >> 32) & 0x00000000ffffffff);
return (int)u;
return (uint8_t)u;
}
static __inline void *_reallocf(void *ptr, size_t size) {