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

Adjust match backwards count args

Browse Source
This commit is contained in:
senhuang42 2020-10-14 15:23:03 -04:00
parent bf0d559449
commit 3f99c9b38d
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/compress/zstd_ldm.c
View File

@ -161,17 +161,15 @@ static size_t ZSTD_ldm_countBackwardsMatch(
* On reaching `pMatchBase`, start counting from mEnd */
static size_t ZSTD_ldm_countBackwardsMatch_2segments(
const BYTE* pIn, const BYTE* pAnchor,
const BYTE* pMatch, const BYTE* pMatchBase, const BYTE* mEnd)
const BYTE* pMatch, const BYTE* pMatchBase, const BYTE* dictStart, const BYTE* mEnd)
{
const BYTE* const vBegin = MAX(pIn - (pMatch - pMatchBase), pAnchor);
size_t const matchLength = ZSTD_ldm_countBackwardsMatch(pIn, vBegin, pMatch, pMatchBase);
if (pMatch - matchLength != pMatchBase) {
size_t const matchLength = ZSTD_ldm_countBackwardsMatch(pIn, pAnchor, pMatch, pMatchBase);
if (pMatch - matchLength != pMatchBase || pMatchBase == dictStart) {
return matchLength;
}
DEBUGLOG(7, "ZSTD_ldm_countBackwardsMatch_2segments: found a 2-parts backwards match (current length==%zu)", matchLength);
DEBUGLOG(7, "distance from pMatch to start = %zi", pMatch - pMatchBase);
DEBUGLOG(7, "final backwards match length = %zu", matchLength + ZSTD_ldm_countBackwardsMatch(pIn - matchLength, pAnchor, mEnd, pMatchBase));
return matchLength + ZSTD_ldm_countBackwardsMatch(pIn - matchLength, pAnchor, mEnd, pMatchBase);
return matchLength + ZSTD_ldm_countBackwardsMatch(pIn - matchLength, pAnchor, mEnd, dictStart);
}
/** ZSTD_ldm_fillFastTables() :
@ -350,7 +348,7 @@ static size_t ZSTD_ldm_generateSequences_internal(
}
curBackwardMatchLength =
ZSTD_ldm_countBackwardsMatch_2segments(ip, anchor, pMatch,
lowMatchPtr, dictEnd);
lowMatchPtr, dictStart, dictEnd);
curTotalMatchLength = curForwardMatchLength +
curBackwardMatchLength;
} else { /* !extDict */