mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes to the new bitcount implementation 

Use Intel-standardized _mm_popcnt_u32 instead of Microsoft-specific
__popcnt, replace assert with openrct2_assert, replace bitcount's argument
with uint32.
This commit is contained in:
Daniel Kamil Kozar 2016-11-01 11:42:36 +01:00
parent b68b6f731b
commit 55f1d3aac6
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/util/util.c
View File

@ -199,7 +199,7 @@ int bitscanforward(int source)
#include <cpuid.h>
#define OpenRCT2_POPCNT_GNUC
#elif defined(_MSC_VER) && (_MSC_VER >= 1500) && (defined(_M_X64) || defined(_M_IX86)) // VS2008
#include <intrin.h>
#include <nmmintrin.h>
#define OpenRCT2_POPCNT_MSVC
#endif
@ -221,7 +221,7 @@ static bool bitcount_popcnt_available()
#endif
}
static int bitcount_popcnt(int source)
static int bitcount_popcnt(uint32 source)
{
#if defined(OpenRCT2_POPCNT_GNUC)
// use asm directly in order to actually emit the instruction : using
@ -230,14 +230,14 @@ static int bitcount_popcnt(int source)
asm volatile ("popcnt %1,%0" : "=r"(rv) : "rm"(source) : "cc");
return rv;
#elif defined(OpenRCT2_POPCNT_MSVC)
return __popcnt(source);
return _mm_popcnt_u32(source);
#else
assert(false && "bitcount_popcnt() called, without support compiled in");
openrct2_assert(false, "bitcount_popcnt() called, without support compiled in");
return INT_MAX;
#endif
}
static int bitcount_lut(int source)
static int bitcount_lut(uint32 source)
{
// https://graphics.stanford.edu/~seander/bithacks.html
static const unsigned char BitsSetTable256[256] =
@ -253,14 +253,14 @@ static int bitcount_lut(int source)
BitsSetTable256[source >> 24];
}
static int(*bitcount_fn)(int);
static int(*bitcount_fn)(uint32);
void bitcount_init()
{
bitcount_fn = bitcount_popcnt_available() ? bitcount_popcnt : bitcount_lut;
}
int bitcount(int source)
int bitcount(uint32 source)
{
return bitcount_fn(source);
}

2
src/util/util.h
View File

@ -39,7 +39,7 @@ bool readentirefile(const utf8 *path, void **outBuffer, size_t *outLength);
int bitscanforward(int source);
void bitcount_init();
int bitcount(int source);
int bitcount(uint32 source);
bool strequals(const char *a, const char *b, int length, bool caseInsensitive);
int strcicmp(char const *a, char const *b);
int strlogicalcmp(char const *a, char const *b);