zstdlib 0.7.0 → 0.10.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGES.md +20 -0
- data/README.md +7 -1
- data/Rakefile +38 -8
- data/ext/{zstdlib → zstdlib_c}/extconf.rb +11 -6
- data/ext/{zstdlib → zstdlib_c}/ruby/zlib-2.2/zstdlib.c +2 -2
- data/ext/{zstdlib → zstdlib_c}/ruby/zlib-2.3/zstdlib.c +2 -2
- data/ext/{zstdlib → zstdlib_c}/ruby/zlib-2.4/zstdlib.c +2 -2
- data/ext/{zstdlib → zstdlib_c}/ruby/zlib-2.5/zstdlib.c +2 -2
- data/ext/{zstdlib → zstdlib_c}/ruby/zlib-2.6/zstdlib.c +2 -2
- data/ext/{zstdlib → zstdlib_c}/ruby/zlib-2.7/zstdlib.c +2 -2
- data/ext/zstdlib_c/ruby/zlib-3.0/zstdlib.c +4994 -0
- data/ext/zstdlib_c/ruby/zlib-3.1/zstdlib.c +5076 -0
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/adler32.c +0 -0
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/compress.c +0 -0
- data/ext/zstdlib_c/zlib-1.2.12/crc32.c +1116 -0
- data/ext/zstdlib_c/zlib-1.2.12/crc32.h +9446 -0
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/deflate.c +78 -30
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/deflate.h +12 -15
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/gzclose.c +0 -0
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/gzguts.h +3 -2
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/gzlib.c +5 -3
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/gzread.c +5 -7
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/gzwrite.c +25 -13
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/infback.c +2 -1
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/inffast.c +14 -14
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/inffast.h +0 -0
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/inffixed.h +0 -0
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/inflate.c +39 -8
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/inflate.h +3 -2
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/inftrees.c +3 -3
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/inftrees.h +0 -0
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/trees.c +27 -48
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/trees.h +0 -0
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/uncompr.c +0 -0
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/zconf.h +0 -0
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/zlib.h +123 -100
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/zutil.c +2 -2
- data/ext/{zstdlib/zlib-1.2.11 → zstdlib_c/zlib-1.2.12}/zutil.h +12 -9
- data/ext/{zstdlib → zstdlib_c}/zlib.mk +0 -0
- data/ext/{zstdlib → zstdlib_c}/zlibwrapper/zlibwrapper.c +1 -5
- data/ext/{zstdlib → zstdlib_c}/zlibwrapper.mk +0 -0
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/common/bitstream.h +46 -22
- data/ext/zstdlib_c/zstd-1.5.2/lib/common/compiler.h +335 -0
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/common/cpu.h +1 -3
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/common/debug.c +1 -1
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/common/debug.h +12 -19
- data/ext/zstdlib_c/zstd-1.5.2/lib/common/entropy_common.c +368 -0
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/common/error_private.c +2 -1
- data/ext/zstdlib_c/zstd-1.5.2/lib/common/error_private.h +159 -0
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/common/fse.h +41 -12
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/common/fse_decompress.c +139 -22
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/common/huf.h +47 -23
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/common/mem.h +87 -98
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/common/pool.c +34 -23
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/common/pool.h +4 -4
- data/ext/zstdlib_c/zstd-1.5.2/lib/common/portability_macros.h +137 -0
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/common/threading.c +6 -5
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/common/threading.h +0 -0
- data/ext/zstdlib_c/zstd-1.5.2/lib/common/xxhash.c +24 -0
- data/ext/zstdlib_c/zstd-1.5.2/lib/common/xxhash.h +5686 -0
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/common/zstd_common.c +10 -10
- data/ext/zstdlib_c/zstd-1.5.2/lib/common/zstd_deps.h +111 -0
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/common/zstd_internal.h +191 -145
- data/ext/zstdlib_c/zstd-1.5.2/lib/common/zstd_trace.h +163 -0
- data/ext/zstdlib_c/zstd-1.5.2/lib/compress/clevels.h +134 -0
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/compress/fse_compress.c +89 -46
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/compress/hist.c +27 -29
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/compress/hist.h +2 -2
- data/ext/zstdlib_c/zstd-1.5.2/lib/compress/huf_compress.c +1370 -0
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/compress/zstd_compress.c +2917 -868
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/compress/zstd_compress_internal.h +458 -125
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/compress/zstd_compress_literals.c +12 -11
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/compress/zstd_compress_literals.h +4 -2
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/compress/zstd_compress_sequences.c +41 -18
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/compress/zstd_compress_sequences.h +1 -1
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/compress/zstd_compress_superblock.c +26 -298
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/compress/zstd_compress_superblock.h +1 -1
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/compress/zstd_cwksp.h +234 -83
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/compress/zstd_double_fast.c +313 -138
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/compress/zstd_double_fast.h +1 -1
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/compress/zstd_fast.c +329 -150
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/compress/zstd_fast.h +1 -1
- data/ext/zstdlib_c/zstd-1.5.2/lib/compress/zstd_lazy.c +2104 -0
- data/ext/zstdlib_c/zstd-1.5.2/lib/compress/zstd_lazy.h +125 -0
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/compress/zstd_ldm.c +321 -216
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/compress/zstd_ldm.h +9 -2
- data/ext/zstdlib_c/zstd-1.5.2/lib/compress/zstd_ldm_geartab.h +106 -0
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/compress/zstd_opt.c +412 -166
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/compress/zstd_opt.h +1 -1
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/compress/zstdmt_compress.c +169 -453
- data/ext/zstdlib_c/zstd-1.5.2/lib/compress/zstdmt_compress.h +113 -0
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/decompress/huf_decompress.c +1044 -403
- data/ext/zstdlib_c/zstd-1.5.2/lib/decompress/huf_decompress_amd64.S +585 -0
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/decompress/zstd_ddict.c +9 -9
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/decompress/zstd_ddict.h +2 -2
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/decompress/zstd_decompress.c +450 -105
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/decompress/zstd_decompress_block.c +913 -273
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/decompress/zstd_decompress_block.h +14 -5
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/decompress/zstd_decompress_internal.h +59 -12
- data/ext/zstdlib_c/zstd-1.5.2/lib/zdict.h +452 -0
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/lib/zstd.h +699 -214
- data/ext/{zstdlib/zstd-1.4.5/lib/common → zstdlib_c/zstd-1.5.2/lib}/zstd_errors.h +2 -1
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/zlibWrapper/gzclose.c +0 -0
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/zlibWrapper/gzcompatibility.h +1 -1
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/zlibWrapper/gzguts.h +0 -0
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/zlibWrapper/gzlib.c +0 -0
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/zlibWrapper/gzread.c +0 -0
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/zlibWrapper/gzwrite.c +0 -0
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/zlibWrapper/zstd_zlibwrapper.c +133 -44
- data/ext/{zstdlib/zstd-1.4.5 → zstdlib_c/zstd-1.5.2}/zlibWrapper/zstd_zlibwrapper.h +1 -1
- data/ext/zstdlib_c/zstd.mk +15 -0
- data/lib/zstdlib.rb +2 -2
- metadata +118 -109
- data/ext/zstdlib/zlib-1.2.11/crc32.c +0 -442
- data/ext/zstdlib/zlib-1.2.11/crc32.h +0 -441
- data/ext/zstdlib/zstd-1.4.5/lib/common/compiler.h +0 -175
- data/ext/zstdlib/zstd-1.4.5/lib/common/entropy_common.c +0 -216
- data/ext/zstdlib/zstd-1.4.5/lib/common/error_private.h +0 -80
- data/ext/zstdlib/zstd-1.4.5/lib/common/xxhash.c +0 -864
- data/ext/zstdlib/zstd-1.4.5/lib/common/xxhash.h +0 -285
- data/ext/zstdlib/zstd-1.4.5/lib/compress/huf_compress.c +0 -798
- data/ext/zstdlib/zstd-1.4.5/lib/compress/zstd_lazy.c +0 -1138
- data/ext/zstdlib/zstd-1.4.5/lib/compress/zstd_lazy.h +0 -67
- data/ext/zstdlib/zstd-1.4.5/lib/compress/zstdmt_compress.h +0 -192
- data/ext/zstdlib/zstd.mk +0 -14
@@ -1,216 +0,0 @@
|
|
1
|
-
/* ******************************************************************
|
2
|
-
* Common functions of New Generation Entropy library
|
3
|
-
* Copyright (c) 2016-2020, Yann Collet, Facebook, Inc.
|
4
|
-
*
|
5
|
-
* You can contact the author at :
|
6
|
-
* - FSE+HUF source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
7
|
-
* - Public forum : https://groups.google.com/forum/#!forum/lz4c
|
8
|
-
*
|
9
|
-
* This source code is licensed under both the BSD-style license (found in the
|
10
|
-
* LICENSE file in the root directory of this source tree) and the GPLv2 (found
|
11
|
-
* in the COPYING file in the root directory of this source tree).
|
12
|
-
* You may select, at your option, one of the above-listed licenses.
|
13
|
-
****************************************************************** */
|
14
|
-
|
15
|
-
/* *************************************
|
16
|
-
* Dependencies
|
17
|
-
***************************************/
|
18
|
-
#include "mem.h"
|
19
|
-
#include "error_private.h" /* ERR_*, ERROR */
|
20
|
-
#define FSE_STATIC_LINKING_ONLY /* FSE_MIN_TABLELOG */
|
21
|
-
#include "fse.h"
|
22
|
-
#define HUF_STATIC_LINKING_ONLY /* HUF_TABLELOG_ABSOLUTEMAX */
|
23
|
-
#include "huf.h"
|
24
|
-
|
25
|
-
|
26
|
-
/*=== Version ===*/
|
27
|
-
unsigned FSE_versionNumber(void) { return FSE_VERSION_NUMBER; }
|
28
|
-
|
29
|
-
|
30
|
-
/*=== Error Management ===*/
|
31
|
-
unsigned FSE_isError(size_t code) { return ERR_isError(code); }
|
32
|
-
const char* FSE_getErrorName(size_t code) { return ERR_getErrorName(code); }
|
33
|
-
|
34
|
-
unsigned HUF_isError(size_t code) { return ERR_isError(code); }
|
35
|
-
const char* HUF_getErrorName(size_t code) { return ERR_getErrorName(code); }
|
36
|
-
|
37
|
-
|
38
|
-
/*-**************************************************************
|
39
|
-
* FSE NCount encoding-decoding
|
40
|
-
****************************************************************/
|
41
|
-
size_t FSE_readNCount (short* normalizedCounter, unsigned* maxSVPtr, unsigned* tableLogPtr,
|
42
|
-
const void* headerBuffer, size_t hbSize)
|
43
|
-
{
|
44
|
-
const BYTE* const istart = (const BYTE*) headerBuffer;
|
45
|
-
const BYTE* const iend = istart + hbSize;
|
46
|
-
const BYTE* ip = istart;
|
47
|
-
int nbBits;
|
48
|
-
int remaining;
|
49
|
-
int threshold;
|
50
|
-
U32 bitStream;
|
51
|
-
int bitCount;
|
52
|
-
unsigned charnum = 0;
|
53
|
-
int previous0 = 0;
|
54
|
-
|
55
|
-
if (hbSize < 4) {
|
56
|
-
/* This function only works when hbSize >= 4 */
|
57
|
-
char buffer[4];
|
58
|
-
memset(buffer, 0, sizeof(buffer));
|
59
|
-
memcpy(buffer, headerBuffer, hbSize);
|
60
|
-
{ size_t const countSize = FSE_readNCount(normalizedCounter, maxSVPtr, tableLogPtr,
|
61
|
-
buffer, sizeof(buffer));
|
62
|
-
if (FSE_isError(countSize)) return countSize;
|
63
|
-
if (countSize > hbSize) return ERROR(corruption_detected);
|
64
|
-
return countSize;
|
65
|
-
} }
|
66
|
-
assert(hbSize >= 4);
|
67
|
-
|
68
|
-
/* init */
|
69
|
-
memset(normalizedCounter, 0, (*maxSVPtr+1) * sizeof(normalizedCounter[0])); /* all symbols not present in NCount have a frequency of 0 */
|
70
|
-
bitStream = MEM_readLE32(ip);
|
71
|
-
nbBits = (bitStream & 0xF) + FSE_MIN_TABLELOG; /* extract tableLog */
|
72
|
-
if (nbBits > FSE_TABLELOG_ABSOLUTE_MAX) return ERROR(tableLog_tooLarge);
|
73
|
-
bitStream >>= 4;
|
74
|
-
bitCount = 4;
|
75
|
-
*tableLogPtr = nbBits;
|
76
|
-
remaining = (1<<nbBits)+1;
|
77
|
-
threshold = 1<<nbBits;
|
78
|
-
nbBits++;
|
79
|
-
|
80
|
-
while ((remaining>1) & (charnum<=*maxSVPtr)) {
|
81
|
-
if (previous0) {
|
82
|
-
unsigned n0 = charnum;
|
83
|
-
while ((bitStream & 0xFFFF) == 0xFFFF) {
|
84
|
-
n0 += 24;
|
85
|
-
if (ip < iend-5) {
|
86
|
-
ip += 2;
|
87
|
-
bitStream = MEM_readLE32(ip) >> bitCount;
|
88
|
-
} else {
|
89
|
-
bitStream >>= 16;
|
90
|
-
bitCount += 16;
|
91
|
-
} }
|
92
|
-
while ((bitStream & 3) == 3) {
|
93
|
-
n0 += 3;
|
94
|
-
bitStream >>= 2;
|
95
|
-
bitCount += 2;
|
96
|
-
}
|
97
|
-
n0 += bitStream & 3;
|
98
|
-
bitCount += 2;
|
99
|
-
if (n0 > *maxSVPtr) return ERROR(maxSymbolValue_tooSmall);
|
100
|
-
while (charnum < n0) normalizedCounter[charnum++] = 0;
|
101
|
-
if ((ip <= iend-7) || (ip + (bitCount>>3) <= iend-4)) {
|
102
|
-
assert((bitCount >> 3) <= 3); /* For first condition to work */
|
103
|
-
ip += bitCount>>3;
|
104
|
-
bitCount &= 7;
|
105
|
-
bitStream = MEM_readLE32(ip) >> bitCount;
|
106
|
-
} else {
|
107
|
-
bitStream >>= 2;
|
108
|
-
} }
|
109
|
-
{ int const max = (2*threshold-1) - remaining;
|
110
|
-
int count;
|
111
|
-
|
112
|
-
if ((bitStream & (threshold-1)) < (U32)max) {
|
113
|
-
count = bitStream & (threshold-1);
|
114
|
-
bitCount += nbBits-1;
|
115
|
-
} else {
|
116
|
-
count = bitStream & (2*threshold-1);
|
117
|
-
if (count >= threshold) count -= max;
|
118
|
-
bitCount += nbBits;
|
119
|
-
}
|
120
|
-
|
121
|
-
count--; /* extra accuracy */
|
122
|
-
remaining -= count < 0 ? -count : count; /* -1 means +1 */
|
123
|
-
normalizedCounter[charnum++] = (short)count;
|
124
|
-
previous0 = !count;
|
125
|
-
while (remaining < threshold) {
|
126
|
-
nbBits--;
|
127
|
-
threshold >>= 1;
|
128
|
-
}
|
129
|
-
|
130
|
-
if ((ip <= iend-7) || (ip + (bitCount>>3) <= iend-4)) {
|
131
|
-
ip += bitCount>>3;
|
132
|
-
bitCount &= 7;
|
133
|
-
} else {
|
134
|
-
bitCount -= (int)(8 * (iend - 4 - ip));
|
135
|
-
ip = iend - 4;
|
136
|
-
}
|
137
|
-
bitStream = MEM_readLE32(ip) >> (bitCount & 31);
|
138
|
-
} } /* while ((remaining>1) & (charnum<=*maxSVPtr)) */
|
139
|
-
if (remaining != 1) return ERROR(corruption_detected);
|
140
|
-
if (bitCount > 32) return ERROR(corruption_detected);
|
141
|
-
*maxSVPtr = charnum-1;
|
142
|
-
|
143
|
-
ip += (bitCount+7)>>3;
|
144
|
-
return ip-istart;
|
145
|
-
}
|
146
|
-
|
147
|
-
|
148
|
-
/*! HUF_readStats() :
|
149
|
-
Read compact Huffman tree, saved by HUF_writeCTable().
|
150
|
-
`huffWeight` is destination buffer.
|
151
|
-
`rankStats` is assumed to be a table of at least HUF_TABLELOG_MAX U32.
|
152
|
-
@return : size read from `src` , or an error Code .
|
153
|
-
Note : Needed by HUF_readCTable() and HUF_readDTableX?() .
|
154
|
-
*/
|
155
|
-
size_t HUF_readStats(BYTE* huffWeight, size_t hwSize, U32* rankStats,
|
156
|
-
U32* nbSymbolsPtr, U32* tableLogPtr,
|
157
|
-
const void* src, size_t srcSize)
|
158
|
-
{
|
159
|
-
U32 weightTotal;
|
160
|
-
const BYTE* ip = (const BYTE*) src;
|
161
|
-
size_t iSize;
|
162
|
-
size_t oSize;
|
163
|
-
|
164
|
-
if (!srcSize) return ERROR(srcSize_wrong);
|
165
|
-
iSize = ip[0];
|
166
|
-
/* memset(huffWeight, 0, hwSize); *//* is not necessary, even though some analyzer complain ... */
|
167
|
-
|
168
|
-
if (iSize >= 128) { /* special header */
|
169
|
-
oSize = iSize - 127;
|
170
|
-
iSize = ((oSize+1)/2);
|
171
|
-
if (iSize+1 > srcSize) return ERROR(srcSize_wrong);
|
172
|
-
if (oSize >= hwSize) return ERROR(corruption_detected);
|
173
|
-
ip += 1;
|
174
|
-
{ U32 n;
|
175
|
-
for (n=0; n<oSize; n+=2) {
|
176
|
-
huffWeight[n] = ip[n/2] >> 4;
|
177
|
-
huffWeight[n+1] = ip[n/2] & 15;
|
178
|
-
} } }
|
179
|
-
else { /* header compressed with FSE (normal case) */
|
180
|
-
FSE_DTable fseWorkspace[FSE_DTABLE_SIZE_U32(6)]; /* 6 is max possible tableLog for HUF header (maybe even 5, to be tested) */
|
181
|
-
if (iSize+1 > srcSize) return ERROR(srcSize_wrong);
|
182
|
-
oSize = FSE_decompress_wksp(huffWeight, hwSize-1, ip+1, iSize, fseWorkspace, 6); /* max (hwSize-1) values decoded, as last one is implied */
|
183
|
-
if (FSE_isError(oSize)) return oSize;
|
184
|
-
}
|
185
|
-
|
186
|
-
/* collect weight stats */
|
187
|
-
memset(rankStats, 0, (HUF_TABLELOG_MAX + 1) * sizeof(U32));
|
188
|
-
weightTotal = 0;
|
189
|
-
{ U32 n; for (n=0; n<oSize; n++) {
|
190
|
-
if (huffWeight[n] >= HUF_TABLELOG_MAX) return ERROR(corruption_detected);
|
191
|
-
rankStats[huffWeight[n]]++;
|
192
|
-
weightTotal += (1 << huffWeight[n]) >> 1;
|
193
|
-
} }
|
194
|
-
if (weightTotal == 0) return ERROR(corruption_detected);
|
195
|
-
|
196
|
-
/* get last non-null symbol weight (implied, total must be 2^n) */
|
197
|
-
{ U32 const tableLog = BIT_highbit32(weightTotal) + 1;
|
198
|
-
if (tableLog > HUF_TABLELOG_MAX) return ERROR(corruption_detected);
|
199
|
-
*tableLogPtr = tableLog;
|
200
|
-
/* determine last weight */
|
201
|
-
{ U32 const total = 1 << tableLog;
|
202
|
-
U32 const rest = total - weightTotal;
|
203
|
-
U32 const verif = 1 << BIT_highbit32(rest);
|
204
|
-
U32 const lastWeight = BIT_highbit32(rest) + 1;
|
205
|
-
if (verif != rest) return ERROR(corruption_detected); /* last value must be a clean power of 2 */
|
206
|
-
huffWeight[oSize] = (BYTE)lastWeight;
|
207
|
-
rankStats[lastWeight]++;
|
208
|
-
} }
|
209
|
-
|
210
|
-
/* check tree construction validity */
|
211
|
-
if ((rankStats[1] < 2) || (rankStats[1] & 1)) return ERROR(corruption_detected); /* by construction : at least 2 elts of rank 1, must be even */
|
212
|
-
|
213
|
-
/* results */
|
214
|
-
*nbSymbolsPtr = (U32)(oSize+1);
|
215
|
-
return iSize+1;
|
216
|
-
}
|
@@ -1,80 +0,0 @@
|
|
1
|
-
/*
|
2
|
-
* Copyright (c) 2016-2020, Yann Collet, Facebook, Inc.
|
3
|
-
* All rights reserved.
|
4
|
-
*
|
5
|
-
* This source code is licensed under both the BSD-style license (found in the
|
6
|
-
* LICENSE file in the root directory of this source tree) and the GPLv2 (found
|
7
|
-
* in the COPYING file in the root directory of this source tree).
|
8
|
-
* You may select, at your option, one of the above-listed licenses.
|
9
|
-
*/
|
10
|
-
|
11
|
-
/* Note : this module is expected to remain private, do not expose it */
|
12
|
-
|
13
|
-
#ifndef ERROR_H_MODULE
|
14
|
-
#define ERROR_H_MODULE
|
15
|
-
|
16
|
-
#if defined (__cplusplus)
|
17
|
-
extern "C" {
|
18
|
-
#endif
|
19
|
-
|
20
|
-
|
21
|
-
/* ****************************************
|
22
|
-
* Dependencies
|
23
|
-
******************************************/
|
24
|
-
#include <stddef.h> /* size_t */
|
25
|
-
#include "zstd_errors.h" /* enum list */
|
26
|
-
|
27
|
-
|
28
|
-
/* ****************************************
|
29
|
-
* Compiler-specific
|
30
|
-
******************************************/
|
31
|
-
#if defined(__GNUC__)
|
32
|
-
# define ERR_STATIC static __attribute__((unused))
|
33
|
-
#elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */)
|
34
|
-
# define ERR_STATIC static inline
|
35
|
-
#elif defined(_MSC_VER)
|
36
|
-
# define ERR_STATIC static __inline
|
37
|
-
#else
|
38
|
-
# define ERR_STATIC static /* this version may generate warnings for unused static functions; disable the relevant warning */
|
39
|
-
#endif
|
40
|
-
|
41
|
-
|
42
|
-
/*-****************************************
|
43
|
-
* Customization (error_public.h)
|
44
|
-
******************************************/
|
45
|
-
typedef ZSTD_ErrorCode ERR_enum;
|
46
|
-
#define PREFIX(name) ZSTD_error_##name
|
47
|
-
|
48
|
-
|
49
|
-
/*-****************************************
|
50
|
-
* Error codes handling
|
51
|
-
******************************************/
|
52
|
-
#undef ERROR /* already defined on Visual Studio */
|
53
|
-
#define ERROR(name) ZSTD_ERROR(name)
|
54
|
-
#define ZSTD_ERROR(name) ((size_t)-PREFIX(name))
|
55
|
-
|
56
|
-
ERR_STATIC unsigned ERR_isError(size_t code) { return (code > ERROR(maxCode)); }
|
57
|
-
|
58
|
-
ERR_STATIC ERR_enum ERR_getErrorCode(size_t code) { if (!ERR_isError(code)) return (ERR_enum)0; return (ERR_enum) (0-code); }
|
59
|
-
|
60
|
-
/* check and forward error code */
|
61
|
-
#define CHECK_V_F(e, f) size_t const e = f; if (ERR_isError(e)) return e
|
62
|
-
#define CHECK_F(f) { CHECK_V_F(_var_err__, f); }
|
63
|
-
|
64
|
-
|
65
|
-
/*-****************************************
|
66
|
-
* Error Strings
|
67
|
-
******************************************/
|
68
|
-
|
69
|
-
const char* ERR_getErrorString(ERR_enum code); /* error_private.c */
|
70
|
-
|
71
|
-
ERR_STATIC const char* ERR_getErrorName(size_t code)
|
72
|
-
{
|
73
|
-
return ERR_getErrorString(ERR_getErrorCode(code));
|
74
|
-
}
|
75
|
-
|
76
|
-
#if defined (__cplusplus)
|
77
|
-
}
|
78
|
-
#endif
|
79
|
-
|
80
|
-
#endif /* ERROR_H_MODULE */
|