facebook
/
zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

working 4 reps

dev
inikep 2016-04-05 09:34:13 +02:00
parent d6f208badf
commit 2ec2698ef9
2 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lib/zstd_decompress.c
View File

@ -656,17 +656,47 @@ static void ZSTD_decodeSequence(seq_t* seq, seqState_t* seqState, const U32 mls)
0xFFFFFF, 0x1FFFFFF, 0x3FFFFFF, /*fake*/ 1, 1, 1, 1, 1 }; 0xFFFFFF, 0x1FFFFFF, 0x3FFFFFF, /*fake*/ 1, 1, 1, 1, 1 };
/* sequence */ /* sequence */
{ size_t const offset = ofCode ? OF_base[ofCode] + BIT_readBits(&(seqState->DStream), ofBits) : /* <= 26 bits */ #if ZSTD_REP_NUM == 1
#if 1
{ size_t const offset = ofCode ? OF_base[ofCode] + BIT_readBits(&(seqState->DStream), ofBits) - ZSTD_REP_MOVE : /* <= 26 bits */
llCode ? seq->offset : seqState->prevOffset[0]; llCode ? seq->offset : seqState->prevOffset[0];
if (MEM_32bits()) BIT_reloadDStream(&(seqState->DStream)); if (MEM_32bits()) BIT_reloadDStream(&(seqState->DStream));
if (ofCode | !llCode) seqState->prevOffset[0] = seq->offset; /* cmove */ if (ofCode | !llCode) seqState->prevOffset[0] = seq->offset; /* cmove */
seq->offset = offset; seq->offset = offset;
}
#else
{ size_t offset;
if (ofCode) {
offset = OF_base[ofCode] + BIT_readBits(&(seqState->DStream), ofBits) - ZSTD_REP_MOVE; /* <= 26 bits */
if (MEM_32bits()) BIT_reloadDStream(&(seqState->DStream));
seqState->prevOffset[0] = seq->offset; /* cmove */
} else {
if (llCode) {
offset = seq->offset;
} else {
offset = seqState->prevOffset[0];
seqState->prevOffset[0] = seq->offset;
}
}
seq->offset = offset;
}
#endif
#if ZSTD_REP_NUM == 4
if (ofCode==0) offset = 0; #else // ZSTD_REP_NUM == 1
{ size_t offset;
if (ofCode) {
offset = OF_base[ofCode] + BIT_readBits(&(seqState->DStream), ofBits); /* <= 26 bits */
if (MEM_32bits()) BIT_reloadDStream(&(seqState->DStream));
} else {
offset = 0;
}
if (offset < ZSTD_REP_NUM) { if (offset < ZSTD_REP_NUM) {
if (litLength == 0 && offset <= 1) offset = 1-offset; if (llCode == 0 && offset <= 1) offset = 1-offset;
if (offset != 0) { if (offset != 0) {
size_t temp = seqState->prevOffset[offset]; size_t temp = seqState->prevOffset[offset];
@ -695,25 +725,13 @@ static void ZSTD_decodeSequence(seq_t* seq, seqState_t* seqState, const U32 mls)
seqState->prevOffset[kSlotNew] = offset; seqState->prevOffset[kSlotNew] = offset;
#endif #endif
} }
#else // ZSTD_REP_NUM == 1
#if 1 seq->offset = offset;
/* if (ofCode==0) offset = litLength ? seq->offset : seqState->prevOffset[0];
else offset -= ZSTD_REP_MOVE;
if (ofCode | !litLength) seqState->prevOffset[0] = seq->offset; */
#else
if (ofCode==0) {
if (!litLength) {
offset = seqState->prevOffset[0]; /* repcode, cmove */
seqState->prevOffset[0] = seq->offset; /* cmove */
} else
offset = seq->offset; /* repcode, cmove */
} else {
seqState->prevOffset[0] = seq->offset; /* cmove */
offset -= ZSTD_REP_MOVE;
} }
#endif #endif
#endif
}
seq->matchLength = ML_base[mlCode] + mls + ((mlCode>31) ? BIT_readBits(&(seqState->DStream), mlBits) : 0); /* <= 16 bits */ seq->matchLength = ML_base[mlCode] + mls + ((mlCode>31) ? BIT_readBits(&(seqState->DStream), mlBits) : 0); /* <= 16 bits */
if (MEM_32bits() && (mlBits+llBits>24)) BIT_reloadDStream(&(seqState->DStream)); if (MEM_32bits() && (mlBits+llBits>24)) BIT_reloadDStream(&(seqState->DStream));

2
lib/zstd_internal.h
View File

@ -64,7 +64,7 @@
#define ZSTD_OPT_NUM (1<<12) #define ZSTD_OPT_NUM (1<<12)
#define ZSTD_DICT_MAGIC 0xEC30A435 #define ZSTD_DICT_MAGIC 0xEC30A435
#if 0 #if 1
#define ZSTD_REP_NUM 4 #define ZSTD_REP_NUM 4
#define ZSTD_REP_INIT 4 #define ZSTD_REP_INIT 4
#define ZSTD_REP_MOVE (ZSTD_REP_NUM-1) #define ZSTD_REP_MOVE (ZSTD_REP_NUM-1)