ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor Huffman Decompression Away From Ternary Tree in ZSTD_decodeLiteralsBlock

Browse Source
This commit is contained in:
W. Felix Handte
2018-12-18 13:36:39 -08:00
parent 432314b58a
commit 4a0572b215
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/decompress/zstd_decompress_block.c
+26 -10
View File
@@ -95,6 +95,7 @@ size_t ZSTD_decodeLiteralsBlock(ZSTD_DCtx* dctx,
U32 singleStream=0; U32 singleStream=0;
U32 const lhlCode = (istart[0] >> 2) & 3; U32 const lhlCode = (istart[0] >> 2) & 3;
U32 const lhc = MEM_readLE32(istart); U32 const lhc = MEM_readLE32(istart);
size_t hufSuccess;
switch(lhlCode) switch(lhlCode)
{ {
case 0: case 1: default: /* note : default is impossible, since lhlCode into [0..3] */ case 0: case 1: default: /* note : default is impossible, since lhlCode into [0..3] */
@@ -125,16 +126,31 @@ size_t ZSTD_decodeLiteralsBlock(ZSTD_DCtx* dctx,
PREFETCH_AREA(dctx->HUFptr, sizeof(dctx->entropy.hufTable)); PREFETCH_AREA(dctx->HUFptr, sizeof(dctx->entropy.hufTable));
} }
if (HUF_isError((litEncType==set_repeat) ? if (litEncType==set_repeat) {
( singleStream ? if (singleStream) {
HUF_decompress1X_usingDTable_bmi2(dctx->litBuffer, litSize, istart+lhSize, litCSize, dctx->HUFptr, dctx->bmi2) : hufSuccess = HUF_decompress1X_usingDTable_bmi2(
HUF_decompress4X_usingDTable_bmi2(dctx->litBuffer, litSize, istart+lhSize, litCSize, dctx->HUFptr, dctx->bmi2) ) : dctx->litBuffer, litSize, istart+lhSize, litCSize,
( singleStream ? dctx->HUFptr, dctx->bmi2);
HUF_decompress1X1_DCtx_wksp_bmi2(dctx->entropy.hufTable, dctx->litBuffer, litSize, istart+lhSize, litCSize, } else {
dctx->workspace, sizeof(dctx->workspace), dctx->bmi2) : hufSuccess = HUF_decompress4X_usingDTable_bmi2(
HUF_decompress4X_hufOnly_wksp_bmi2(dctx->entropy.hufTable, dctx->litBuffer, litSize, istart+lhSize, litCSize, dctx->litBuffer, litSize, istart+lhSize, litCSize,
dctx->workspace, sizeof(dctx->workspace), dctx->bmi2)))) dctx->HUFptr, dctx->bmi2);
return ERROR(corruption_detected); }
} else {
if (singleStream) {
hufSuccess = HUF_decompress1X1_DCtx_wksp_bmi2(
dctx->entropy.hufTable, dctx->litBuffer, litSize,
istart+lhSize, litCSize, dctx->workspace,
sizeof(dctx->workspace), dctx->bmi2);
} else {
hufSuccess = HUF_decompress4X_hufOnly_wksp_bmi2(
dctx->entropy.hufTable, dctx->litBuffer, litSize,
istart+lhSize, litCSize, dctx->workspace,
sizeof(dctx->workspace), dctx->bmi2);
}
}
if (HUF_isError(hufSuccess)) return ERROR(corruption_detected);
dctx->litPtr = dctx->litBuffer; dctx->litPtr = dctx->litBuffer;
dctx->litSize = litSize; dctx->litSize = litSize;