AuroraMiddleware/lz4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor : coding style : use ML_MASK constant

Browse Source
This commit is contained in:
Yann Collet 2017-10-31 12:22:15 -07:00
parent 3f173052ae
commit ace334a4c9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/lz4.c
View File

@ -1185,12 +1185,12 @@ LZ4_FORCE_INLINE int LZ4_decompress_generic(
* this shortcut was tested on x86 and x64, where it improves decoding speed. * this shortcut was tested on x86 and x64, where it improves decoding speed.
* it has not yet been benchmarked on ARM, Power, mips, etc. */ * it has not yet been benchmarked on ARM, Power, mips, etc. */
if (((ip + 14 + 2 <= iend) & (op + 14 + 16 <= oend)) if (((ip + 14 + 2 <= iend) & (op + 14 + 16 <= oend))
& ((token < (15<<ML_BITS)) & ((token & 0xF) <= 12)) ) { & ((token < (15<<ML_BITS)) & ((token & ML_MASK) <= 12)) ) {
size_t const ll = token >> ML_BITS; size_t const ll = token >> ML_BITS;
size_t const off = LZ4_readLE16(ip+ll); size_t const off = LZ4_readLE16(ip+ll);
const BYTE* const matchPtr = op + ll - off; /* pointer underflow risk ? */ const BYTE* const matchPtr = op + ll - off; /* pointer underflow risk ? */
if ((off >= 16) /* do not deal with overlapping matches */ & (matchPtr >= lowPrefix)) { if ((off >= 16) /* do not deal with overlapping matches */ & (matchPtr >= lowPrefix)) {
size_t const ml = (token & 0xF) + MINMATCH; size_t const ml = (token & ML_MASK) + MINMATCH;
memcpy(op, ip, 16); op += ll; ip += ll + 2 /*offset*/; memcpy(op, ip, 16); op += ll; ip += ll + 2 /*offset*/;
memcpy(op, matchPtr, 16); op += ml; memcpy(op, matchPtr, 16); op += ml;
continue; continue;