DrSocalkwe3n/luajit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall
2019-12-08 19:50:36 +01:00
parent 05898a8824 de48d00094
commit 1d9a337de6
7 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lj_def.h
View File

@@ -262,19 +262,19 @@ static LJ_AINLINE uint32_t lj_fls(uint32_t x)
return _CountLeadingZeros(x) ^ 31;
}
#else
unsigned char _BitScanForward(uint32_t *, unsigned long);
unsigned char _BitScanReverse(uint32_t *, unsigned long);
unsigned char _BitScanForward(unsigned long *, unsigned long);
unsigned char _BitScanReverse(unsigned long *, unsigned long);
#pragma intrinsic(_BitScanForward)
#pragma intrinsic(_BitScanReverse)
static LJ_AINLINE uint32_t lj_ffs(uint32_t x)
{
uint32_t r; _BitScanForward(&r, x); return r;
unsigned long r; _BitScanForward(&r, x); return (uint32_t)r;
}
static LJ_AINLINE uint32_t lj_fls(uint32_t x)
{
uint32_t r; _BitScanReverse(&r, x); return r;
unsigned long r; _BitScanReverse(&r, x); return (uint32_t)r;
}
#endif