root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

tuklib_integer: Cleanup MSVC-specific code.

This commit is contained in:
Lasse Collin 2019-06-01 21:30:03 +03:00
parent efbf6e5f09
commit 412791486d
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/tuklib_integer.h
View File

@ -546,11 +546,9 @@ bsr32(uint32_t n)
__asm__("bsrl %1, %0" : "=r" (i) : "rm" (n)); __asm__("bsrl %1, %0" : "=r" (i) : "rm" (n));
return i; return i;
#elif defined(_MSC_VER) && _MSC_VER >= 1400 #elif defined(_MSC_VER)
// MSVC isn't supported by tuklib, but since this code exists, unsigned long i;
// it doesn't hurt to have it here anyway. _BitScanReverse(&i, n);
uint32_t i;
_BitScanReverse((DWORD *)&i, n);
return i; return i;
#else #else
@ -600,9 +598,9 @@ clz32(uint32_t n)
: "=r" (i) : "rm" (n)); : "=r" (i) : "rm" (n));
return i; return i;
#elif defined(_MSC_VER) && _MSC_VER >= 1400 #elif defined(_MSC_VER)
uint32_t i; unsigned long i;
_BitScanReverse((DWORD *)&i, n); _BitScanReverse(&i, n);
return i ^ 31U; return i ^ 31U;
#else #else
@ -650,9 +648,9 @@ ctz32(uint32_t n)
__asm__("bsfl %1, %0" : "=r" (i) : "rm" (n)); __asm__("bsfl %1, %0" : "=r" (i) : "rm" (n));
return i; return i;
#elif defined(_MSC_VER) && _MSC_VER >= 1400 #elif defined(_MSC_VER)
uint32_t i; unsigned long i;
_BitScanForward((DWORD *)&i, n); _BitScanForward(&i, n);
return i; return i;
#else #else