zstd-ruby 1.4.4.0 → 1.4.5.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/ext/zstdruby/libzstd/Makefile +123 -58
- data/ext/zstdruby/libzstd/README.md +34 -14
- data/ext/zstdruby/libzstd/common/bitstream.h +31 -37
- data/ext/zstdruby/libzstd/common/compiler.h +19 -3
- data/ext/zstdruby/libzstd/common/cpu.h +1 -1
- data/ext/zstdruby/libzstd/common/debug.c +11 -31
- data/ext/zstdruby/libzstd/common/debug.h +11 -31
- data/ext/zstdruby/libzstd/common/entropy_common.c +13 -33
- data/ext/zstdruby/libzstd/common/error_private.c +2 -1
- data/ext/zstdruby/libzstd/common/error_private.h +6 -2
- data/ext/zstdruby/libzstd/common/fse.h +11 -31
- data/ext/zstdruby/libzstd/common/fse_decompress.c +12 -37
- data/ext/zstdruby/libzstd/common/huf.h +15 -33
- data/ext/zstdruby/libzstd/common/mem.h +1 -1
- data/ext/zstdruby/libzstd/common/pool.c +1 -1
- data/ext/zstdruby/libzstd/common/pool.h +2 -2
- data/ext/zstdruby/libzstd/common/threading.c +4 -3
- data/ext/zstdruby/libzstd/common/threading.h +4 -3
- data/ext/zstdruby/libzstd/common/xxhash.c +15 -33
- data/ext/zstdruby/libzstd/common/xxhash.h +11 -31
- data/ext/zstdruby/libzstd/common/zstd_common.c +1 -1
- data/ext/zstdruby/libzstd/common/zstd_errors.h +2 -1
- data/ext/zstdruby/libzstd/common/zstd_internal.h +112 -15
- data/ext/zstdruby/libzstd/compress/fse_compress.c +17 -40
- data/ext/zstdruby/libzstd/compress/hist.c +15 -35
- data/ext/zstdruby/libzstd/compress/hist.h +12 -32
- data/ext/zstdruby/libzstd/compress/huf_compress.c +92 -92
- data/ext/zstdruby/libzstd/compress/zstd_compress.c +450 -275
- data/ext/zstdruby/libzstd/compress/zstd_compress_internal.h +136 -14
- data/ext/zstdruby/libzstd/compress/zstd_compress_literals.c +10 -6
- data/ext/zstdruby/libzstd/compress/zstd_compress_literals.h +1 -1
- data/ext/zstdruby/libzstd/compress/zstd_compress_sequences.c +24 -20
- data/ext/zstdruby/libzstd/compress/zstd_compress_sequences.h +10 -3
- data/ext/zstdruby/libzstd/compress/zstd_compress_superblock.c +845 -0
- data/ext/zstdruby/libzstd/compress/zstd_compress_superblock.h +32 -0
- data/ext/zstdruby/libzstd/compress/zstd_cwksp.h +3 -13
- data/ext/zstdruby/libzstd/compress/zstd_double_fast.c +11 -8
- data/ext/zstdruby/libzstd/compress/zstd_double_fast.h +2 -2
- data/ext/zstdruby/libzstd/compress/zstd_fast.c +36 -24
- data/ext/zstdruby/libzstd/compress/zstd_fast.h +2 -2
- data/ext/zstdruby/libzstd/compress/zstd_lazy.c +34 -11
- data/ext/zstdruby/libzstd/compress/zstd_lazy.h +1 -1
- data/ext/zstdruby/libzstd/compress/zstd_ldm.c +27 -5
- data/ext/zstdruby/libzstd/compress/zstd_ldm.h +7 -2
- data/ext/zstdruby/libzstd/compress/zstd_opt.c +38 -84
- data/ext/zstdruby/libzstd/compress/zstd_opt.h +1 -1
- data/ext/zstdruby/libzstd/compress/zstdmt_compress.c +48 -21
- data/ext/zstdruby/libzstd/compress/zstdmt_compress.h +2 -2
- data/ext/zstdruby/libzstd/decompress/huf_decompress.c +76 -62
- data/ext/zstdruby/libzstd/decompress/zstd_ddict.c +12 -8
- data/ext/zstdruby/libzstd/decompress/zstd_ddict.h +2 -2
- data/ext/zstdruby/libzstd/decompress/zstd_decompress.c +264 -148
- data/ext/zstdruby/libzstd/decompress/zstd_decompress_block.c +312 -203
- data/ext/zstdruby/libzstd/decompress/zstd_decompress_block.h +3 -3
- data/ext/zstdruby/libzstd/decompress/zstd_decompress_internal.h +18 -4
- data/ext/zstdruby/libzstd/deprecated/zbuff.h +3 -3
- data/ext/zstdruby/libzstd/deprecated/zbuff_common.c +2 -2
- data/ext/zstdruby/libzstd/deprecated/zbuff_compress.c +1 -1
- data/ext/zstdruby/libzstd/deprecated/zbuff_decompress.c +1 -1
- data/ext/zstdruby/libzstd/dictBuilder/cover.c +5 -5
- data/ext/zstdruby/libzstd/dictBuilder/cover.h +14 -4
- data/ext/zstdruby/libzstd/dictBuilder/fastcover.c +14 -4
- data/ext/zstdruby/libzstd/dictBuilder/zdict.c +33 -9
- data/ext/zstdruby/libzstd/dictBuilder/zdict.h +51 -28
- data/ext/zstdruby/libzstd/dll/example/Makefile +2 -1
- data/ext/zstdruby/libzstd/legacy/zstd_legacy.h +4 -4
- data/ext/zstdruby/libzstd/legacy/zstd_v01.c +18 -12
- data/ext/zstdruby/libzstd/legacy/zstd_v01.h +1 -1
- data/ext/zstdruby/libzstd/legacy/zstd_v02.c +10 -6
- data/ext/zstdruby/libzstd/legacy/zstd_v02.h +1 -1
- data/ext/zstdruby/libzstd/legacy/zstd_v03.c +10 -6
- data/ext/zstdruby/libzstd/legacy/zstd_v03.h +1 -1
- data/ext/zstdruby/libzstd/legacy/zstd_v04.c +13 -7
- data/ext/zstdruby/libzstd/legacy/zstd_v04.h +1 -1
- data/ext/zstdruby/libzstd/legacy/zstd_v05.c +17 -13
- data/ext/zstdruby/libzstd/legacy/zstd_v05.h +2 -2
- data/ext/zstdruby/libzstd/legacy/zstd_v06.c +17 -13
- data/ext/zstdruby/libzstd/legacy/zstd_v06.h +1 -1
- data/ext/zstdruby/libzstd/legacy/zstd_v07.c +22 -14
- data/ext/zstdruby/libzstd/legacy/zstd_v07.h +1 -1
- data/ext/zstdruby/libzstd/libzstd.pc.in +2 -2
- data/ext/zstdruby/libzstd/zstd.h +62 -21
- data/lib/zstd-ruby/version.rb +1 -1
- metadata +7 -5
@@ -1,5 +1,5 @@
|
|
1
1
|
/*
|
2
|
-
* Copyright (c) 2016-
|
2
|
+
* Copyright (c) 2016-2020, Yann Collet, Facebook, Inc.
|
3
3
|
* All rights reserved.
|
4
4
|
*
|
5
5
|
* This source code is licensed under both the BSD-style license (found in the
|
@@ -18,7 +18,7 @@ extern "C" {
|
|
18
18
|
|
19
19
|
#include <stddef.h> /* size_t */
|
20
20
|
#define ZSTD_STATIC_LINKING_ONLY /* ZSTD_customMem */
|
21
|
-
#include "zstd.h"
|
21
|
+
#include "../zstd.h"
|
22
22
|
|
23
23
|
typedef struct POOL_ctx_s POOL_ctx;
|
24
24
|
|
@@ -2,12 +2,13 @@
|
|
2
2
|
* Copyright (c) 2016 Tino Reichardt
|
3
3
|
* All rights reserved.
|
4
4
|
*
|
5
|
+
* You can contact the author at:
|
6
|
+
* - zstdmt source repository: https://github.com/mcmilk/zstdmt
|
7
|
+
*
|
5
8
|
* This source code is licensed under both the BSD-style license (found in the
|
6
9
|
* LICENSE file in the root directory of this source tree) and the GPLv2 (found
|
7
10
|
* in the COPYING file in the root directory of this source tree).
|
8
|
-
*
|
9
|
-
* You can contact the author at:
|
10
|
-
* - zstdmt source repository: https://github.com/mcmilk/zstdmt
|
11
|
+
* You may select, at your option, one of the above-listed licenses.
|
11
12
|
*/
|
12
13
|
|
13
14
|
/**
|
@@ -2,12 +2,13 @@
|
|
2
2
|
* Copyright (c) 2016 Tino Reichardt
|
3
3
|
* All rights reserved.
|
4
4
|
*
|
5
|
+
* You can contact the author at:
|
6
|
+
* - zstdmt source repository: https://github.com/mcmilk/zstdmt
|
7
|
+
*
|
5
8
|
* This source code is licensed under both the BSD-style license (found in the
|
6
9
|
* LICENSE file in the root directory of this source tree) and the GPLv2 (found
|
7
10
|
* in the COPYING file in the root directory of this source tree).
|
8
|
-
*
|
9
|
-
* You can contact the author at:
|
10
|
-
* - zstdmt source repository: https://github.com/mcmilk/zstdmt
|
11
|
+
* You may select, at your option, one of the above-listed licenses.
|
11
12
|
*/
|
12
13
|
|
13
14
|
#ifndef THREADING_H_938743
|
@@ -1,35 +1,15 @@
|
|
1
1
|
/*
|
2
|
-
* xxHash - Fast Hash algorithm
|
3
|
-
* Copyright (
|
4
|
-
*
|
5
|
-
*
|
6
|
-
*
|
7
|
-
*
|
8
|
-
*
|
9
|
-
*
|
10
|
-
*
|
11
|
-
*
|
12
|
-
*
|
13
|
-
* * Redistributions in binary form must reproduce the above
|
14
|
-
* copyright notice, this list of conditions and the following disclaimer
|
15
|
-
* in the documentation and/or other materials provided with the
|
16
|
-
* distribution.
|
17
|
-
*
|
18
|
-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
19
|
-
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
20
|
-
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
21
|
-
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
22
|
-
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
23
|
-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
24
|
-
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
25
|
-
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
26
|
-
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
27
|
-
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
28
|
-
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
29
|
-
*
|
30
|
-
* You can contact the author at :
|
31
|
-
* - xxHash homepage: http://www.xxhash.com
|
32
|
-
* - xxHash source repository : https://github.com/Cyan4973/xxHash
|
2
|
+
* xxHash - Fast Hash algorithm
|
3
|
+
* Copyright (c) 2012-2020, Yann Collet, Facebook, Inc.
|
4
|
+
*
|
5
|
+
* You can contact the author at :
|
6
|
+
* - xxHash homepage: http://www.xxhash.com
|
7
|
+
* - xxHash source repository : https://github.com/Cyan4973/xxHash
|
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.
|
33
13
|
*/
|
34
14
|
|
35
15
|
|
@@ -115,7 +95,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) { return memcp
|
|
115
95
|
/* *************************************
|
116
96
|
* Compiler Specific Options
|
117
97
|
***************************************/
|
118
|
-
#if defined
|
98
|
+
#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || defined(__cplusplus) || defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 */
|
119
99
|
# define INLINE_KEYWORD inline
|
120
100
|
#else
|
121
101
|
# define INLINE_KEYWORD
|
@@ -729,7 +709,9 @@ FORCE_INLINE_TEMPLATE XXH_errorcode XXH64_update_endian (XXH64_state_t* state, c
|
|
729
709
|
state->total_len += len;
|
730
710
|
|
731
711
|
if (state->memsize + len < 32) { /* fill in tmp buffer */
|
732
|
-
|
712
|
+
if (input != NULL) {
|
713
|
+
XXH_memcpy(((BYTE*)state->mem64) + state->memsize, input, len);
|
714
|
+
}
|
733
715
|
state->memsize += (U32)len;
|
734
716
|
return XXH_OK;
|
735
717
|
}
|
@@ -1,35 +1,15 @@
|
|
1
1
|
/*
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
notice, this list of conditions and the following disclaimer.
|
14
|
-
* Redistributions in binary form must reproduce the above
|
15
|
-
copyright notice, this list of conditions and the following disclaimer
|
16
|
-
in the documentation and/or other materials provided with the
|
17
|
-
distribution.
|
18
|
-
|
19
|
-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
20
|
-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
21
|
-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
22
|
-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
23
|
-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
24
|
-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
25
|
-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
26
|
-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
27
|
-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
28
|
-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
29
|
-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
30
|
-
|
31
|
-
You can contact the author at :
|
32
|
-
- xxHash source repository : https://github.com/Cyan4973/xxHash
|
2
|
+
* xxHash - Extremely Fast Hash algorithm
|
3
|
+
* Header File
|
4
|
+
* Copyright (c) 2012-2020, Yann Collet, Facebook, Inc.
|
5
|
+
*
|
6
|
+
* You can contact the author at :
|
7
|
+
* - xxHash source repository : https://github.com/Cyan4973/xxHash
|
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.
|
33
13
|
*/
|
34
14
|
|
35
15
|
/* Notice extracted from xxHash homepage :
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/*
|
2
|
-
* Copyright (c) 2016-
|
2
|
+
* Copyright (c) 2016-2020, Yann Collet, Facebook, Inc.
|
3
3
|
* All rights reserved.
|
4
4
|
*
|
5
5
|
* This source code is licensed under both the BSD-style license (found in the
|
@@ -76,6 +76,7 @@ typedef enum {
|
|
76
76
|
/* following error codes are __NOT STABLE__, they can be removed or changed in future versions */
|
77
77
|
ZSTD_error_frameIndex_tooLarge = 100,
|
78
78
|
ZSTD_error_seekableIO = 102,
|
79
|
+
ZSTD_error_dstBuffer_wrong = 104,
|
79
80
|
ZSTD_error_maxCode = 120 /* never EVER use this value directly, it can change in future versions! Use ZSTD_isError() instead */
|
80
81
|
} ZSTD_ErrorCode;
|
81
82
|
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/*
|
2
|
-
* Copyright (c) 2016-
|
2
|
+
* Copyright (c) 2016-2020, Yann Collet, Facebook, Inc.
|
3
3
|
* All rights reserved.
|
4
4
|
*
|
5
5
|
* This source code is licensed under both the BSD-style license (found in the
|
@@ -19,12 +19,15 @@
|
|
19
19
|
/*-*************************************
|
20
20
|
* Dependencies
|
21
21
|
***************************************/
|
22
|
+
#ifdef __aarch64__
|
23
|
+
#include <arm_neon.h>
|
24
|
+
#endif
|
22
25
|
#include "compiler.h"
|
23
26
|
#include "mem.h"
|
24
27
|
#include "debug.h" /* assert, DEBUGLOG, RAWLOG, g_debuglevel */
|
25
28
|
#include "error_private.h"
|
26
29
|
#define ZSTD_STATIC_LINKING_ONLY
|
27
|
-
#include "zstd.h"
|
30
|
+
#include "../zstd.h"
|
28
31
|
#define FSE_STATIC_LINKING_ONLY
|
29
32
|
#include "fse.h"
|
30
33
|
#define HUF_STATIC_LINKING_ONLY
|
@@ -53,6 +56,31 @@ extern "C" {
|
|
53
56
|
#define MIN(a,b) ((a)<(b) ? (a) : (b))
|
54
57
|
#define MAX(a,b) ((a)>(b) ? (a) : (b))
|
55
58
|
|
59
|
+
/**
|
60
|
+
* Ignore: this is an internal helper.
|
61
|
+
*
|
62
|
+
* This is a helper function to help force C99-correctness during compilation.
|
63
|
+
* Under strict compilation modes, variadic macro arguments can't be empty.
|
64
|
+
* However, variadic function arguments can be. Using a function therefore lets
|
65
|
+
* us statically check that at least one (string) argument was passed,
|
66
|
+
* independent of the compilation flags.
|
67
|
+
*/
|
68
|
+
static INLINE_KEYWORD UNUSED_ATTR
|
69
|
+
void _force_has_format_string(const char *format, ...) {
|
70
|
+
(void)format;
|
71
|
+
}
|
72
|
+
|
73
|
+
/**
|
74
|
+
* Ignore: this is an internal helper.
|
75
|
+
*
|
76
|
+
* We want to force this function invocation to be syntactically correct, but
|
77
|
+
* we don't want to force runtime evaluation of its arguments.
|
78
|
+
*/
|
79
|
+
#define _FORCE_HAS_FORMAT_STRING(...) \
|
80
|
+
if (0) { \
|
81
|
+
_force_has_format_string(__VA_ARGS__); \
|
82
|
+
}
|
83
|
+
|
56
84
|
/**
|
57
85
|
* Return the specified error if the condition evaluates to true.
|
58
86
|
*
|
@@ -62,7 +90,9 @@ extern "C" {
|
|
62
90
|
*/
|
63
91
|
#define RETURN_ERROR_IF(cond, err, ...) \
|
64
92
|
if (cond) { \
|
65
|
-
RAWLOG(3, "%s:%d: ERROR!: check %s failed, returning %s",
|
93
|
+
RAWLOG(3, "%s:%d: ERROR!: check %s failed, returning %s", \
|
94
|
+
__FILE__, __LINE__, ZSTD_QUOTE(cond), ZSTD_QUOTE(ERROR(err))); \
|
95
|
+
_FORCE_HAS_FORMAT_STRING(__VA_ARGS__); \
|
66
96
|
RAWLOG(3, ": " __VA_ARGS__); \
|
67
97
|
RAWLOG(3, "\n"); \
|
68
98
|
return ERROR(err); \
|
@@ -75,7 +105,9 @@ extern "C" {
|
|
75
105
|
*/
|
76
106
|
#define RETURN_ERROR(err, ...) \
|
77
107
|
do { \
|
78
|
-
RAWLOG(3, "%s:%d: ERROR!: unconditional check failed, returning %s",
|
108
|
+
RAWLOG(3, "%s:%d: ERROR!: unconditional check failed, returning %s", \
|
109
|
+
__FILE__, __LINE__, ZSTD_QUOTE(ERROR(err))); \
|
110
|
+
_FORCE_HAS_FORMAT_STRING(__VA_ARGS__); \
|
79
111
|
RAWLOG(3, ": " __VA_ARGS__); \
|
80
112
|
RAWLOG(3, "\n"); \
|
81
113
|
return ERROR(err); \
|
@@ -90,7 +122,9 @@ extern "C" {
|
|
90
122
|
do { \
|
91
123
|
size_t const err_code = (err); \
|
92
124
|
if (ERR_isError(err_code)) { \
|
93
|
-
RAWLOG(3, "%s:%d: ERROR!: forwarding error in %s: %s",
|
125
|
+
RAWLOG(3, "%s:%d: ERROR!: forwarding error in %s: %s", \
|
126
|
+
__FILE__, __LINE__, ZSTD_QUOTE(err), ERR_getErrorName(err_code)); \
|
127
|
+
_FORCE_HAS_FORMAT_STRING(__VA_ARGS__); \
|
94
128
|
RAWLOG(3, ": " __VA_ARGS__); \
|
95
129
|
RAWLOG(3, "\n"); \
|
96
130
|
return err_code; \
|
@@ -128,6 +162,8 @@ static const size_t ZSTD_did_fieldSize[4] = { 0, 1, 2, 4 };
|
|
128
162
|
static const size_t ZSTD_blockHeaderSize = ZSTD_BLOCKHEADERSIZE;
|
129
163
|
typedef enum { bt_raw, bt_rle, bt_compressed, bt_reserved } blockType_e;
|
130
164
|
|
165
|
+
#define ZSTD_FRAMECHECKSUMSIZE 4
|
166
|
+
|
131
167
|
#define MIN_SEQUENCES_SIZE 1 /* nbSeq==0 */
|
132
168
|
#define MIN_CBLOCK_SIZE (1 /*litCSize*/ + 1 /* RLE or RAW */ + MIN_SEQUENCES_SIZE /* nbSeq==0 */) /* for a non-null block */
|
133
169
|
|
@@ -191,10 +227,22 @@ static const U32 OF_defaultNormLog = OF_DEFAULTNORMLOG;
|
|
191
227
|
/*-*******************************************
|
192
228
|
* Shared functions to include for inlining
|
193
229
|
*********************************************/
|
194
|
-
static void ZSTD_copy8(void* dst, const void* src) {
|
230
|
+
static void ZSTD_copy8(void* dst, const void* src) {
|
231
|
+
#ifdef __aarch64__
|
232
|
+
vst1_u8((uint8_t*)dst, vld1_u8((const uint8_t*)src));
|
233
|
+
#else
|
234
|
+
memcpy(dst, src, 8);
|
235
|
+
#endif
|
236
|
+
}
|
195
237
|
|
196
238
|
#define COPY8(d,s) { ZSTD_copy8(d,s); d+=8; s+=8; }
|
197
|
-
static void ZSTD_copy16(void* dst, const void* src) {
|
239
|
+
static void ZSTD_copy16(void* dst, const void* src) {
|
240
|
+
#ifdef __aarch64__
|
241
|
+
vst1q_u8((uint8_t*)dst, vld1q_u8((const uint8_t*)src));
|
242
|
+
#else
|
243
|
+
memcpy(dst, src, 16);
|
244
|
+
#endif
|
245
|
+
}
|
198
246
|
#define COPY16(d,s) { ZSTD_copy16(d,s); d+=16; s+=16; }
|
199
247
|
|
200
248
|
#define WILDCOPY_OVERLENGTH 32
|
@@ -213,7 +261,7 @@ typedef enum {
|
|
213
261
|
* - ZSTD_overlap_src_before_dst: The src and dst may overlap, but they MUST be at least 8 bytes apart.
|
214
262
|
* The src buffer must be before the dst buffer.
|
215
263
|
*/
|
216
|
-
MEM_STATIC FORCE_INLINE_ATTR
|
264
|
+
MEM_STATIC FORCE_INLINE_ATTR
|
217
265
|
void ZSTD_wildcopy(void* dst, const void* src, ptrdiff_t length, ZSTD_overlap_e const ovtype)
|
218
266
|
{
|
219
267
|
ptrdiff_t diff = (BYTE*)dst - (const BYTE*)src;
|
@@ -230,13 +278,18 @@ void ZSTD_wildcopy(void* dst, const void* src, ptrdiff_t length, ZSTD_overlap_e
|
|
230
278
|
} while (op < oend);
|
231
279
|
} else {
|
232
280
|
assert(diff >= WILDCOPY_VECLEN || diff <= -WILDCOPY_VECLEN);
|
233
|
-
/* Separate out the first
|
281
|
+
/* Separate out the first COPY16() call because the copy length is
|
234
282
|
* almost certain to be short, so the branches have different
|
235
|
-
* probabilities.
|
236
|
-
*
|
237
|
-
*
|
283
|
+
* probabilities. Since it is almost certain to be short, only do
|
284
|
+
* one COPY16() in the first call. Then, do two calls per loop since
|
285
|
+
* at that point it is more likely to have a high trip count.
|
238
286
|
*/
|
239
|
-
|
287
|
+
#ifndef __aarch64__
|
288
|
+
do {
|
289
|
+
COPY16(op, ip);
|
290
|
+
}
|
291
|
+
while (op < oend);
|
292
|
+
#else
|
240
293
|
COPY16(op, ip);
|
241
294
|
if (op >= oend) return;
|
242
295
|
do {
|
@@ -244,9 +297,29 @@ void ZSTD_wildcopy(void* dst, const void* src, ptrdiff_t length, ZSTD_overlap_e
|
|
244
297
|
COPY16(op, ip);
|
245
298
|
}
|
246
299
|
while (op < oend);
|
300
|
+
#endif
|
301
|
+
}
|
302
|
+
}
|
303
|
+
|
304
|
+
MEM_STATIC size_t ZSTD_limitCopy(void* dst, size_t dstCapacity, const void* src, size_t srcSize)
|
305
|
+
{
|
306
|
+
size_t const length = MIN(dstCapacity, srcSize);
|
307
|
+
if (length > 0) {
|
308
|
+
memcpy(dst, src, length);
|
247
309
|
}
|
310
|
+
return length;
|
248
311
|
}
|
249
312
|
|
313
|
+
/* define "workspace is too large" as this number of times larger than needed */
|
314
|
+
#define ZSTD_WORKSPACETOOLARGE_FACTOR 3
|
315
|
+
|
316
|
+
/* when workspace is continuously too large
|
317
|
+
* during at least this number of times,
|
318
|
+
* context's memory usage is considered wasteful,
|
319
|
+
* because it's sized to handle a worst case scenario which rarely happens.
|
320
|
+
* In which case, resize it down to free some memory */
|
321
|
+
#define ZSTD_WORKSPACETOOLARGE_MAXDURATION 128
|
322
|
+
|
250
323
|
|
251
324
|
/*-*******************************************
|
252
325
|
* Private declarations
|
@@ -271,6 +344,31 @@ typedef struct {
|
|
271
344
|
U32 longLengthPos;
|
272
345
|
} seqStore_t;
|
273
346
|
|
347
|
+
typedef struct {
|
348
|
+
U32 litLength;
|
349
|
+
U32 matchLength;
|
350
|
+
} ZSTD_sequenceLength;
|
351
|
+
|
352
|
+
/**
|
353
|
+
* Returns the ZSTD_sequenceLength for the given sequences. It handles the decoding of long sequences
|
354
|
+
* indicated by longLengthPos and longLengthID, and adds MINMATCH back to matchLength.
|
355
|
+
*/
|
356
|
+
MEM_STATIC ZSTD_sequenceLength ZSTD_getSequenceLength(seqStore_t const* seqStore, seqDef const* seq)
|
357
|
+
{
|
358
|
+
ZSTD_sequenceLength seqLen;
|
359
|
+
seqLen.litLength = seq->litLength;
|
360
|
+
seqLen.matchLength = seq->matchLength + MINMATCH;
|
361
|
+
if (seqStore->longLengthPos == (U32)(seq - seqStore->sequencesStart)) {
|
362
|
+
if (seqStore->longLengthID == 1) {
|
363
|
+
seqLen.litLength += 0xFFFF;
|
364
|
+
}
|
365
|
+
if (seqStore->longLengthID == 2) {
|
366
|
+
seqLen.matchLength += 0xFFFF;
|
367
|
+
}
|
368
|
+
}
|
369
|
+
return seqLen;
|
370
|
+
}
|
371
|
+
|
274
372
|
/**
|
275
373
|
* Contains the compressed frame size and an upper-bound for the decompressed frame size.
|
276
374
|
* Note: before using `compressedSize`, check for errors using ZSTD_isError().
|
@@ -297,8 +395,7 @@ MEM_STATIC U32 ZSTD_highbit32(U32 val) /* compress, dictBuilder, decodeCorpus
|
|
297
395
|
{
|
298
396
|
# if defined(_MSC_VER) /* Visual */
|
299
397
|
unsigned long r=0;
|
300
|
-
_BitScanReverse(&r, val);
|
301
|
-
return (unsigned)r;
|
398
|
+
return _BitScanReverse(&r, val) ? (unsigned)r : 0;
|
302
399
|
# elif defined(__GNUC__) && (__GNUC__ >= 3) /* GCC Intrinsic */
|
303
400
|
return __builtin_clz (val) ^ 31;
|
304
401
|
# elif defined(__ICCARM__) /* IAR Intrinsic */
|
@@ -1,35 +1,15 @@
|
|
1
1
|
/* ******************************************************************
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
* Redistributions in binary form must reproduce the above
|
14
|
-
copyright notice, this list of conditions and the following disclaimer
|
15
|
-
in the documentation and/or other materials provided with the
|
16
|
-
distribution.
|
17
|
-
|
18
|
-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
19
|
-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
20
|
-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
21
|
-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
22
|
-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
23
|
-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
24
|
-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
25
|
-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
26
|
-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
27
|
-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
28
|
-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
29
|
-
|
30
|
-
You can contact the author at :
|
31
|
-
- FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
32
|
-
- Public forum : https://groups.google.com/forum/#!forum/lz4c
|
2
|
+
* FSE : Finite State Entropy encoder
|
3
|
+
* Copyright (c) 2013-2020, Yann Collet, Facebook, Inc.
|
4
|
+
*
|
5
|
+
* You can contact the author at :
|
6
|
+
* - FSE 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.
|
33
13
|
****************************************************************** */
|
34
14
|
|
35
15
|
/* **************************************************************
|
@@ -37,14 +17,14 @@
|
|
37
17
|
****************************************************************/
|
38
18
|
#include <stdlib.h> /* malloc, free, qsort */
|
39
19
|
#include <string.h> /* memcpy, memset */
|
40
|
-
#include "compiler.h"
|
41
|
-
#include "mem.h" /* U32, U16, etc. */
|
42
|
-
#include "debug.h" /* assert, DEBUGLOG */
|
20
|
+
#include "../common/compiler.h"
|
21
|
+
#include "../common/mem.h" /* U32, U16, etc. */
|
22
|
+
#include "../common/debug.h" /* assert, DEBUGLOG */
|
43
23
|
#include "hist.h" /* HIST_count_wksp */
|
44
|
-
#include "bitstream.h"
|
24
|
+
#include "../common/bitstream.h"
|
45
25
|
#define FSE_STATIC_LINKING_ONLY
|
46
|
-
#include "fse.h"
|
47
|
-
#include "error_private.h"
|
26
|
+
#include "../common/fse.h"
|
27
|
+
#include "../common/error_private.h"
|
48
28
|
|
49
29
|
|
50
30
|
/* **************************************************************
|
@@ -645,9 +625,6 @@ size_t FSE_compress_usingCTable (void* dst, size_t dstSize,
|
|
645
625
|
|
646
626
|
size_t FSE_compressBound(size_t size) { return FSE_COMPRESSBOUND(size); }
|
647
627
|
|
648
|
-
#define CHECK_V_F(e, f) size_t const e = f; if (ERR_isError(e)) return e
|
649
|
-
#define CHECK_F(f) { CHECK_V_F(_var_err__, f); }
|
650
|
-
|
651
628
|
/* FSE_compress_wksp() :
|
652
629
|
* Same as FSE_compress2(), but using an externally allocated scratch buffer (`workSpace`).
|
653
630
|
* `wkspSize` size must be `(1<<tableLog)`.
|