ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't initialize the first parameter of _BitScanForward* functions

Browse Source 
Like the document example, no need to initialize `r` to 0.
https://docs.microsoft.com/en-us/cpp/intrinsics/bitscanforward-bitscanforward64
This commit is contained in:
Ma Lin
2021-09-25 16:36:53 +08:00
parent 95f492ea17
commit e5ba858270
5 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/common/entropy_common.c
+1 -1
View File
@@ -43,7 +43,7 @@ static U32 FSE_ctz(U32 val)
assert(val != 0); assert(val != 0);
{ {
# if defined(_MSC_VER) /* Visual */ # if defined(_MSC_VER) /* Visual */
unsigned long r=0; unsigned long r;
return _BitScanForward(&r, val) ? (unsigned)r : 0; return _BitScanForward(&r, val) ? (unsigned)r : 0;
# elif defined(__GNUC__) && (__GNUC__ >= 3) /* GCC Intrinsic */ # elif defined(__GNUC__) && (__GNUC__ >= 3) /* GCC Intrinsic */
return __builtin_ctz(val); return __builtin_ctz(val);
lib/common/zstd_internal.h
+2 -2
View File
@@ -391,7 +391,7 @@ MEM_STATIC unsigned ZSTD_countTrailingZeros(size_t val)
# if STATIC_BMI2 # if STATIC_BMI2
return _tzcnt_u64(val); return _tzcnt_u64(val);
# else # else
unsigned long r = 0; unsigned long r;
return _BitScanForward64( &r, (U64)val ) ? (unsigned)(r >> 3) : 0; return _BitScanForward64( &r, (U64)val ) ? (unsigned)(r >> 3) : 0;
# endif # endif
# elif defined(__GNUC__) && (__GNUC__ >= 4) # elif defined(__GNUC__) && (__GNUC__ >= 4)
@@ -409,7 +409,7 @@ MEM_STATIC unsigned ZSTD_countTrailingZeros(size_t val)
# endif # endif
} else { /* 32 bits */ } else { /* 32 bits */
# if defined(_MSC_VER) # if defined(_MSC_VER)
unsigned long r=0; unsigned long r;
return _BitScanForward( &r, (U32)val ) ? (unsigned)(r >> 3) : 0; return _BitScanForward( &r, (U32)val ) ? (unsigned)(r >> 3) : 0;
# elif defined(__GNUC__) && (__GNUC__ >= 3) # elif defined(__GNUC__) && (__GNUC__ >= 3)
return (__builtin_ctz((U32)val) >> 3); return (__builtin_ctz((U32)val) >> 3);
lib/compress/zstd_compress_internal.h
+2 -2
View File
@@ -672,7 +672,7 @@ static unsigned ZSTD_NbCommonBytes (size_t val)
# if STATIC_BMI2 # if STATIC_BMI2
return _tzcnt_u64(val) >> 3; return _tzcnt_u64(val) >> 3;
# else # else
unsigned long r = 0; unsigned long r;
return _BitScanForward64( &r, (U64)val ) ? (unsigned)(r >> 3) : 0; return _BitScanForward64( &r, (U64)val ) ? (unsigned)(r >> 3) : 0;
# endif # endif
# elif defined(__GNUC__) && (__GNUC__ >= 4) # elif defined(__GNUC__) && (__GNUC__ >= 4)
@@ -690,7 +690,7 @@ static unsigned ZSTD_NbCommonBytes (size_t val)
# endif # endif
} else { /* 32 bits */ } else { /* 32 bits */
# if defined(_MSC_VER) # if defined(_MSC_VER)
unsigned long r=0; unsigned long r;
return _BitScanForward( &r, (U32)val ) ? (unsigned)(r >> 3) : 0; return _BitScanForward( &r, (U32)val ) ? (unsigned)(r >> 3) : 0;
# elif defined(__GNUC__) && (__GNUC__ >= 3) # elif defined(__GNUC__) && (__GNUC__ >= 3)
return (__builtin_ctz((U32)val) >> 3); return (__builtin_ctz((U32)val) >> 3);
lib/compress/zstd_lazy.c
+1 -1
View File
@@ -882,7 +882,7 @@ static U32 ZSTD_VecMask_next(ZSTD_VecMask val) {
assert(val != 0); assert(val != 0);
# if defined(_MSC_VER) && defined(_WIN64) # if defined(_MSC_VER) && defined(_WIN64)
{ {
unsigned long r = 0; unsigned long r;
/* _BitScanForward64 is not defined outside of x64 */ /* _BitScanForward64 is not defined outside of x64 */
return _BitScanForward64(&r, val) ? (U32)r : 0; return _BitScanForward64(&r, val) ? (U32)r : 0;
} }
lib/dictBuilder/zdict.c
+4 -6
View File
@@ -135,9 +135,8 @@ static unsigned ZDICT_NbCommonBytes (size_t val)
if (MEM_isLittleEndian()) { if (MEM_isLittleEndian()) {
if (MEM_64bits()) { if (MEM_64bits()) {
# if defined(_MSC_VER) && defined(_WIN64) # if defined(_MSC_VER) && defined(_WIN64)
unsigned long r = 0; unsigned long r;
_BitScanForward64( &r, (U64)val ); return _BitScanForward64(&r, (U64)val) ? (unsigned)(r >> 3) : 0;
return (unsigned)(r>>3);
# elif defined(__GNUC__) && (__GNUC__ >= 3) # elif defined(__GNUC__) && (__GNUC__ >= 3)
return (unsigned)(__builtin_ctzll((U64)val) >> 3); return (unsigned)(__builtin_ctzll((U64)val) >> 3);
# else # else
@@ -146,9 +145,8 @@ static unsigned ZDICT_NbCommonBytes (size_t val)
# endif # endif
} else { /* 32 bits */ } else { /* 32 bits */
# if defined(_MSC_VER) # if defined(_MSC_VER)
unsigned long r=0; unsigned long r;
_BitScanForward( &r, (U32)val ); return _BitScanForward(&r, (U32)val) ? (unsigned)(r >> 3) : 0;
return (unsigned)(r>>3);
# elif defined(__GNUC__) && (__GNUC__ >= 3) # elif defined(__GNUC__) && (__GNUC__ >= 3)
return (unsigned)(__builtin_ctz((U32)val) >> 3); return (unsigned)(__builtin_ctz((U32)val) >> 3);
# else # else