ZSTD_REP_NUM removed from ZSTD_storeSeq
diff --git a/lib/zstd_compress.c b/lib/zstd_compress.c
index 60bbd84..8ba9435 100644
--- a/lib/zstd_compress.c
+++ b/lib/zstd_compress.c
@@ -776,7 +776,7 @@
else *(seqStorePtr->litLength++) = (BYTE)litLength;
/* match offset */
- *(seqStorePtr->offset++) = (U32)offsetCode + ZSTD_REP_NUM - 1;
+ *(seqStorePtr->offset++) = (U32)offsetCode;
/* match Length */
if (matchCode >= MaxML) {
@@ -997,7 +997,7 @@
}
/* match found */
- ZSTD_storeSeq(seqStorePtr, ip-anchor, anchor, offset, mlCode);
+ ZSTD_storeSeq(seqStorePtr, ip-anchor, anchor, offset + ZSTD_REP_NUM - 1, mlCode);
ip += mlCode + MINMATCH;
anchor = ip;
@@ -1012,7 +1012,7 @@
size_t rlCode = ZSTD_count(ip+MINMATCH, ip+MINMATCH-offset_2, iend);
size_t tmpOff = offset_2; offset_2 = offset_1; offset_1 = tmpOff; /* swap offset_2 <=> offset_1 */
hashTable[ZSTD_hashPtr(ip, hBits, mls)] = (U32)(ip-base);
- ZSTD_storeSeq(seqStorePtr, 0, anchor, 0, rlCode);
+ ZSTD_storeSeq(seqStorePtr, 0, anchor, 0 + ZSTD_REP_NUM - 1, rlCode);
ip += rlCode+MINMATCH;
anchor = ip;
continue; /* faster when present ... (?) */
@@ -1109,7 +1109,7 @@
} }
/* found a match : store it */
- ZSTD_storeSeq(seqStorePtr, ip-anchor, anchor, offset, mlCode);
+ ZSTD_storeSeq(seqStorePtr, ip-anchor, anchor, offset + ZSTD_REP_NUM - 1, mlCode);
ip += mlCode + MINMATCH;
anchor = ip;
@@ -1127,7 +1127,7 @@
const BYTE* const repEnd2 = repIndex2 < dictLimit ? dictEnd : iend;
size_t repLength2 = ZSTD_count_2segments(ip+MINMATCH, repMatch2+MINMATCH, iend, repEnd2, lowPrefixPtr);
U32 tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset; /* swap offset_2 <=> offset_1 */
- ZSTD_storeSeq(seqStorePtr, 0, anchor, 0, repLength2);
+ ZSTD_storeSeq(seqStorePtr, 0, anchor, 0 + ZSTD_REP_NUM - 1, repLength2);
hashTable[ZSTD_hashPtr(ip, hBits, mls)] = current2;
ip += repLength2+MINMATCH;
anchor = ip;
@@ -1648,7 +1648,7 @@
_storeSequence:
{
size_t litLength = start - anchor;
- ZSTD_storeSeq(seqStorePtr, litLength, anchor, offset, matchLength-MINMATCH);
+ ZSTD_storeSeq(seqStorePtr, litLength, anchor, offset + ZSTD_REP_NUM - 1, matchLength-MINMATCH);
anchor = ip = start + matchLength;
}
@@ -1660,7 +1660,7 @@
offset = offset_2;
offset_2 = offset_1;
offset_1 = offset;
- ZSTD_storeSeq(seqStorePtr, 0, anchor, 0, matchLength);
+ ZSTD_storeSeq(seqStorePtr, 0, anchor, 0 + ZSTD_REP_NUM - 1, matchLength);
ip += matchLength+MINMATCH;
anchor = ip;
continue; /* faster when present ... (?) */
@@ -1843,7 +1843,7 @@
_storeSequence:
{
size_t litLength = start - anchor;
- ZSTD_storeSeq(seqStorePtr, litLength, anchor, offset, matchLength-MINMATCH);
+ ZSTD_storeSeq(seqStorePtr, litLength, anchor, offset + ZSTD_REP_NUM - 1, matchLength-MINMATCH);
anchor = ip = start + matchLength;
}
@@ -1858,7 +1858,7 @@
const BYTE* const repEnd = repIndex < dictLimit ? dictEnd : iend;
matchLength = ZSTD_count_2segments(ip+MINMATCH, repMatch+MINMATCH, iend, repEnd, prefixStart) + MINMATCH;
offset = offset_2; offset_2 = offset_1; offset_1 = offset; /* swap offset history */
- ZSTD_storeSeq(seqStorePtr, 0, anchor, 0, matchLength-MINMATCH);
+ ZSTD_storeSeq(seqStorePtr, 0, anchor, 0 + ZSTD_REP_NUM - 1, matchLength-MINMATCH);
ip += matchLength;
anchor = ip;
continue; /* faster when present ... (?) */
diff --git a/lib/zstd_opt.h b/lib/zstd_opt.h
index c8fa017..e3cab29 100644
--- a/lib/zstd_opt.h
+++ b/lib/zstd_opt.h
@@ -688,7 +688,7 @@
#endif
ZSTD_updatePrice(seqStorePtr, litLength, anchor, offset, mlen-minMatch);
- ZSTD_storeSeq(seqStorePtr, litLength, anchor, offset, mlen-minMatch);
+ ZSTD_storeSeq(seqStorePtr, litLength, anchor, offset + ZSTD_REP_NUM - 1, mlen-minMatch);
anchor = ip = ip + mlen;
} /* for (cur=0; cur < last_pos; ) */
@@ -702,7 +702,7 @@
rep[0] = best_off;
ZSTD_LOG_ENCODE("%d/%d: ENCODE REP literals=%d mlen=%d off=%d rep1=%d rep2=%d\n", (int)(anchor-base), (int)(iend-base), (int)(0), (int)best_mlen, (int)(0), (int)rep[0], (int)rep[1]);
ZSTD_updatePrice(seqStorePtr, 0, anchor, 0, best_mlen);
- ZSTD_storeSeq(seqStorePtr, 0, anchor, 0, best_mlen);
+ ZSTD_storeSeq(seqStorePtr, 0, anchor, 0 + ZSTD_REP_NUM - 1, best_mlen);
anchor += best_mlen+minMatch;
continue; /* faster when present ... (?) */
}
@@ -1036,7 +1036,7 @@
#endif
ZSTD_updatePrice(seqStorePtr, litLength, anchor, offset, mlen-minMatch);
- ZSTD_storeSeq(seqStorePtr, litLength, anchor, offset, mlen-minMatch);
+ ZSTD_storeSeq(seqStorePtr, litLength, anchor, offset + ZSTD_REP_NUM - 1, mlen-minMatch);
anchor = ip = ip + mlen;
}
@@ -1059,7 +1059,7 @@
offset = rep[1]; rep[1] = rep[0]; rep[0] = offset; /* swap offset history */
ZSTD_LOG_ENCODE("%d/%d: ENCODE REP literals=%d mlen=%d off=%d rep1=%d rep2=%d\n", (int)(anchor-base), (int)(iend-base), (int)(0), (int)best_mlen, (int)(0), (int)rep[0], (int)rep[1]);
ZSTD_updatePrice(seqStorePtr, 0, anchor, 0, mlen-minMatch);
- ZSTD_storeSeq(seqStorePtr, 0, anchor, 0, mlen-minMatch);
+ ZSTD_storeSeq(seqStorePtr, 0, anchor, 0 + ZSTD_REP_NUM - 1, mlen-minMatch);
anchor += mlen;
}
#else
@@ -1077,7 +1077,7 @@
offset = rep[1]; rep[1] = rep[0]; rep[0] = offset; /* swap offset history */
ZSTD_LOG_ENCODE("%d/%d: ENCODE REP literals=%d mlen=%d off=%d rep1=%d rep2=%d\n", (int)(anchor-base), (int)(iend-base), (int)(0), (int)best_mlen, (int)(0), (int)rep[0], (int)rep[1]);
ZSTD_updatePrice(seqStorePtr, 0, anchor, 0, mlen-minMatch);
- ZSTD_storeSeq(seqStorePtr, 0, anchor, 0, mlen-minMatch);
+ ZSTD_storeSeq(seqStorePtr, 0, anchor, 0 + ZSTD_REP_NUM - 1, mlen-minMatch);
anchor += mlen;
continue; /* faster when present ... (?) */
}
