mercurial: comparison contrib/python-zstandard/zstd/compress/zstd

equal deleted inserted replaced

-:2da754532dd3
+:69de49c4e39c
 #include "zstd_compress_internal.h"
 #include "zstd_fast.h"
 void ZSTD_fillHashTable(ZSTD_matchState_t* ms,
-void const* end, ZSTD_dictTableLoadMethod_e dtlm)
+const void* const end,
+ZSTD_dictTableLoadMethod_e dtlm)
 {
 const ZSTD_compressionParameters* const cParams = &ms->cParams;
 U32* const hashTable = ms->hashTable;
 U32  const hBits = cParams->hashLog;
 U32  const mls = cParams->minMatch;
 if (hashTable[hash] == 0) {  /* not yet filled */
 hashTable[hash] = current + p;
 }   }   }   }
 }
 FORCE_INLINE_TEMPLATE
 size_t ZSTD_compressBlock_fast_generic(
 ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
 void const* src, size_t srcSize,
-U32 const mls, ZSTD_dictMode_e const dictMode)
+U32 const mls)
+{
+const ZSTD_compressionParameters* const cParams = &ms->cParams;
+U32* const hashTable = ms->hashTable;
+U32 const hlog = cParams->hashLog;
+/* support stepSize of 0 */
+size_t const stepSize = cParams->targetLength + !(cParams->targetLength) + 1;
+const BYTE* const base = ms->window.base;
+const BYTE* const istart = (const BYTE*)src;
+/* We check ip0 (ip + 0) and ip1 (ip + 1) each loop */
+const BYTE* ip0 = istart;
+const BYTE* ip1;
+const BYTE* anchor = istart;
+const U32   endIndex = (U32)((size_t)(istart - base) + srcSize);
+const U32   maxDistance = 1U << cParams->windowLog;
+const U32   validStartIndex = ms->window.dictLimit;
+const U32   prefixStartIndex = (endIndex - validStartIndex > maxDistance) ? endIndex - maxDistance : validStartIndex;
+const BYTE* const prefixStart = base + prefixStartIndex;
+const BYTE* const iend = istart + srcSize;
+const BYTE* const ilimit = iend - HASH_READ_SIZE;
+U32 offset_1=rep[0], offset_2=rep[1];
+U32 offsetSaved = 0;
+/* init */
+DEBUGLOG(5, "ZSTD_compressBlock_fast_generic");
+ip0 += (ip0 == prefixStart);
+ip1 = ip0 + 1;
+{
+U32 const maxRep = (U32)(ip0 - prefixStart);
+if (offset_2 > maxRep) offsetSaved = offset_2, offset_2 = 0;
+if (offset_1 > maxRep) offsetSaved = offset_1, offset_1 = 0;
+}
+/* Main Search Loop */
+while (ip1 < ilimit) {   /* < instead of <=, because check at ip0+2 */
+size_t mLength;
+BYTE const* ip2 = ip0 + 2;
+size_t const h0 = ZSTD_hashPtr(ip0, hlog, mls);
+U32 const val0 = MEM_read32(ip0);
+size_t const h1 = ZSTD_hashPtr(ip1, hlog, mls);
+U32 const val1 = MEM_read32(ip1);
+U32 const current0 = (U32)(ip0-base);
+U32 const current1 = (U32)(ip1-base);
+U32 const matchIndex0 = hashTable[h0];
+U32 const matchIndex1 = hashTable[h1];
+BYTE const* repMatch = ip2-offset_1;
+const BYTE* match0 = base + matchIndex0;
+const BYTE* match1 = base + matchIndex1;
+U32 offcode;
+hashTable[h0] = current0;   /* update hash table */
+hashTable[h1] = current1;   /* update hash table */
+assert(ip0 + 1 == ip1);
+if ((offset_1 > 0) & (MEM_read32(repMatch) == MEM_read32(ip2))) {
+mLength = ip2[-1] == repMatch[-1] ? 1 : 0;
+ip0 = ip2 - mLength;
+match0 = repMatch - mLength;
+offcode = 0;
+goto _match;
+}
+if ((matchIndex0 > prefixStartIndex) && MEM_read32(match0) == val0) {
+/* found a regular match */
+goto _offset;
+}
+if ((matchIndex1 > prefixStartIndex) && MEM_read32(match1) == val1) {
+/* found a regular match after one literal */
+ip0 = ip1;
+match0 = match1;
+goto _offset;
+}
+{
+size_t const step = ((ip0-anchor) >> (kSearchStrength - 1)) + stepSize;
+assert(step >= 2);
+ip0 += step;
+ip1 += step;
+continue;
+}
+_offset: /* Requires: ip0, match0 */
+/* Compute the offset code */
+offset_2 = offset_1;
+offset_1 = (U32)(ip0-match0);
+offcode = offset_1 + ZSTD_REP_MOVE;
+mLength = 0;
+/* Count the backwards match length */
+while (((ip0>anchor) & (match0>prefixStart))
+&& (ip0[-1] == match0[-1])) { ip0--; match0--; mLength++; } /* catch up */
+_match: /* Requires: ip0, match0, offcode */
+/* Count the forward length */
+mLength += ZSTD_count(ip0+mLength+4, match0+mLength+4, iend) + 4;
+ZSTD_storeSeq(seqStore, ip0-anchor, anchor, offcode, mLength-MINMATCH);
+/* match found */
+ip0 += mLength;
+anchor = ip0;
+ip1 = ip0 + 1;
+if (ip0 <= ilimit) {
+/* Fill Table */
+assert(base+current0+2 > istart);  /* check base overflow */
+hashTable[ZSTD_hashPtr(base+current0+2, hlog, mls)] = current0+2;  /* here because current+2 could be > iend-8 */
+hashTable[ZSTD_hashPtr(ip0-2, hlog, mls)] = (U32)(ip0-2-base);
+while ( (ip0 <= ilimit)
+&& ( (offset_2>0)
+& (MEM_read32(ip0) == MEM_read32(ip0 - offset_2)) )) {
+/* store sequence */
+size_t const rLength = ZSTD_count(ip0+4, ip0+4-offset_2, iend) + 4;
+U32 const tmpOff = offset_2; offset_2 = offset_1; offset_1 = tmpOff;  /* swap offset_2 <=> offset_1 */
+hashTable[ZSTD_hashPtr(ip0, hlog, mls)] = (U32)(ip0-base);
+ip0 += rLength;
+ip1 = ip0 + 1;
+ZSTD_storeSeq(seqStore, 0, anchor, 0, rLength-MINMATCH);
+anchor = ip0;
+continue;   /* faster when present (confirmed on gcc-8) ... (?) */
+}
+}
+}
+/* save reps for next block */
+rep[0] = offset_1 ? offset_1 : offsetSaved;
+rep[1] = offset_2 ? offset_2 : offsetSaved;
+/* Return the last literals size */
+return (size_t)(iend - anchor);
+}
+size_t ZSTD_compressBlock_fast(
+ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+void const* src, size_t srcSize)
+{
+ZSTD_compressionParameters const* cParams = &ms->cParams;
+U32 const mls = cParams->minMatch;
+assert(ms->dictMatchState == NULL);
+switch(mls)
+{
+default: /* includes case 3 */
+case 4 :
+return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, 4);
+case 5 :
+return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, 5);
+case 6 :
+return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, 6);
+case 7 :
+return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, 7);
+}
+}
+FORCE_INLINE_TEMPLATE
+size_t ZSTD_compressBlock_fast_dictMatchState_generic(
+ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
+void const* src, size_t srcSize, U32 const mls)
 {
 const ZSTD_compressionParameters* const cParams = &ms->cParams;
 U32* const hashTable = ms->hashTable;
 U32 const hlog = cParams->hashLog;
 /* support stepSize of 0 */
 const BYTE* const ilimit = iend - HASH_READ_SIZE;
 U32 offset_1=rep[0], offset_2=rep[1];
 U32 offsetSaved = 0;
 const ZSTD_matchState_t* const dms = ms->dictMatchState;
-const ZSTD_compressionParameters* const dictCParams =
+const ZSTD_compressionParameters* const dictCParams = &dms->cParams ;
-dictMode == ZSTD_dictMatchState ?
+const U32* const dictHashTable = dms->hashTable;
-&dms->cParams : NULL;
+const U32 dictStartIndex       = dms->window.dictLimit;
-const U32* const dictHashTable = dictMode == ZSTD_dictMatchState ?
+const BYTE* const dictBase     = dms->window.base;
-dms->hashTable : NULL;
+const BYTE* const dictStart    = dictBase + dictStartIndex;
-const U32 dictStartIndex       = dictMode == ZSTD_dictMatchState ?
+const BYTE* const dictEnd      = dms->window.nextSrc;
-dms->window.dictLimit : 0;
+const U32 dictIndexDelta       = prefixStartIndex - (U32)(dictEnd - dictBase);
-const BYTE* const dictBase     = dictMode == ZSTD_dictMatchState ?
-dms->window.base : NULL;
-const BYTE* const dictStart    = dictMode == ZSTD_dictMatchState ?
-dictBase + dictStartIndex : NULL;
-const BYTE* const dictEnd      = dictMode == ZSTD_dictMatchState ?
-dms->window.nextSrc : NULL;
-const U32 dictIndexDelta       = dictMode == ZSTD_dictMatchState ?
-prefixStartIndex - (U32)(dictEnd - dictBase) :
-0;
 const U32 dictAndPrefixLength  = (U32)(ip - prefixStart + dictEnd - dictStart);
-const U32 dictHLog             = dictMode == ZSTD_dictMatchState ?
+const U32 dictHLog             = dictCParams->hashLog;
-dictCParams->hashLog : hlog;
+/* if a dictionary is still attached, it necessarily means that
-assert(dictMode == ZSTD_noDict || dictMode == ZSTD_dictMatchState);
+* it is within window size. So we just check it. */
+const U32 maxDistance = 1U << cParams->windowLog;
-/* otherwise, we would get index underflow when translating a dict index
+const U32 endIndex = (U32)((size_t)(ip - base) + srcSize);
-* into a local index */
+assert(endIndex - prefixStartIndex <= maxDistance);
-assert(dictMode != ZSTD_dictMatchState
+(void)maxDistance; (void)endIndex;   /* these variables are not used when assert() is disabled */
-|| prefixStartIndex >= (U32)(dictEnd - dictBase));
+/* ensure there will be no no underflow
+* when translating a dict index into a local index */
+assert(prefixStartIndex >= (U32)(dictEnd - dictBase));
 /* init */
+DEBUGLOG(5, "ZSTD_compressBlock_fast_dictMatchState_generic");
 ip += (dictAndPrefixLength == 0);
-if (dictMode == ZSTD_noDict) {
+/* dictMatchState repCode checks don't currently handle repCode == 0
-U32 const maxRep = (U32)(ip - prefixStart);
+* disabling. */
-if (offset_2 > maxRep) offsetSaved = offset_2, offset_2 = 0;
+assert(offset_1 <= dictAndPrefixLength);
-if (offset_1 > maxRep) offsetSaved = offset_1, offset_1 = 0;
+assert(offset_2 <= dictAndPrefixLength);
-}
-if (dictMode == ZSTD_dictMatchState) {
-/* dictMatchState repCode checks don't currently handle repCode == 0
-* disabling. */
-assert(offset_1 <= dictAndPrefixLength);
-assert(offset_2 <= dictAndPrefixLength);
-}
 /* Main Search Loop */
 while (ip < ilimit) {   /* < instead of <=, because repcode check at (ip+1) */
 size_t mLength;
 size_t const h = ZSTD_hashPtr(ip, hlog, mls);
 U32 const current = (U32)(ip-base);
 U32 const matchIndex = hashTable[h];
 const BYTE* match = base + matchIndex;
 const U32 repIndex = current + 1 - offset_1;
-const BYTE* repMatch = (dictMode == ZSTD_dictMatchState
+const BYTE* repMatch = (repIndex < prefixStartIndex) ?
-&& repIndex < prefixStartIndex) ?
 dictBase + (repIndex - dictIndexDelta) :
 base + repIndex;
 hashTable[h] = current;   /* update hash table */
-if ( (dictMode == ZSTD_dictMatchState)
+if ( ((U32)((prefixStartIndex-1) - repIndex) >= 3) /* intentional underflow : ensure repIndex isn't overlapping dict + prefix */
-&& ((U32)((prefixStartIndex-1) - repIndex) >= 3) /* intentional underflow : ensure repIndex isn't overlapping dict + prefix */
 && (MEM_read32(repMatch) == MEM_read32(ip+1)) ) {
 const BYTE* const repMatchEnd = repIndex < prefixStartIndex ? dictEnd : iend;
 mLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repMatchEnd, prefixStart) + 4;
 ip++;
-ZSTD_storeSeq(seqStore, ip-anchor, anchor, 0, mLength-MINMATCH);
+ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, 0, mLength-MINMATCH);
-} else if ( dictMode == ZSTD_noDict
-&& ((offset_1 > 0) & (MEM_read32(ip+1-offset_1) == MEM_read32(ip+1)))) {
-mLength = ZSTD_count(ip+1+4, ip+1+4-offset_1, iend) + 4;
-ip++;
-ZSTD_storeSeq(seqStore, ip-anchor, anchor, 0, mLength-MINMATCH);
 } else if ( (matchIndex <= prefixStartIndex) ) {
-if (dictMode == ZSTD_dictMatchState) {
+size_t const dictHash = ZSTD_hashPtr(ip, dictHLog, mls);
-size_t const dictHash = ZSTD_hashPtr(ip, dictHLog, mls);
+U32 const dictMatchIndex = dictHashTable[dictHash];
-U32 const dictMatchIndex = dictHashTable[dictHash];
+const BYTE* dictMatch = dictBase + dictMatchIndex;
-const BYTE* dictMatch = dictBase + dictMatchIndex;
+if (dictMatchIndex <= dictStartIndex ||
-if (dictMatchIndex <= dictStartIndex ||
+MEM_read32(dictMatch) != MEM_read32(ip)) {
-MEM_read32(dictMatch) != MEM_read32(ip)) {
-assert(stepSize >= 1);
-ip += ((ip-anchor) >> kSearchStrength) + stepSize;
-continue;
-} else {
-/* found a dict match */
-U32 const offset = (U32)(current-dictMatchIndex-dictIndexDelta);
-mLength = ZSTD_count_2segments(ip+4, dictMatch+4, iend, dictEnd, prefixStart) + 4;
-while (((ip>anchor) & (dictMatch>dictStart))
-&& (ip[-1] == dictMatch[-1])) {
-ip--; dictMatch--; mLength++;
-} /* catch up */
-offset_2 = offset_1;
-offset_1 = offset;
-ZSTD_storeSeq(seqStore, ip-anchor, anchor, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
-}
-} else {
 assert(stepSize >= 1);
 ip += ((ip-anchor) >> kSearchStrength) + stepSize;
 continue;
+} else {
+/* found a dict match */
+U32 const offset = (U32)(current-dictMatchIndex-dictIndexDelta);
+mLength = ZSTD_count_2segments(ip+4, dictMatch+4, iend, dictEnd, prefixStart) + 4;
+while (((ip>anchor) & (dictMatch>dictStart))
+&& (ip[-1] == dictMatch[-1])) {
+ip--; dictMatch--; mLength++;
+} /* catch up */
+offset_2 = offset_1;
+offset_1 = offset;
+ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
 }
 } else if (MEM_read32(match) != MEM_read32(ip)) {
 /* it's not a match, and we're not going to check the dictionary */
 assert(stepSize >= 1);
 ip += ((ip-anchor) >> kSearchStrength) + stepSize;
 mLength = ZSTD_count(ip+4, match+4, iend) + 4;
 while (((ip>anchor) & (match>prefixStart))
 && (ip[-1] == match[-1])) { ip--; match--; mLength++; } /* catch up */
 offset_2 = offset_1;
 offset_1 = offset;
-ZSTD_storeSeq(seqStore, ip-anchor, anchor, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
+ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
 }
 /* match found */
 ip += mLength;
 anchor = ip;
 assert(base+current+2 > istart);  /* check base overflow */
 hashTable[ZSTD_hashPtr(base+current+2, hlog, mls)] = current+2;  /* here because current+2 could be > iend-8 */
 hashTable[ZSTD_hashPtr(ip-2, hlog, mls)] = (U32)(ip-2-base);
 /* check immediate repcode */
-if (dictMode == ZSTD_dictMatchState) {
+while (ip <= ilimit) {
-while (ip <= ilimit) {
+U32 const current2 = (U32)(ip-base);
-U32 const current2 = (U32)(ip-base);
+U32 const repIndex2 = current2 - offset_2;
-U32 const repIndex2 = current2 - offset_2;
+const BYTE* repMatch2 = repIndex2 < prefixStartIndex ?
-const BYTE* repMatch2 = repIndex2 < prefixStartIndex ?
+dictBase - dictIndexDelta + repIndex2 :
-dictBase - dictIndexDelta + repIndex2 :
+base + repIndex2;
-base + repIndex2;
+if ( ((U32)((prefixStartIndex-1) - (U32)repIndex2) >= 3 /* intentional overflow */)
-if ( ((U32)((prefixStartIndex-1) - (U32)repIndex2) >= 3 /* intentional overflow */)
+&& (MEM_read32(repMatch2) == MEM_read32(ip)) ) {
-&& (MEM_read32(repMatch2) == MEM_read32(ip)) ) {
+const BYTE* const repEnd2 = repIndex2 < prefixStartIndex ? dictEnd : iend;
-const BYTE* const repEnd2 = repIndex2 < prefixStartIndex ? dictEnd : iend;
+size_t const repLength2 = ZSTD_count_2segments(ip+4, repMatch2+4, iend, repEnd2, prefixStart) + 4;
-size_t const repLength2 = ZSTD_count_2segments(ip+4, repMatch2+4, iend, repEnd2, prefixStart) + 4;
+U32 tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset;   /* swap offset_2 <=> offset_1 */
-U32 tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset;   /* swap offset_2 <=> offset_1 */
+ZSTD_storeSeq(seqStore, 0, anchor, 0, repLength2-MINMATCH);
-ZSTD_storeSeq(seqStore, 0, anchor, 0, repLength2-MINMATCH);
+hashTable[ZSTD_hashPtr(ip, hlog, mls)] = current2;
-hashTable[ZSTD_hashPtr(ip, hlog, mls)] = current2;
+ip += repLength2;
-ip += repLength2;
+anchor = ip;
-anchor = ip;
+continue;
-continue;
-}
-break;
 }
+break;
 }
+}
-if (dictMode == ZSTD_noDict) {
+}
-while ( (ip <= ilimit)
-&& ( (offset_2>0)
-& (MEM_read32(ip) == MEM_read32(ip - offset_2)) )) {
-/* store sequence */
-size_t const rLength = ZSTD_count(ip+4, ip+4-offset_2, iend) + 4;
-U32 const tmpOff = offset_2; offset_2 = offset_1; offset_1 = tmpOff;  /* swap offset_2 <=> offset_1 */
-hashTable[ZSTD_hashPtr(ip, hlog, mls)] = (U32)(ip-base);
-ZSTD_storeSeq(seqStore, 0, anchor, 0, rLength-MINMATCH);
-ip += rLength;
-anchor = ip;
-continue;   /* faster when present ... (?) */
-}   }   }   }
 /* save reps for next block */
 rep[0] = offset_1 ? offset_1 : offsetSaved;
 rep[1] = offset_2 ? offset_2 : offsetSaved;
 /* Return the last literals size */
-return iend - anchor;
+return (size_t)(iend - anchor);
-}
-size_t ZSTD_compressBlock_fast(
-ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
-void const* src, size_t srcSize)
-{
-ZSTD_compressionParameters const* cParams = &ms->cParams;
-U32 const mls = cParams->minMatch;
-assert(ms->dictMatchState == NULL);
-switch(mls)
-{
-default: /* includes case 3 */
-case 4 :
-return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, 4, ZSTD_noDict);
-case 5 :
-return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, 5, ZSTD_noDict);
-case 6 :
-return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, 6, ZSTD_noDict);
-case 7 :
-return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, 7, ZSTD_noDict);
-}
 }
 size_t ZSTD_compressBlock_fast_dictMatchState(
 ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
 void const* src, size_t srcSize)
 assert(ms->dictMatchState != NULL);
 switch(mls)
 {
 default: /* includes case 3 */
 case 4 :
-return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, 4, ZSTD_dictMatchState);
+return ZSTD_compressBlock_fast_dictMatchState_generic(ms, seqStore, rep, src, srcSize, 4);
 case 5 :
