##// END OF EJS Templates
packaging: stage files and dynamically generate WiX installer...
packaging: stage files and dynamically generate WiX installer Like we did for Inno, we want to make the WiX installer "dumb" and simply consume source files from a directory tree rather than have to define every single file in installer files. This will greatly decrease the amount of effort required to maintain the WiX installer since we don't have to think that much about keeping files in sync. This commit changes the WiX packager to populate a staging directory as part of packaging. After it does so, it scans that directory and dynamically generates WiX XML defining the content within. The IDs and GUIDs being generated are deterministic. So, upgrades should work as expected in Windows Installer land. (WiX has a "heat" tool that can generate XML by walking the filesystem but it doesn't have this deterministic property, sadly.) As part of this change, GUIDs are now effectively reset. So the next upgrade should be a complete wipe and replace. This could potentially cause issues. But in my local testing, I was able to upgrade an existing 5.1.2 install without issue. Compared to the previous commit, the installed files differ in the following: * A ReleaseNotes.txt file is now included * A hgrc.d/editor.rc file is now generated (mercurial.rc has been updated to reflect this logical change to the content source) * All files are marked as read-only. Previously, only a subset of files were. This should help prevent unwanted tampering. Although we may want to consider use cases like modifying template files... This change also means that Inno and WiX are now using very similar code for managing the install layout. This means that on disk both packages are nearly identical. The differences in install layout are as follows: * Inno has a Copying.txt vs a COPYING.rtf for WiX. (The WiX installer wants to use RTF.) * Inno has a Mercurial.url file that is an internet shortcut to www.mercurial-scm.org. (This could potentially be removed.) * Inno includes msvc[mpr]90.dll files and WiX does not. (WiX installs the MSVC runtime via merge modules.) * Inno includes unins000.{dat,exe} files. (WiX's state is managed by Windows Installer, which places things elsewhere.) Because file lists are dynamically generated now, the test ensuring things remain in sync has been deleted. Good riddance. While this is a huge step towards unifying the Windows installers, there's still some improvements that can be made. But I think it is worth celebrating the milestone of getting both Inno and WiX to essentially share core packaging code and workflows. That should make it much easier to change the installers going forward. This will aid support of Python 3. Differential Revision: https://phab.mercurial-scm.org/D7173

File last commit:

r43207:69de49c4 default
r44022:94eac340 default
Show More
zstd_double_fast.c
518 lines | 24.6 KiB | text/x-c | CLexer
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 /*
* Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under both the BSD-style license (found in the
* LICENSE file in the root directory of this source tree) and the GPLv2 (found
* in the COPYING file in the root directory of this source tree).
* You may select, at your option, one of the above-listed licenses.
*/
#include "zstd_compress_internal.h"
#include "zstd_double_fast.h"
void ZSTD_fillDoubleHashTable(ZSTD_matchState_t* ms,
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 void const* end, ZSTD_dictTableLoadMethod_e dtlm)
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 {
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 const ZSTD_compressionParameters* const cParams = &ms->cParams;
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 U32* const hashLarge = ms->hashTable;
U32 const hBitsL = cParams->hashLog;
Gregory Szorc
zstandard: vendor python-zstandard 0.11...
r42237 U32 const mls = cParams->minMatch;
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 U32* const hashSmall = ms->chainTable;
U32 const hBitsS = cParams->chainLog;
const BYTE* const base = ms->window.base;
const BYTE* ip = base + ms->nextToUpdate;
const BYTE* const iend = ((const BYTE*)end) - HASH_READ_SIZE;
const U32 fastHashFillStep = 3;
/* Always insert every fastHashFillStep position into the hash tables.
* Insert the other positions into the large hash table if their entry
* is empty.
*/
for (; ip + fastHashFillStep - 1 <= iend; ip += fastHashFillStep) {
U32 const current = (U32)(ip - base);
U32 i;
for (i = 0; i < fastHashFillStep; ++i) {
size_t const smHash = ZSTD_hashPtr(ip + i, hBitsS, mls);
size_t const lgHash = ZSTD_hashPtr(ip + i, hBitsL, 8);
if (i == 0)
hashSmall[smHash] = current + i;
if (i == 0 || hashLarge[lgHash] == 0)
hashLarge[lgHash] = current + i;
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 /* Only load extra positions for ZSTD_dtlm_full */
if (dtlm == ZSTD_dtlm_fast)
break;
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 } }
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 }
FORCE_INLINE_TEMPLATE
size_t ZSTD_compressBlock_doubleFast_generic(
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 void const* src, size_t srcSize,
U32 const mls /* template */, ZSTD_dictMode_e const dictMode)
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 {
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 ZSTD_compressionParameters const* cParams = &ms->cParams;
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 U32* const hashLong = ms->hashTable;
const U32 hBitsL = cParams->hashLog;
U32* const hashSmall = ms->chainTable;
const U32 hBitsS = cParams->chainLog;
const BYTE* const base = ms->window.base;
const BYTE* const istart = (const BYTE*)src;
const BYTE* ip = istart;
const BYTE* anchor = istart;
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 const U32 endIndex = (U32)((size_t)(istart - base) + srcSize);
const U32 lowestValid = ms->window.dictLimit;
const U32 maxDistance = 1U << cParams->windowLog;
/* presumes that, if there is a dictionary, it must be using Attach mode */
const U32 prefixLowestIndex = (endIndex - lowestValid > maxDistance) ? endIndex - maxDistance : lowestValid;
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 const BYTE* const prefixLowest = base + prefixLowestIndex;
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 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;
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 const ZSTD_matchState_t* const dms = ms->dictMatchState;
const ZSTD_compressionParameters* const dictCParams =
dictMode == ZSTD_dictMatchState ?
&dms->cParams : NULL;
const U32* const dictHashLong = dictMode == ZSTD_dictMatchState ?
dms->hashTable : NULL;
const U32* const dictHashSmall = dictMode == ZSTD_dictMatchState ?
dms->chainTable : NULL;
const U32 dictStartIndex = dictMode == ZSTD_dictMatchState ?
dms->window.dictLimit : 0;
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 ?
prefixLowestIndex - (U32)(dictEnd - dictBase) :
0;
const U32 dictHBitsL = dictMode == ZSTD_dictMatchState ?
dictCParams->hashLog : hBitsL;
const U32 dictHBitsS = dictMode == ZSTD_dictMatchState ?
dictCParams->chainLog : hBitsS;
const U32 dictAndPrefixLength = (U32)(ip - prefixLowest + dictEnd - dictStart);
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 DEBUGLOG(5, "ZSTD_compressBlock_doubleFast_generic");
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 assert(dictMode == ZSTD_noDict || dictMode == ZSTD_dictMatchState);
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 /* if a dictionary is attached, it must be within window range */
if (dictMode == ZSTD_dictMatchState) {
assert(lowestValid + maxDistance >= endIndex);
}
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 /* init */
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 ip += (dictAndPrefixLength == 0);
if (dictMode == ZSTD_noDict) {
U32 const maxRep = (U32)(ip - prefixLowest);
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 if (offset_2 > maxRep) offsetSaved = offset_2, offset_2 = 0;
if (offset_1 > maxRep) offsetSaved = offset_1, offset_1 = 0;
}
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 if (dictMode == ZSTD_dictMatchState) {
/* dictMatchState repCode checks don't currently handle repCode == 0
* disabling. */
assert(offset_1 <= dictAndPrefixLength);
assert(offset_2 <= dictAndPrefixLength);
}
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513
/* Main Search Loop */
while (ip < ilimit) { /* < instead of <=, because repcode check at (ip+1) */
size_t mLength;
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 U32 offset;
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 size_t const h2 = ZSTD_hashPtr(ip, hBitsL, 8);
size_t const h = ZSTD_hashPtr(ip, hBitsS, mls);
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 size_t const dictHL = ZSTD_hashPtr(ip, dictHBitsL, 8);
size_t const dictHS = ZSTD_hashPtr(ip, dictHBitsS, mls);
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 U32 const current = (U32)(ip-base);
U32 const matchIndexL = hashLong[h2];
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 U32 matchIndexS = hashSmall[h];
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 const BYTE* matchLong = base + matchIndexL;
const BYTE* match = base + matchIndexS;
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 const U32 repIndex = current + 1 - offset_1;
const BYTE* repMatch = (dictMode == ZSTD_dictMatchState
&& repIndex < prefixLowestIndex) ?
dictBase + (repIndex - dictIndexDelta) :
base + repIndex;
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 hashLong[h2] = hashSmall[h] = current; /* update hash tables */
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 /* check dictMatchState repcode */
if (dictMode == ZSTD_dictMatchState
&& ((U32)((prefixLowestIndex-1) - repIndex) >= 3 /* intentional underflow */)
&& (MEM_read32(repMatch) == MEM_read32(ip+1)) ) {
const BYTE* repMatchEnd = repIndex < prefixLowestIndex ? dictEnd : iend;
mLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repMatchEnd, prefixLowest) + 4;
ip++;
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, 0, mLength-MINMATCH);
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 goto _match_stored;
}
/* check noDict repcode */
if ( dictMode == ZSTD_noDict
&& ((offset_1 > 0) & (MEM_read32(ip+1-offset_1) == MEM_read32(ip+1)))) {
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 mLength = ZSTD_count(ip+1+4, ip+1+4-offset_1, iend) + 4;
ip++;
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, 0, mLength-MINMATCH);
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 goto _match_stored;
}
if (matchIndexL > prefixLowestIndex) {
/* check prefix long match */
if (MEM_read64(matchLong) == MEM_read64(ip)) {
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 mLength = ZSTD_count(ip+8, matchLong+8, iend) + 8;
offset = (U32)(ip-matchLong);
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 while (((ip>anchor) & (matchLong>prefixLowest)) && (ip[-1] == matchLong[-1])) { ip--; matchLong--; mLength++; } /* catch up */
goto _match_found;
}
} else if (dictMode == ZSTD_dictMatchState) {
/* check dictMatchState long match */
U32 const dictMatchIndexL = dictHashLong[dictHL];
const BYTE* dictMatchL = dictBase + dictMatchIndexL;
assert(dictMatchL < dictEnd);
if (dictMatchL > dictStart && MEM_read64(dictMatchL) == MEM_read64(ip)) {
mLength = ZSTD_count_2segments(ip+8, dictMatchL+8, iend, dictEnd, prefixLowest) + 8;
offset = (U32)(current - dictMatchIndexL - dictIndexDelta);
while (((ip>anchor) & (dictMatchL>dictStart)) && (ip[-1] == dictMatchL[-1])) { ip--; dictMatchL--; mLength++; } /* catch up */
goto _match_found;
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 } }
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157
if (matchIndexS > prefixLowestIndex) {
/* check prefix short match */
if (MEM_read32(match) == MEM_read32(ip)) {
goto _search_next_long;
}
} else if (dictMode == ZSTD_dictMatchState) {
/* check dictMatchState short match */
U32 const dictMatchIndexS = dictHashSmall[dictHS];
match = dictBase + dictMatchIndexS;
matchIndexS = dictMatchIndexS + dictIndexDelta;
if (match > dictStart && MEM_read32(match) == MEM_read32(ip)) {
goto _search_next_long;
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 } }
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157
ip += ((ip-anchor) >> kSearchStrength) + 1;
continue;
_search_next_long:
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 { size_t const hl3 = ZSTD_hashPtr(ip+1, hBitsL, 8);
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 size_t const dictHLNext = ZSTD_hashPtr(ip+1, dictHBitsL, 8);
U32 const matchIndexL3 = hashLong[hl3];
const BYTE* matchL3 = base + matchIndexL3;
hashLong[hl3] = current + 1;
/* check prefix long +1 match */
if (matchIndexL3 > prefixLowestIndex) {
if (MEM_read64(matchL3) == MEM_read64(ip+1)) {
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 mLength = ZSTD_count(ip+9, matchL3+8, iend) + 8;
ip++;
offset = (U32)(ip-matchL3);
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 while (((ip>anchor) & (matchL3>prefixLowest)) && (ip[-1] == matchL3[-1])) { ip--; matchL3--; mLength++; } /* catch up */
goto _match_found;
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 }
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 } else if (dictMode == ZSTD_dictMatchState) {
/* check dict long +1 match */
U32 const dictMatchIndexL3 = dictHashLong[dictHLNext];
const BYTE* dictMatchL3 = dictBase + dictMatchIndexL3;
assert(dictMatchL3 < dictEnd);
if (dictMatchL3 > dictStart && MEM_read64(dictMatchL3) == MEM_read64(ip+1)) {
mLength = ZSTD_count_2segments(ip+1+8, dictMatchL3+8, iend, dictEnd, prefixLowest) + 8;
ip++;
offset = (U32)(current + 1 - dictMatchIndexL3 - dictIndexDelta);
while (((ip>anchor) & (dictMatchL3>dictStart)) && (ip[-1] == dictMatchL3[-1])) { ip--; dictMatchL3--; mLength++; } /* catch up */
goto _match_found;
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 } } }
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 /* if no long +1 match, explore the short match we found */
if (dictMode == ZSTD_dictMatchState && matchIndexS < prefixLowestIndex) {
mLength = ZSTD_count_2segments(ip+4, match+4, iend, dictEnd, prefixLowest) + 4;
offset = (U32)(current - matchIndexS);
while (((ip>anchor) & (match>dictStart)) && (ip[-1] == match[-1])) { ip--; match--; mLength++; } /* catch up */
} else {
mLength = ZSTD_count(ip+4, match+4, iend) + 4;
offset = (U32)(ip - match);
while (((ip>anchor) & (match>prefixLowest)) && (ip[-1] == match[-1])) { ip--; match--; mLength++; } /* catch up */
}
/* fall-through */
_match_found:
offset_2 = offset_1;
offset_1 = offset;
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157
_match_stored:
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 /* match found */
ip += mLength;
anchor = ip;
if (ip <= ilimit) {
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 /* Complementary insertion */
/* done after iLimit test, as candidates could be > iend-8 */
{ U32 const indexToInsert = current+2;
hashLong[ZSTD_hashPtr(base+indexToInsert, hBitsL, 8)] = indexToInsert;
hashLong[ZSTD_hashPtr(ip-2, hBitsL, 8)] = (U32)(ip-2-base);
hashSmall[ZSTD_hashPtr(base+indexToInsert, hBitsS, mls)] = indexToInsert;
hashSmall[ZSTD_hashPtr(ip-1, hBitsS, mls)] = (U32)(ip-1-base);
}
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513
/* check immediate repcode */
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 if (dictMode == ZSTD_dictMatchState) {
while (ip <= ilimit) {
U32 const current2 = (U32)(ip-base);
U32 const repIndex2 = current2 - offset_2;
const BYTE* repMatch2 = dictMode == ZSTD_dictMatchState
&& repIndex2 < prefixLowestIndex ?
dictBase - dictIndexDelta + repIndex2 :
base + repIndex2;
if ( ((U32)((prefixLowestIndex-1) - (U32)repIndex2) >= 3 /* intentional overflow */)
&& (MEM_read32(repMatch2) == MEM_read32(ip)) ) {
const BYTE* const repEnd2 = repIndex2 < prefixLowestIndex ? dictEnd : iend;
size_t const repLength2 = ZSTD_count_2segments(ip+4, repMatch2+4, iend, repEnd2, prefixLowest) + 4;
U32 tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset; /* swap offset_2 <=> offset_1 */
ZSTD_storeSeq(seqStore, 0, anchor, 0, repLength2-MINMATCH);
hashSmall[ZSTD_hashPtr(ip, hBitsS, mls)] = current2;
hashLong[ZSTD_hashPtr(ip, hBitsL, 8)] = current2;
ip += repLength2;
anchor = ip;
continue;
}
break;
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 } }
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157
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 */
hashSmall[ZSTD_hashPtr(ip, hBitsS, mls)] = (U32)(ip-base);
hashLong[ZSTD_hashPtr(ip, hBitsL, 8)] = (U32)(ip-base);
ZSTD_storeSeq(seqStore, 0, anchor, 0, rLength-MINMATCH);
ip += rLength;
anchor = ip;
continue; /* faster when present ... (?) */
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 } } }
} /* while (ip < ilimit) */
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513
/* save reps for next block */
rep[0] = offset_1 ? offset_1 : offsetSaved;
rep[1] = offset_2 ? offset_2 : offsetSaved;
/* Return the last literals size */
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 return (size_t)(iend - anchor);
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 }
size_t ZSTD_compressBlock_doubleFast(
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 void const* src, size_t srcSize)
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 {
Gregory Szorc
zstandard: vendor python-zstandard 0.11...
r42237 const U32 mls = ms->cParams.minMatch;
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 switch(mls)
{
default: /* includes case 3 */
case 4 :
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 4, ZSTD_noDict);
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 case 5 :
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 5, ZSTD_noDict);
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 case 6 :
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 6, ZSTD_noDict);
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 case 7 :
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 7, ZSTD_noDict);
}
}
size_t ZSTD_compressBlock_doubleFast_dictMatchState(
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
void const* src, size_t srcSize)
{
Gregory Szorc
zstandard: vendor python-zstandard 0.11...
r42237 const U32 mls = ms->cParams.minMatch;
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 switch(mls)
{
default: /* includes case 3 */
case 4 :
return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 4, ZSTD_dictMatchState);
case 5 :
return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 5, ZSTD_dictMatchState);
case 6 :
return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 6, ZSTD_dictMatchState);
case 7 :
return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, 7, ZSTD_dictMatchState);
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 }
}
static size_t ZSTD_compressBlock_doubleFast_extDict_generic(
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 void const* src, size_t srcSize,
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 U32 const mls /* template */)
{
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 ZSTD_compressionParameters const* cParams = &ms->cParams;
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 U32* const hashLong = ms->hashTable;
U32 const hBitsL = cParams->hashLog;
U32* const hashSmall = ms->chainTable;
U32 const hBitsS = cParams->chainLog;
const BYTE* const istart = (const BYTE*)src;
const BYTE* ip = istart;
const BYTE* anchor = istart;
const BYTE* const iend = istart + srcSize;
const BYTE* const ilimit = iend - 8;
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 const BYTE* const base = ms->window.base;
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 const U32 endIndex = (U32)((size_t)(istart - base) + srcSize);
const U32 lowLimit = ZSTD_getLowestMatchIndex(ms, endIndex, cParams->windowLog);
const U32 dictStartIndex = lowLimit;
const U32 dictLimit = ms->window.dictLimit;
const U32 prefixStartIndex = (dictLimit > lowLimit) ? dictLimit : lowLimit;
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 const BYTE* const prefixStart = base + prefixStartIndex;
const BYTE* const dictBase = ms->window.dictBase;
const BYTE* const dictStart = dictBase + dictStartIndex;
const BYTE* const dictEnd = dictBase + prefixStartIndex;
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 U32 offset_1=rep[0], offset_2=rep[1];
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 DEBUGLOG(5, "ZSTD_compressBlock_doubleFast_extDict_generic (srcSize=%zu)", srcSize);
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 /* if extDict is invalidated due to maxDistance, switch to "regular" variant */
if (prefixStartIndex == dictStartIndex)
return ZSTD_compressBlock_doubleFast_generic(ms, seqStore, rep, src, srcSize, mls, ZSTD_noDict);
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 /* Search Loop */
while (ip < ilimit) { /* < instead of <=, because (ip+1) */
const size_t hSmall = ZSTD_hashPtr(ip, hBitsS, mls);
const U32 matchIndex = hashSmall[hSmall];
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 const BYTE* const matchBase = matchIndex < prefixStartIndex ? dictBase : base;
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 const BYTE* match = matchBase + matchIndex;
const size_t hLong = ZSTD_hashPtr(ip, hBitsL, 8);
const U32 matchLongIndex = hashLong[hLong];
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 const BYTE* const matchLongBase = matchLongIndex < prefixStartIndex ? dictBase : base;
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 const BYTE* matchLong = matchLongBase + matchLongIndex;
const U32 current = (U32)(ip-base);
const U32 repIndex = current + 1 - offset_1; /* offset_1 expected <= current +1 */
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 const BYTE* const repBase = repIndex < prefixStartIndex ? dictBase : base;
const BYTE* const repMatch = repBase + repIndex;
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 size_t mLength;
hashSmall[hSmall] = hashLong[hLong] = current; /* update hash table */
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 if ((((U32)((prefixStartIndex-1) - repIndex) >= 3) /* intentional underflow : ensure repIndex doesn't overlap dict + prefix */
& (repIndex > dictStartIndex))
&& (MEM_read32(repMatch) == MEM_read32(ip+1)) ) {
const BYTE* repMatchEnd = repIndex < prefixStartIndex ? dictEnd : iend;
mLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repMatchEnd, prefixStart) + 4;
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 ip++;
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, 0, mLength-MINMATCH);
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 } else {
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 if ((matchLongIndex > dictStartIndex) && (MEM_read64(matchLong) == MEM_read64(ip))) {
const BYTE* const matchEnd = matchLongIndex < prefixStartIndex ? dictEnd : iend;
const BYTE* const lowMatchPtr = matchLongIndex < prefixStartIndex ? dictStart : prefixStart;
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 U32 offset;
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 mLength = ZSTD_count_2segments(ip+8, matchLong+8, iend, matchEnd, prefixStart) + 8;
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 offset = current - matchLongIndex;
while (((ip>anchor) & (matchLong>lowMatchPtr)) && (ip[-1] == matchLong[-1])) { ip--; matchLong--; mLength++; } /* catch up */
offset_2 = offset_1;
offset_1 = offset;
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 } else if ((matchIndex > dictStartIndex) && (MEM_read32(match) == MEM_read32(ip))) {
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 size_t const h3 = ZSTD_hashPtr(ip+1, hBitsL, 8);
U32 const matchIndex3 = hashLong[h3];
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 const BYTE* const match3Base = matchIndex3 < prefixStartIndex ? dictBase : base;
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 const BYTE* match3 = match3Base + matchIndex3;
U32 offset;
hashLong[h3] = current + 1;
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 if ( (matchIndex3 > dictStartIndex) && (MEM_read64(match3) == MEM_read64(ip+1)) ) {
const BYTE* const matchEnd = matchIndex3 < prefixStartIndex ? dictEnd : iend;
const BYTE* const lowMatchPtr = matchIndex3 < prefixStartIndex ? dictStart : prefixStart;
mLength = ZSTD_count_2segments(ip+9, match3+8, iend, matchEnd, prefixStart) + 8;
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 ip++;
offset = current+1 - matchIndex3;
while (((ip>anchor) & (match3>lowMatchPtr)) && (ip[-1] == match3[-1])) { ip--; match3--; mLength++; } /* catch up */
} else {
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 const BYTE* const matchEnd = matchIndex < prefixStartIndex ? dictEnd : iend;
const BYTE* const lowMatchPtr = matchIndex < prefixStartIndex ? dictStart : prefixStart;
mLength = ZSTD_count_2segments(ip+4, match+4, iend, matchEnd, prefixStart) + 4;
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 offset = current - matchIndex;
while (((ip>anchor) & (match>lowMatchPtr)) && (ip[-1] == match[-1])) { ip--; match--; mLength++; } /* catch up */
}
offset_2 = offset_1;
offset_1 = offset;
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, offset + ZSTD_REP_MOVE, mLength-MINMATCH);
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513
} else {
ip += ((ip-anchor) >> kSearchStrength) + 1;
continue;
} }
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 /* move to next sequence start */
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 ip += mLength;
anchor = ip;
if (ip <= ilimit) {
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 /* Complementary insertion */
/* done after iLimit test, as candidates could be > iend-8 */
{ U32 const indexToInsert = current+2;
hashLong[ZSTD_hashPtr(base+indexToInsert, hBitsL, 8)] = indexToInsert;
hashLong[ZSTD_hashPtr(ip-2, hBitsL, 8)] = (U32)(ip-2-base);
hashSmall[ZSTD_hashPtr(base+indexToInsert, hBitsS, mls)] = indexToInsert;
hashSmall[ZSTD_hashPtr(ip-1, hBitsS, mls)] = (U32)(ip-1-base);
}
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 /* check immediate repcode */
while (ip <= ilimit) {
U32 const current2 = (U32)(ip-base);
U32 const repIndex2 = current2 - offset_2;
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 const BYTE* repMatch2 = repIndex2 < prefixStartIndex ? dictBase + repIndex2 : base + repIndex2;
if ( (((U32)((prefixStartIndex-1) - repIndex2) >= 3) /* intentional overflow : ensure repIndex2 doesn't overlap dict + prefix */
& (repIndex2 > dictStartIndex))
&& (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 const tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset; /* swap offset_2 <=> offset_1 */
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 ZSTD_storeSeq(seqStore, 0, anchor, 0, repLength2-MINMATCH);
hashSmall[ZSTD_hashPtr(ip, hBitsS, mls)] = current2;
hashLong[ZSTD_hashPtr(ip, hBitsL, 8)] = current2;
ip += repLength2;
anchor = ip;
continue;
}
break;
} } }
/* save reps for next block */
rep[0] = offset_1;
rep[1] = offset_2;
/* Return the last literals size */
Gregory Szorc
zstandard: vendor python-zstandard 0.12...
r43207 return (size_t)(iend - anchor);
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 }
size_t ZSTD_compressBlock_doubleFast_extDict(
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 void const* src, size_t srcSize)
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 {
Gregory Szorc
zstandard: vendor python-zstandard 0.11...
r42237 U32 const mls = ms->cParams.minMatch;
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 switch(mls)
{
default: /* includes case 3 */
case 4 :
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 return ZSTD_compressBlock_doubleFast_extDict_generic(ms, seqStore, rep, src, srcSize, 4);
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 case 5 :
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 return ZSTD_compressBlock_doubleFast_extDict_generic(ms, seqStore, rep, src, srcSize, 5);
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 case 6 :
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 return ZSTD_compressBlock_doubleFast_extDict_generic(ms, seqStore, rep, src, srcSize, 6);
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 case 7 :
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 return ZSTD_compressBlock_doubleFast_extDict_generic(ms, seqStore, rep, src, srcSize, 7);
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 }
}