-return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, 5, ZSTD_dictMatchState);
+return ZSTD_compressBlock_fast_dictMatchState_generic(ms, seqStore, rep, src, srcSize, 5);
 case 6 :
-return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, 6, ZSTD_dictMatchState);
+return ZSTD_compressBlock_fast_dictMatchState_generic(ms, seqStore, rep, src, srcSize, 6);
 case 7 :
-return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, 7, ZSTD_dictMatchState);
+return ZSTD_compressBlock_fast_dictMatchState_generic(ms, seqStore, rep, src, srcSize, 7);
 }
 }
 static size_t ZSTD_compressBlock_fast_extDict_generic(
 const BYTE* const base = ms->window.base;
 const BYTE* const dictBase = ms->window.dictBase;
 const BYTE* const istart = (const BYTE*)src;
 const BYTE* ip = istart;
 const BYTE* anchor = istart;
-const U32   dictStartIndex = ms->window.lowLimit;
+const U32   endIndex = (U32)((size_t)(istart - base) + srcSize);
+const U32   lowLimit = ZSTD_getLowestMatchIndex(ms, endIndex, cParams->windowLog);
+const U32   dictStartIndex = lowLimit;
 const BYTE* const dictStart = dictBase + dictStartIndex;
-const U32   prefixStartIndex = ms->window.dictLimit;
+const U32   dictLimit = ms->window.dictLimit;
+const U32   prefixStartIndex = dictLimit < lowLimit ? lowLimit : dictLimit;
 const BYTE* const prefixStart = base + prefixStartIndex;
 const BYTE* const dictEnd = dictBase + prefixStartIndex;
 const BYTE* const iend = istart + srcSize;
 const BYTE* const ilimit = iend - 8;
 U32 offset_1=rep[0], offset_2=rep[1];
+DEBUGLOG(5, "ZSTD_compressBlock_fast_extDict_generic");
+/* switch to "regular" variant if extDict is invalidated due to maxDistance */
+if (prefixStartIndex == dictStartIndex)
+return ZSTD_compressBlock_fast_generic(ms, seqStore, rep, src, srcSize, mls);
 /* Search Loop */
 while (ip < ilimit) {  /* < instead of <=, because (ip+1) */
 const size_t h = ZSTD_hashPtr(ip, hlog, mls);
 const U32    matchIndex = hashTable[h];
 hashTable[h] = current;   /* update hash table */
 assert(offset_1 <= current +1);   /* check repIndex */
 if ( (((U32)((prefixStartIndex-1) - repIndex) >= 3) /* intentional underflow */ & (repIndex > dictStartIndex))
 && (MEM_read32(repMatch) == MEM_read32(ip+1)) ) {
-const BYTE* repMatchEnd = repIndex < prefixStartIndex ? dictEnd : iend;
+const BYTE* const repMatchEnd = repIndex < prefixStartIndex ? dictEnd : iend;
-mLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repMatchEnd, prefixStart) + 4;
+mLength = ZSTD_count_2segments(ip+1 +4, repMatch +4, iend, repMatchEnd, prefixStart) + 4;
 ip++;
-ZSTD_storeSeq(seqStore, ip-anchor, anchor, 0, mLength-MINMATCH);
+ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, 0, mLength-MINMATCH);
 } else {
 if ( (matchIndex < dictStartIndex) ||
 (MEM_read32(match) != MEM_read32(ip)) ) {
 assert(stepSize >= 1);
 ip += ((ip-anchor) >> kSearchStrength) + stepSize;
 continue;
 }
-{   const BYTE* matchEnd = matchIndex < prefixStartIndex ? dictEnd : iend;
+{   const BYTE* const matchEnd = matchIndex < prefixStartIndex ? dictEnd : iend;
-const BYTE* lowMatchPtr = matchIndex < prefixStartIndex ? dictStart : prefixStart;
+const BYTE* const lowMatchPtr = matchIndex < prefixStartIndex ? dictStart : prefixStart;
 U32 offset;
 mLength = ZSTD_count_2segments(ip+4, match+4, iend, matchEnd, prefixStart) + 4;
 while (((ip>anchor) & (match>lowMatchPtr)) && (ip[-1] == match[-1])) { ip--; match--; mLength++; }   /* catch up */
 offset = current - matchIndex;
 offset_2 = offset_1;
 offset_1 = offset;
-ZSTD_storeSeq(seqStore, ip-anchor, anchor, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
+ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
 }   }
 /* found a match : store it */
 ip += mLength;
 anchor = ip;
 const BYTE* repMatch2 = repIndex2 < prefixStartIndex ? dictBase + repIndex2 : base + repIndex2;
 if ( (((U32)((prefixStartIndex-1) - repIndex2) >= 3) & (repIndex2 > dictStartIndex))  /* intentional overflow */
 && (MEM_read32(repMatch2) == MEM_read32(ip)) ) {
 const BYTE* const repEnd2 = repIndex2 < prefixStartIndex ? dictEnd : iend;
 size_t const repLength2 = ZSTD_count_2segments(ip+4, repMatch2+4, iend, repEnd2, prefixStart) + 4;
-U32 tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset;   /* swap offset_2 <=> offset_1 */
+U32 const tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset;   /* swap offset_2 <=> offset_1 */
 ZSTD_storeSeq(seqStore, 0, anchor, 0, repLength2-MINMATCH);
 hashTable[ZSTD_hashPtr(ip, hlog, mls)] = current2;
 ip += repLength2;
 anchor = ip;
 continue;
 /* save reps for next block */
 rep[0] = offset_1;
 rep[1] = offset_2;
 /* Return the last literals size */
-return iend - anchor;
+return (size_t)(iend - anchor);
 }
 size_t ZSTD_compressBlock_fast_extDict(
 ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],

changeset 42937	69de49c4e39c
parent 42070	675775c33ab6
child 43994	de7838053207