2013-12-30 17:16:52 +00:00
/*
LZ4 - Fast LZ compression algorithm
2017-03-16 22:10:38 +00:00
Copyright ( C ) 2011 - 2017 , Yann Collet .
2015-03-15 13:19:47 +00:00
2013-12-30 17:16:52 +00:00
BSD 2 - Clause License ( http : //www.opensource.org/licenses/bsd-license.php)
Redistribution and use in source and binary forms , with or without
modification , are permitted provided that the following conditions are
met :
* Redistributions of source code must retain the above copyright
notice , this list of conditions and the following disclaimer .
* Redistributions in binary form must reproduce the above
copyright notice , this list of conditions and the following disclaimer
in the documentation and / or other materials provided with the
distribution .
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
" AS IS " AND ANY EXPRESS OR IMPLIED WARRANTIES , INCLUDING , BUT NOT
LIMITED TO , THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED . IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT , INDIRECT , INCIDENTAL ,
SPECIAL , EXEMPLARY , OR CONSEQUENTIAL DAMAGES ( INCLUDING , BUT NOT
LIMITED TO , PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES ; LOSS OF USE ,
DATA , OR PROFITS ; OR BUSINESS INTERRUPTION ) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY , WHETHER IN CONTRACT , STRICT LIABILITY , OR TORT
( INCLUDING NEGLIGENCE OR OTHERWISE ) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE , EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE .
You can contact the author at :
2016-06-29 15:48:28 +00:00
- LZ4 homepage : http : //www.lz4.org
2016-11-03 14:12:57 +00:00
- LZ4 source repository : https : //github.com/lz4/lz4
2013-12-30 17:16:52 +00:00
*/
2014-11-22 23:46:15 +00:00
2016-06-29 10:54:23 +00:00
/*-************************************
2015-04-09 21:59:07 +00:00
* Tuning parameters
2014-02-04 14:11:10 +00:00
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
2017-05-02 05:32:21 +00:00
* LZ4_HEAPMODE :
2014-02-04 14:11:10 +00:00
* Select how default compression functions will allocate memory for their hash table ,
2014-11-22 23:46:15 +00:00
* in memory stack ( 0 : default , fastest ) , or in memory heap ( 1 : requires malloc ( ) ) .
2014-02-04 14:11:10 +00:00
*/
2017-05-02 05:32:21 +00:00
# ifndef LZ4_HEAPMODE
# define LZ4_HEAPMODE 0
2016-11-12 16:48:42 +00:00
# endif
2013-12-30 17:16:52 +00:00
2015-03-30 20:32:25 +00:00
/*
* ACCELERATION_DEFAULT :
2015-05-12 09:10:20 +00:00
* Select " acceleration " for LZ4_compress_fast ( ) when parameter value < = 0
2015-03-30 20:32:25 +00:00
*/
2015-05-03 16:57:46 +00:00
# define ACCELERATION_DEFAULT 1
2015-03-30 20:32:25 +00:00
2013-12-30 17:16:52 +00:00
2016-06-29 10:54:23 +00:00
/*-************************************
2015-04-09 21:59:07 +00:00
* CPU Feature Detection
2014-02-04 14:11:10 +00:00
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2015-08-19 17:16:17 +00:00
/* LZ4_FORCE_MEMORY_ACCESS
* By default , access to unaligned memory is controlled by ` memcpy ( ) ` , which is safe and portable .
* Unfortunately , on some target / compiler combinations , the generated assembly is sub - optimal .
* The below switch allow to select different access method for improved performance .
* Method 0 ( default ) : use ` memcpy ( ) ` . Safe and portable .
* Method 1 : ` __packed ` statement . It depends on compiler extension ( ie , not portable ) .
* This method is safe if your compiler supports it , and * generally * as fast or faster than ` memcpy ` .
* Method 2 : direct access . This method is portable but violate C standard .
2017-03-30 19:22:17 +00:00
* It can generate buggy code on targets which assembly generation depends on alignment .
2015-08-19 17:16:17 +00:00
* But in some circumstances , it ' s the only known way to get the most performance ( ie GCC + ARMv6 )
2016-07-07 22:39:39 +00:00
* See https : //fastcompression.blogspot.fr/2015/08/accessing-unaligned-memory.html for details.
2015-08-19 17:16:17 +00:00
* Prefer these methods in priority order ( 0 > 1 > 2 )
2015-08-16 00:54:55 +00:00
*/
2017-03-30 19:22:17 +00:00
# ifndef LZ4_FORCE_MEMORY_ACCESS /* can be defined externally */
2018-04-18 23:49:27 +00:00
# if defined(__GNUC__) && \
( defined ( __ARM_ARCH_6__ ) | | defined ( __ARM_ARCH_6J__ ) | | defined ( __ARM_ARCH_6K__ ) \
| | defined ( __ARM_ARCH_6Z__ ) | | defined ( __ARM_ARCH_6ZK__ ) | | defined ( __ARM_ARCH_6T2__ ) )
2015-08-19 17:16:17 +00:00
# define LZ4_FORCE_MEMORY_ACCESS 2
2018-02-08 14:15:07 +00:00
# elif (defined(__INTEL_COMPILER) && !defined(_WIN32)) || defined(__GNUC__)
2015-08-19 17:16:17 +00:00
# define LZ4_FORCE_MEMORY_ACCESS 1
# endif
2015-08-16 00:54:55 +00:00
# endif
2014-11-29 15:41:28 +00:00
/*
* LZ4_FORCE_SW_BITCOUNT
* Define this parameter if your target system or compiler does not support hardware bit count
*/
2018-04-18 23:49:27 +00:00
# if defined(_MSC_VER) && defined(_WIN32_WCE) /* Visual Studio for WinCE doesn't support Hardware bit count */
2013-12-30 17:16:52 +00:00
# define LZ4_FORCE_SW_BITCOUNT
# endif
2017-11-05 10:48:00 +00:00
2016-06-29 10:54:23 +00:00
/*-************************************
2016-11-04 00:14:25 +00:00
* Dependency
2015-04-11 17:59:22 +00:00
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2018-04-11 20:31:52 +00:00
# define LZ4_STATIC_LINKING_ONLY
lz4.c: refactor the decoding routines
I noticed that LZ4_decompress_generic is sometimes instantiated with
identical set of parameters, or (what's worse) with a subtly different
sets of parameters. For example, LZ4_decompress_fast_withPrefix64k is
instantiated as follows:
return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize,
full, 0, withPrefix64k, (BYTE*)dest - 64 KB, NULL, 64 KB);
while the equivalent withPrefix64k call in LZ4_decompress_usingDict_generic
passes 0 for the last argument instead of 64 KB. It turns out that there
is no difference in this case: if you change 64 KB to 0 KB in
LZ4_decompress_fast_withPrefix64k, you get the same binary code.
Moreover, because it's been clarified that LZ4_decompress_fast doesn't
check match offsets, it is now obvious that both of these fast/withPrefix64k
instantiations are simply redundant. Exactly because LZ4_decompress_fast
doesn't check offsets, it serves well with any prefixed dictionary.
There's a difference, though, with LZ4_decompress_safe_withPrefix64k.
It also passes 64 KB as the last argument, and if you change that to 0,
as in LZ4_decompress_usingDict_generic, you get a completely different
binary code. It seems that passing 0 enables offset checking:
const int checkOffset = ((safeDecode) && (dictSize < (int)(64 KB)));
However, the resulting code seems to run a bit faster. How come
enabling extra checks can make the code run faster? Curiouser and
curiouser! This needs extra study. Currently I take the view that
the dictSize should be set to non-zero when nothing else will do,
i.e. when passing the external dictionary via dictStart. Otherwise,
lowPrefix betrays just enough information about the dictionary.
* * *
Anyway, with this change, I instantiate all the necessary cases as
functions with distinctive names, which also take fewer arguments and
are therefore less error-prone. I also make the functions non-inline.
(The compiler won't inline the functions because they are used more than
once. Hence I attach LZ4_FORCE_O2_GCC_PPC64LE to the instances while
removing from the callers.) The number of instances is now is reduced
from 18 (safe+fast+partial+4*continue+4*prefix+4*dict+2*prefix64+forceExtDict)
down to 7 (safe+fast+partial+2*prefix+2*dict). The size of the code is
not the only issue here. Separate helper function are much more
amenable to profile-guided optimization: it is enough to profile only
a few basic functions, while the other less-often used functions, such
as LZ4_decompress_*_continue, will benefit automatically.
This is the list of LZ4_decompress* functions in liblz4.so, sorted by size.
Exported functions are marked with a capital T.
$ nm -S lib/liblz4.so |grep -wi T |grep LZ4_decompress |sort -k2
0000000000016260 0000000000000005 T LZ4_decompress_fast_withPrefix64k
0000000000016dc0 0000000000000025 T LZ4_decompress_fast_usingDict
0000000000016d80 0000000000000040 T LZ4_decompress_safe_usingDict
0000000000016d10 000000000000006b T LZ4_decompress_fast_continue
0000000000016c70 000000000000009f T LZ4_decompress_safe_continue
00000000000156c0 000000000000059c T LZ4_decompress_fast
0000000000014a90 00000000000005fa T LZ4_decompress_safe
0000000000015c60 00000000000005fa T LZ4_decompress_safe_withPrefix64k
0000000000002280 00000000000005fa t LZ4_decompress_safe_withSmallPrefix
0000000000015090 000000000000062f T LZ4_decompress_safe_partial
0000000000002880 00000000000008ea t LZ4_decompress_fast_extDict
0000000000016270 0000000000000993 t LZ4_decompress_safe_forceExtDict
2018-04-23 05:37:44 +00:00
# define LZ4_DISABLE_DEPRECATE_WARNINGS /* due to LZ4_decompress_safe_withPrefix64k */
2015-04-11 17:59:22 +00:00
# include "lz4.h"
2016-11-04 00:14:25 +00:00
/* see also "memory routines" below */
2015-04-11 17:59:22 +00:00
2016-06-29 10:54:23 +00:00
/*-************************************
2015-03-07 18:30:45 +00:00
* Compiler Options
2014-02-04 14:11:10 +00:00
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
# ifdef _MSC_VER /* Visual Studio */
2014-11-29 15:41:28 +00:00
# include <intrin.h>
2014-02-04 14:11:10 +00:00
# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */
2014-12-10 08:05:44 +00:00
# pragma warning(disable : 4293) /* disable: C4293: too large shift (32-bits) */
2014-12-16 21:03:16 +00:00
# endif /* _MSC_VER */
2014-06-12 22:29:06 +00:00
2017-08-24 14:14:20 +00:00
# ifndef LZ4_FORCE_INLINE
2017-07-28 14:33:43 +00:00
# ifdef _MSC_VER /* Visual Studio */
2017-08-24 14:14:20 +00:00
# define LZ4_FORCE_INLINE static __forceinline
2017-07-28 14:33:43 +00:00
# else
# if defined (__cplusplus) || defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 */
# ifdef __GNUC__
2017-08-24 14:14:20 +00:00
# define LZ4_FORCE_INLINE static inline __attribute__((always_inline))
2017-07-28 14:33:43 +00:00
# else
2017-08-24 14:14:20 +00:00
# define LZ4_FORCE_INLINE static inline
2017-07-28 14:33:43 +00:00
# endif
# else
2017-08-24 14:14:20 +00:00
# define LZ4_FORCE_INLINE static
2017-07-28 14:33:43 +00:00
# endif /* __STDC_VERSION__ */
# endif /* _MSC_VER */
2017-08-24 14:14:20 +00:00
# endif /* LZ4_FORCE_INLINE */
2017-07-28 14:33:43 +00:00
2017-10-13 19:53:37 +00:00
/* LZ4_FORCE_O2_GCC_PPC64LE and LZ4_FORCE_O2_INLINE_GCC_PPC64LE
* Gcc on ppc64le generates an unrolled SIMDized loop for LZ4_wildCopy ,
* together with a simple 8 - byte copy loop as a fall - back path .
* However , this optimization hurts the decompression speed by > 30 % ,
* because the execution does not go to the optimized loop
* for typical compressible data , and all of the preamble checks
* before going to the fall - back path become useless overhead .
* This optimization happens only with the - O3 flag , and - O2 generates
* a simple 8 - byte copy loop .
* With gcc on ppc64le , all of the LZ4_decompress_ * and LZ4_wildCopy
* functions are annotated with __attribute__ ( ( optimize ( " O2 " ) ) ) ,
* and also LZ4_wildCopy is forcibly inlined , so that the O2 attribute
* of LZ4_wildCopy does not affect the compression speed .
*/
# if defined(__PPC64__) && defined(__LITTLE_ENDIAN__) && defined(__GNUC__)
# define LZ4_FORCE_O2_GCC_PPC64LE __attribute__((optimize("O2")))
# define LZ4_FORCE_O2_INLINE_GCC_PPC64LE __attribute__((optimize("O2"))) LZ4_FORCE_INLINE
# else
# define LZ4_FORCE_O2_GCC_PPC64LE
# define LZ4_FORCE_O2_INLINE_GCC_PPC64LE static
# endif
2016-11-12 21:30:02 +00:00
# if (defined(__GNUC__) && (__GNUC__ >= 3)) || (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 800)) || defined(__clang__)
2013-12-30 17:16:52 +00:00
# define expect(expr,value) (__builtin_expect ((expr),(value)) )
# else
# define expect(expr,value) (expr)
# endif
2018-04-18 09:20:56 +00:00
# ifndef likely
2013-12-30 17:16:52 +00:00
# define likely(expr) expect((expr) != 0, 1)
2018-04-18 09:20:56 +00:00
# endif
# ifndef unlikely
2013-12-30 17:16:52 +00:00
# define unlikely(expr) expect((expr) != 0, 0)
2018-04-18 09:20:56 +00:00
# endif
2013-12-30 17:16:52 +00:00
2016-06-29 10:54:23 +00:00
/*-************************************
2015-04-09 21:59:07 +00:00
* Memory routines
2014-02-04 14:11:10 +00:00
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
# include <stdlib.h> /* malloc, calloc, free */
2018-04-27 16:04:09 +00:00
# define ALLOC(s) malloc(s)
2018-01-26 22:29:50 +00:00
# define ALLOC_AND_ZERO(s) calloc(1,s)
2018-04-27 16:04:09 +00:00
# define FREEMEM(p) free(p)
2014-02-04 14:11:10 +00:00
# include <string.h> /* memset, memcpy */
2018-04-27 16:04:09 +00:00
# define MEM_INIT(p,v,s) memset((p),(v),(s))
2013-12-30 17:16:52 +00:00
2016-06-29 10:54:23 +00:00
/*-************************************
2015-04-09 21:59:07 +00:00
* Basic Types
2014-02-04 14:11:10 +00:00
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2016-11-04 00:14:25 +00:00
# if defined(__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */ )
2013-12-30 17:16:52 +00:00
# include <stdint.h>
typedef uint8_t BYTE ;
typedef uint16_t U16 ;
typedef uint32_t U32 ;
typedef int32_t S32 ;
typedef uint64_t U64 ;
2016-11-17 21:02:06 +00:00
typedef uintptr_t uptrval ;
2013-12-30 17:16:52 +00:00
# else
typedef unsigned char BYTE ;
typedef unsigned short U16 ;
typedef unsigned int U32 ;
typedef signed int S32 ;
typedef unsigned long long U64 ;
2016-11-18 02:30:46 +00:00
typedef size_t uptrval ; /* generally true, except OpenVMS-64 */
2013-12-30 17:16:52 +00:00
# endif
2016-11-19 01:05:06 +00:00
# if defined(__x86_64__)
typedef U64 reg_t ; /* 64-bits in x32 mode */
# else
typedef size_t reg_t ; /* 32-bits in x32 mode */
# endif
2013-12-30 17:16:52 +00:00
2016-06-29 10:54:23 +00:00
/*-************************************
2015-04-09 21:59:07 +00:00
* Reading and writing into memory
2014-11-22 23:46:15 +00:00
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
static unsigned LZ4_isLittleEndian ( void )
{
2016-11-14 19:34:10 +00:00
const union { U32 u ; BYTE c [ 4 ] ; } one = { 1 } ; /* don't use static : performance detrimental */
2014-11-22 23:46:15 +00:00
return one . c [ 0 ] ;
}
2013-12-30 17:16:52 +00:00
2015-08-19 17:16:17 +00:00
# if defined(LZ4_FORCE_MEMORY_ACCESS) && (LZ4_FORCE_MEMORY_ACCESS==2)
2016-11-04 00:14:25 +00:00
/* lie to the compiler about data alignment; use with caution */
2015-08-16 00:54:55 +00:00
static U16 LZ4_read16 ( const void * memPtr ) { return * ( const U16 * ) memPtr ; }
static U32 LZ4_read32 ( const void * memPtr ) { return * ( const U32 * ) memPtr ; }
2016-11-19 01:05:06 +00:00
static reg_t LZ4_read_ARCH ( const void * memPtr ) { return * ( const reg_t * ) memPtr ; }
2015-08-16 00:54:55 +00:00
2015-08-16 01:33:57 +00:00
static void LZ4_write16 ( void * memPtr , U16 value ) { * ( U16 * ) memPtr = value ; }
2016-06-29 15:02:09 +00:00
static void LZ4_write32 ( void * memPtr , U32 value ) { * ( U32 * ) memPtr = value ; }
2015-08-16 01:33:57 +00:00
2015-08-19 17:16:17 +00:00
# elif defined(LZ4_FORCE_MEMORY_ACCESS) && (LZ4_FORCE_MEMORY_ACCESS==1)
/* __pack instructions are safer, but compiler specific, hence potentially problematic for some compilers */
/* currently only defined for gcc and icc */
2016-11-19 01:05:06 +00:00
typedef union { U16 u16 ; U32 u32 ; reg_t uArch ; } __attribute__ ( ( packed ) ) unalign ;
2015-08-19 17:16:17 +00:00
static U16 LZ4_read16 ( const void * ptr ) { return ( ( const unalign * ) ptr ) - > u16 ; }
static U32 LZ4_read32 ( const void * ptr ) { return ( ( const unalign * ) ptr ) - > u32 ; }
2016-11-19 01:05:06 +00:00
static reg_t LZ4_read_ARCH ( const void * ptr ) { return ( ( const unalign * ) ptr ) - > uArch ; }
2015-08-19 17:16:17 +00:00
static void LZ4_write16 ( void * memPtr , U16 value ) { ( ( unalign * ) memPtr ) - > u16 = value ; }
2016-06-29 15:02:09 +00:00
static void LZ4_write32 ( void * memPtr , U32 value ) { ( ( unalign * ) memPtr ) - > u32 = value ; }
2015-08-19 17:16:17 +00:00
2016-11-04 00:14:25 +00:00
# else /* safe and portable access through memcpy() */
2014-11-29 16:44:33 +00:00
2015-04-09 21:59:07 +00:00
static U16 LZ4_read16 ( const void * memPtr )
{
2015-08-16 01:33:57 +00:00
U16 val ; memcpy ( & val , memPtr , sizeof ( val ) ) ; return val ;
2015-04-09 21:59:07 +00:00
}
2015-08-16 00:54:55 +00:00
static U32 LZ4_read32 ( const void * memPtr )
{
2015-08-16 01:33:57 +00:00
U32 val ; memcpy ( & val , memPtr , sizeof ( val ) ) ; return val ;
2015-08-16 00:54:55 +00:00
}
2016-11-19 01:05:06 +00:00
static reg_t LZ4_read_ARCH ( const void * memPtr )
2015-08-16 00:54:55 +00:00
{
2016-11-19 01:05:06 +00:00
reg_t val ; memcpy ( & val , memPtr , sizeof ( val ) ) ; return val ;
2015-08-16 01:33:57 +00:00
}
static void LZ4_write16 ( void * memPtr , U16 value )
{
memcpy ( memPtr , & value , sizeof ( value ) ) ;
2015-08-16 00:54:55 +00:00
}
2016-06-29 15:02:09 +00:00
static void LZ4_write32 ( void * memPtr , U32 value )
{
memcpy ( memPtr , & value , sizeof ( value ) ) ;
}
2016-06-29 10:54:23 +00:00
# endif /* LZ4_FORCE_MEMORY_ACCESS */
2015-08-16 00:54:55 +00:00
2014-11-22 23:46:15 +00:00
static U16 LZ4_readLE16 ( const void * memPtr )
{
2016-06-29 10:54:23 +00:00
if ( LZ4_isLittleEndian ( ) ) {
2015-04-09 21:59:07 +00:00
return LZ4_read16 ( memPtr ) ;
2016-06-29 10:54:23 +00:00
} else {
2015-03-10 15:57:42 +00:00
const BYTE * p = ( const BYTE * ) memPtr ;
2014-11-22 23:46:15 +00:00
return ( U16 ) ( ( U16 ) p [ 0 ] + ( p [ 1 ] < < 8 ) ) ;
}
}
static void LZ4_writeLE16 ( void * memPtr , U16 value )
{
2016-06-29 10:54:23 +00:00
if ( LZ4_isLittleEndian ( ) ) {
2015-08-16 01:33:57 +00:00
LZ4_write16 ( memPtr , value ) ;
2016-06-29 10:54:23 +00:00
} else {
2015-03-10 15:57:42 +00:00
BYTE * p = ( BYTE * ) memPtr ;
2014-11-22 23:46:15 +00:00
p [ 0 ] = ( BYTE ) value ;
p [ 1 ] = ( BYTE ) ( value > > 8 ) ;
}
}
2016-11-04 00:14:25 +00:00
/* customized variant of memcpy, which can overwrite up to 8 bytes beyond dstEnd */
2017-10-13 19:53:37 +00:00
LZ4_FORCE_O2_INLINE_GCC_PPC64LE
void LZ4_wildCopy ( void * dstPtr , const void * srcPtr , void * dstEnd )
2014-11-22 23:46:15 +00:00
{
2015-03-10 15:57:42 +00:00
BYTE * d = ( BYTE * ) dstPtr ;
const BYTE * s = ( const BYTE * ) srcPtr ;
2015-07-16 08:38:10 +00:00
BYTE * const e = ( BYTE * ) dstEnd ;
2015-09-01 14:59:24 +00:00
2018-02-12 06:20:09 +00:00
do { memcpy ( d , s , 8 ) ; d + = 8 ; s + = 8 ; } while ( d < e ) ;
2014-11-22 23:46:15 +00:00
}
2013-12-30 17:16:52 +00:00
2016-06-29 10:54:23 +00:00
/*-************************************
2015-05-03 16:57:46 +00:00
* Common Constants
2014-02-04 14:11:10 +00:00
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2013-12-30 17:16:52 +00:00
# define MINMATCH 4
2015-07-16 08:38:10 +00:00
# define WILDCOPYLENGTH 8
2013-12-30 17:16:52 +00:00
# define LASTLITERALS 5
2015-07-16 08:38:10 +00:00
# define MFLIMIT (WILDCOPYLENGTH+MINMATCH)
2014-02-04 14:11:10 +00:00
static const int LZ4_minLength = ( MFLIMIT + 1 ) ;
2014-11-29 19:19:39 +00:00
# define KB *(1 <<10)
# define MB *(1 <<20)
2014-02-04 14:11:10 +00:00
# define GB *(1U<<30)
2013-12-30 17:16:52 +00:00
# define MAXD_LOG 16
# define MAX_DISTANCE ((1 << MAXD_LOG) - 1)
# define ML_BITS 4
# define ML_MASK ((1U<<ML_BITS)-1)
# define RUN_BITS (8-ML_BITS)
# define RUN_MASK ((1U<<RUN_BITS)-1)
2016-06-29 10:54:23 +00:00
/*-************************************
2017-06-26 18:29:05 +00:00
* Error detection
2014-02-04 14:11:10 +00:00
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2017-10-19 23:47:25 +00:00
# if defined(LZ4_DEBUG) && (LZ4_DEBUG>=1)
# include <assert.h>
# else
# ifndef assert
# define assert(condition) ((void)0)
# endif
# endif
2018-04-18 23:49:27 +00:00
# define LZ4_STATIC_ASSERT(c) { enum { LZ4_static_assert = 1 / (int)(!!(c)) }; } /* use after variable declarations */
2013-12-30 17:16:52 +00:00
2017-06-26 18:29:05 +00:00
# if defined(LZ4_DEBUG) && (LZ4_DEBUG>=2)
# include <stdio.h>
2017-11-02 21:53:06 +00:00
static int g_debuglog_enable = 1 ;
# define DEBUGLOG(l, ...) { \
if ( ( g_debuglog_enable ) & & ( l < = LZ4_DEBUG ) ) { \
fprintf ( stderr , __FILE__ " : " ) ; \
fprintf ( stderr , __VA_ARGS__ ) ; \
fprintf ( stderr , " \n " ) ; \
2017-06-26 18:29:05 +00:00
} }
# else
# define DEBUGLOG(l, ...) {} /* disabled */
# endif
2013-12-30 17:16:52 +00:00
2016-06-29 10:54:23 +00:00
/*-************************************
2015-03-07 18:30:45 +00:00
* Common functions
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2017-12-05 01:10:23 +00:00
static unsigned LZ4_NbCommonBytes ( reg_t val )
2013-12-30 17:16:52 +00:00
{
2016-06-29 10:54:23 +00:00
if ( LZ4_isLittleEndian ( ) ) {
2016-11-19 01:05:06 +00:00
if ( sizeof ( val ) = = 8 ) {
2014-11-29 16:44:33 +00:00
# if defined(_MSC_VER) && defined(_WIN64) && !defined(LZ4_FORCE_SW_BITCOUNT)
unsigned long r = 0 ;
_BitScanForward64 ( & r , ( U64 ) val ) ;
return ( int ) ( r > > 3 ) ;
2016-11-12 21:30:02 +00:00
# elif (defined(__clang__) || (defined(__GNUC__) && (__GNUC__>=3))) && !defined(LZ4_FORCE_SW_BITCOUNT)
2014-11-29 16:44:33 +00:00
return ( __builtin_ctzll ( ( U64 ) val ) > > 3 ) ;
# else
2017-12-05 01:10:23 +00:00
static const int DeBruijnBytePos [ 64 ] = { 0 , 0 , 0 , 0 , 0 , 1 , 1 , 2 ,
0 , 3 , 1 , 3 , 1 , 4 , 2 , 7 ,
0 , 2 , 3 , 6 , 1 , 5 , 3 , 5 ,
1 , 3 , 4 , 4 , 2 , 5 , 6 , 7 ,
7 , 0 , 1 , 2 , 3 , 3 , 4 , 6 ,
2 , 6 , 5 , 5 , 3 , 4 , 5 , 6 ,
7 , 1 , 2 , 4 , 6 , 4 , 4 , 5 ,
7 , 2 , 6 , 5 , 7 , 6 , 7 , 7 } ;
2014-11-29 16:44:33 +00:00
return DeBruijnBytePos [ ( ( U64 ) ( ( val & - ( long long ) val ) * 0x0218A392CDABBD3FULL ) ) > > 58 ] ;
# endif
2016-06-29 10:54:23 +00:00
} else /* 32 bits */ {
2014-11-29 16:44:33 +00:00
# if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT)
unsigned long r ;
_BitScanForward ( & r , ( U32 ) val ) ;
return ( int ) ( r > > 3 ) ;
2016-11-12 21:30:02 +00:00
# elif (defined(__clang__) || (defined(__GNUC__) && (__GNUC__>=3))) && !defined(LZ4_FORCE_SW_BITCOUNT)
2014-11-29 16:44:33 +00:00
return ( __builtin_ctz ( ( U32 ) val ) > > 3 ) ;
# else
2017-12-05 01:10:23 +00:00
static const int DeBruijnBytePos [ 32 ] = { 0 , 0 , 3 , 0 , 3 , 1 , 3 , 0 ,
3 , 2 , 2 , 1 , 3 , 2 , 0 , 1 ,
3 , 3 , 1 , 2 , 2 , 2 , 2 , 0 ,
3 , 1 , 2 , 0 , 1 , 0 , 1 , 1 } ;
2014-11-29 16:44:33 +00:00
return DeBruijnBytePos [ ( ( U32 ) ( ( val & - ( S32 ) val ) * 0x077CB531U ) ) > > 27 ] ;
# endif
}
2016-06-29 10:54:23 +00:00
} else /* Big Endian CPU */ {
fix #404
static analyzer `cppcheck` complains about a shift-by-32 on a 32 bits value,
which is an undefined behavior.
However, the flagged code path is never triggered in 32-bits mode,
(actually, it's not even generated if DCE kicks in),
the shift-by-32 is necessarily performed on a 64-bits value.
While it doesn't change anything regarding lz4 code generation, for both 32 and 64 bits mode,
(can be checked by md5sum on the generated binary),
the shift has been rewritten in a way which should please this static analyzer,
since it now pretends to shift by 16 on 32-bits cpu (note : it doesn't matter since the code will not even be generated in this case).
Note : this is a blind fix, the new code has not been tested with cppcheck, because cppcheck only works on Windows.
Other static analyzer, such as scan-build, do not trigger this false positive.
2017-09-30 17:35:55 +00:00
if ( sizeof ( val ) = = 8 ) { /* 64-bits */
2014-11-29 16:44:33 +00:00
# if defined(_MSC_VER) && defined(_WIN64) && !defined(LZ4_FORCE_SW_BITCOUNT)
unsigned long r = 0 ;
_BitScanReverse64 ( & r , val ) ;
return ( unsigned ) ( r > > 3 ) ;
2016-11-12 21:30:02 +00:00
# elif (defined(__clang__) || (defined(__GNUC__) && (__GNUC__>=3))) && !defined(LZ4_FORCE_SW_BITCOUNT)
2015-04-12 14:17:10 +00:00
return ( __builtin_clzll ( ( U64 ) val ) > > 3 ) ;
2014-11-29 16:44:33 +00:00
# else
fix #404
static analyzer `cppcheck` complains about a shift-by-32 on a 32 bits value,
which is an undefined behavior.
However, the flagged code path is never triggered in 32-bits mode,
(actually, it's not even generated if DCE kicks in),
the shift-by-32 is necessarily performed on a 64-bits value.
While it doesn't change anything regarding lz4 code generation, for both 32 and 64 bits mode,
(can be checked by md5sum on the generated binary),
the shift has been rewritten in a way which should please this static analyzer,
since it now pretends to shift by 16 on 32-bits cpu (note : it doesn't matter since the code will not even be generated in this case).
Note : this is a blind fix, the new code has not been tested with cppcheck, because cppcheck only works on Windows.
Other static analyzer, such as scan-build, do not trigger this false positive.
2017-09-30 17:35:55 +00:00
static const U32 by32 = sizeof ( val ) * 4 ; /* 32 on 64 bits (goal), 16 on 32 bits.
Just to avoid some static analyzer complaining about shift by 32 on 32 - bits target .
Note that this code path is never triggered in 32 - bits mode . */
2014-11-29 16:44:33 +00:00
unsigned r ;
fix #404
static analyzer `cppcheck` complains about a shift-by-32 on a 32 bits value,
which is an undefined behavior.
However, the flagged code path is never triggered in 32-bits mode,
(actually, it's not even generated if DCE kicks in),
the shift-by-32 is necessarily performed on a 64-bits value.
While it doesn't change anything regarding lz4 code generation, for both 32 and 64 bits mode,
(can be checked by md5sum on the generated binary),
the shift has been rewritten in a way which should please this static analyzer,
since it now pretends to shift by 16 on 32-bits cpu (note : it doesn't matter since the code will not even be generated in this case).
Note : this is a blind fix, the new code has not been tested with cppcheck, because cppcheck only works on Windows.
Other static analyzer, such as scan-build, do not trigger this false positive.
2017-09-30 17:35:55 +00:00
if ( ! ( val > > by32 ) ) { r = 4 ; } else { r = 0 ; val > > = by32 ; }
2014-11-29 16:44:33 +00:00
if ( ! ( val > > 16 ) ) { r + = 2 ; val > > = 8 ; } else { val > > = 24 ; }
r + = ( ! val ) ;
return r ;
# endif
2016-06-29 10:54:23 +00:00
} else /* 32 bits */ {
2014-11-29 16:44:33 +00:00
# if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT)
unsigned long r = 0 ;
2014-11-30 11:58:00 +00:00
_BitScanReverse ( & r , ( unsigned long ) val ) ;
2014-11-29 16:44:33 +00:00
return ( unsigned ) ( r > > 3 ) ;
2016-11-12 21:30:02 +00:00
# elif (defined(__clang__) || (defined(__GNUC__) && (__GNUC__>=3))) && !defined(LZ4_FORCE_SW_BITCOUNT)
2015-04-12 14:17:10 +00:00
return ( __builtin_clz ( ( U32 ) val ) > > 3 ) ;
2014-11-29 16:44:33 +00:00
# else
unsigned r ;
if ( ! ( val > > 16 ) ) { r = 2 ; val > > = 8 ; } else { r = 0 ; val > > = 24 ; }
r + = ( ! val ) ;
return r ;
# endif
}
2014-11-22 23:46:15 +00:00
}
2013-12-30 17:16:52 +00:00
}
2016-11-19 01:05:06 +00:00
# define STEPSIZE sizeof(reg_t)
2017-11-07 01:29:27 +00:00
LZ4_FORCE_INLINE
unsigned LZ4_count ( const BYTE * pIn , const BYTE * pMatch , const BYTE * pInLimit )
2014-11-29 19:19:39 +00:00
{
const BYTE * const pStart = pIn ;
2017-11-06 23:42:50 +00:00
if ( likely ( pIn < pInLimit - ( STEPSIZE - 1 ) ) ) {
reg_t const diff = LZ4_read_ARCH ( pMatch ) ^ LZ4_read_ARCH ( pIn ) ;
if ( ! diff ) {
pIn + = STEPSIZE ; pMatch + = STEPSIZE ;
} else {
return LZ4_NbCommonBytes ( diff ) ;
} }
while ( likely ( pIn < pInLimit - ( STEPSIZE - 1 ) ) ) {
2016-11-19 01:05:06 +00:00
reg_t const diff = LZ4_read_ARCH ( pMatch ) ^ LZ4_read_ARCH ( pIn ) ;
2014-11-29 19:19:39 +00:00
if ( ! diff ) { pIn + = STEPSIZE ; pMatch + = STEPSIZE ; continue ; }
pIn + = LZ4_NbCommonBytes ( diff ) ;
return ( unsigned ) ( pIn - pStart ) ;
}
2014-12-03 18:17:10 +00:00
2016-11-19 01:05:06 +00:00
if ( ( STEPSIZE = = 8 ) & & ( pIn < ( pInLimit - 3 ) ) & & ( LZ4_read32 ( pMatch ) = = LZ4_read32 ( pIn ) ) ) { pIn + = 4 ; pMatch + = 4 ; }
2014-11-29 19:19:39 +00:00
if ( ( pIn < ( pInLimit - 1 ) ) & & ( LZ4_read16 ( pMatch ) = = LZ4_read16 ( pIn ) ) ) { pIn + = 2 ; pMatch + = 2 ; }
if ( ( pIn < pInLimit ) & & ( * pMatch = = * pIn ) ) pIn + + ;
return ( unsigned ) ( pIn - pStart ) ;
}
# ifndef LZ4_COMMONDEFS_ONLY
2016-06-29 10:54:23 +00:00
/*-************************************
2015-03-07 18:30:45 +00:00
* Local Constants
2014-11-29 19:19:39 +00:00
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2014-12-14 13:29:15 +00:00
static const int LZ4_64Klimit = ( ( 64 KB ) + ( MFLIMIT - 1 ) ) ;
static const U32 LZ4_skipTrigger = 6 ; /* Increase this value ==> compression run slower on incompressible data */
2014-11-29 19:19:39 +00:00
2016-06-29 10:54:23 +00:00
/*-************************************
2015-03-07 18:30:45 +00:00
* Local Structures and types
2014-11-29 19:19:39 +00:00
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2018-04-26 19:42:16 +00:00
typedef enum { notLimited = 0 , limitedOutput = 1 , fillOutput = 2 } limitedOutput_directive ;
2018-03-13 19:07:19 +00:00
typedef enum { clearedTable = 0 , byPtr , byU32 , byU16 } tableType_t ;
2014-11-29 19:19:39 +00:00
2018-03-13 19:07:19 +00:00
/**
* This enum distinguishes several different modes of accessing previous
* content in the stream .
*
* - noDict : There is no preceding content .
* - withPrefix64k : Table entries up to ctx - > dictSize before the current blob
* blob being compressed are valid and refer to the preceding
* content ( of length ctx - > dictSize ) , which is available
* contiguously preceding in memory the content currently
* being compressed .
* - usingExtDict : Like withPrefix64k , but the preceding content is somewhere
* else in memory , starting at ctx - > dictionary with length
* ctx - > dictSize .
* - usingDictCtx : Like usingExtDict , but everything concerning the preceding
* content is in a separate context , pointed to by
* ctx - > dictCtx . ctx - > dictionary , ctx - > dictSize , and table
* entries in the current context that refer to positions
* preceding the beginning of the current compression are
* ignored . Instead , ctx - > dictCtx - > dictionary and ctx - > dictCtx
* - > dictSize describe the location and size of the preceding
* content , and matches are found by looking in the ctx
* - > dictCtx - > hashTable .
*/
typedef enum { noDict = 0 , withPrefix64k , usingExtDict , usingDictCtx } dict_directive ;
2014-11-29 19:19:39 +00:00
typedef enum { noDictIssue = 0 , dictSmall } dictIssue_directive ;
typedef enum { endOnOutputSize = 0 , endOnInputSize = 1 } endCondition_directive ;
typedef enum { full = 0 , partial = 1 } earlyEnd_directive ;
2016-06-29 10:54:23 +00:00
/*-************************************
2015-04-01 17:21:03 +00:00
* Local Utils
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
int LZ4_versionNumber ( void ) { return LZ4_VERSION_NUMBER ; }
2016-12-04 19:05:36 +00:00
const char * LZ4_versionString ( void ) { return LZ4_VERSION_STRING ; }
2015-04-01 17:21:03 +00:00
int LZ4_compressBound ( int isize ) { return LZ4_COMPRESSBOUND ( isize ) ; }
int LZ4_sizeofState ( ) { return LZ4_STREAMSIZE ; }
2016-06-29 10:54:23 +00:00
/*-******************************
2015-03-07 18:30:45 +00:00
* Compression functions
2014-11-29 19:19:39 +00:00
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2016-11-08 01:31:38 +00:00
static U32 LZ4_hash4 ( U32 sequence , tableType_t const tableType )
2013-12-30 17:16:52 +00:00
{
if ( tableType = = byU16 )
2016-11-04 14:13:49 +00:00
return ( ( sequence * 2654435761U ) > > ( ( MINMATCH * 8 ) - ( LZ4_HASHLOG + 1 ) ) ) ;
2013-12-30 17:16:52 +00:00
else
2016-11-04 14:13:49 +00:00
return ( ( sequence * 2654435761U ) > > ( ( MINMATCH * 8 ) - LZ4_HASHLOG ) ) ;
2013-12-30 17:16:52 +00:00
}
2016-11-08 01:31:38 +00:00
static U32 LZ4_hash5 ( U64 sequence , tableType_t const tableType )
2015-03-30 17:34:15 +00:00
{
2016-11-04 14:22:50 +00:00
static const U64 prime5bytes = 889523592379ULL ;
static const U64 prime8bytes = 11400714785074694791ULL ;
2015-03-30 17:34:15 +00:00
const U32 hashLog = ( tableType = = byU16 ) ? LZ4_HASHLOG + 1 : LZ4_HASHLOG ;
2016-11-04 14:22:50 +00:00
if ( LZ4_isLittleEndian ( ) )
2016-11-04 19:34:28 +00:00
return ( U32 ) ( ( ( sequence < < 24 ) * prime5bytes ) > > ( 64 - hashLog ) ) ;
2016-11-04 14:22:50 +00:00
else
2016-11-04 19:34:28 +00:00
return ( U32 ) ( ( ( sequence > > 24 ) * prime8bytes ) > > ( 64 - hashLog ) ) ;
2015-03-30 17:34:15 +00:00
}
2017-08-24 14:14:20 +00:00
LZ4_FORCE_INLINE U32 LZ4_hashPosition ( const void * const p , tableType_t const tableType )
2015-03-30 17:34:15 +00:00
{
2016-11-19 01:05:06 +00:00
if ( ( sizeof ( reg_t ) = = 8 ) & & ( tableType ! = byU16 ) ) return LZ4_hash5 ( LZ4_read_ARCH ( p ) , tableType ) ;
2016-11-08 01:31:38 +00:00
return LZ4_hash4 ( LZ4_read32 ( p ) , tableType ) ;
2016-11-04 14:13:49 +00:00
}
2015-03-30 17:34:15 +00:00
2018-04-13 08:01:54 +00:00
static void LZ4_putIndexOnHash ( U32 idx , U32 h , void * tableBase , tableType_t const tableType )
2018-04-05 23:38:43 +00:00
{
switch ( tableType )
{
default : /* fallthrough */
case clearedTable : /* fallthrough */
case byPtr : { /* illegal! */ assert ( 0 ) ; return ; }
2018-04-13 08:01:54 +00:00
case byU32 : { U32 * hashTable = ( U32 * ) tableBase ; hashTable [ h ] = idx ; return ; }
case byU16 : { U16 * hashTable = ( U16 * ) tableBase ; assert ( idx < 65536 ) ; hashTable [ h ] = ( U16 ) idx ; return ; }
2018-04-05 23:38:43 +00:00
}
}
2018-04-18 23:49:27 +00:00
static void LZ4_putPositionOnHash ( const BYTE * p , U32 h ,
void * tableBase , tableType_t const tableType ,
const BYTE * srcBase )
2013-12-30 17:16:52 +00:00
{
switch ( tableType )
{
2018-03-13 19:07:19 +00:00
case clearedTable : { /* illegal! */ assert ( 0 ) ; return ; }
2014-12-02 22:57:15 +00:00
case byPtr : { const BYTE * * hashTable = ( const BYTE * * ) tableBase ; hashTable [ h ] = p ; return ; }
2014-11-22 23:46:15 +00:00
case byU32 : { U32 * hashTable = ( U32 * ) tableBase ; hashTable [ h ] = ( U32 ) ( p - srcBase ) ; return ; }
case byU16 : { U16 * hashTable = ( U16 * ) tableBase ; hashTable [ h ] = ( U16 ) ( p - srcBase ) ; return ; }
2013-12-30 17:16:52 +00:00
}
}
2017-08-24 14:14:20 +00:00
LZ4_FORCE_INLINE void LZ4_putPosition ( const BYTE * p , void * tableBase , tableType_t tableType , const BYTE * srcBase )
2013-12-30 17:16:52 +00:00
{
2016-06-29 10:54:23 +00:00
U32 const h = LZ4_hashPosition ( p , tableType ) ;
2013-12-30 17:16:52 +00:00
LZ4_putPositionOnHash ( p , h , tableBase , tableType , srcBase ) ;
}
2018-04-05 19:40:33 +00:00
/* LZ4_getIndexOnHash() :
* Index of match position registered in hash table .
* hash position must be calculated by using base + index , or dictBase + index .
* Assumption 1 : only valid if tableType = = byU32 or byU16 .
* Assumption 2 : h is presumed valid ( within limits of hash table )
*/
static U32 LZ4_getIndexOnHash ( U32 h , const void * tableBase , tableType_t tableType )
{
LZ4_STATIC_ASSERT ( LZ4_MEMORY_USAGE > 2 ) ;
2018-04-18 23:49:27 +00:00
if ( tableType = = byU32 ) {
const U32 * const hashTable = ( const U32 * ) tableBase ;
assert ( h < ( 1U < < ( LZ4_MEMORY_USAGE - 2 ) ) ) ;
return hashTable [ h ] ;
}
if ( tableType = = byU16 ) {
const U16 * const hashTable = ( const U16 * ) tableBase ;
assert ( h < ( 1U < < ( LZ4_MEMORY_USAGE - 1 ) ) ) ;
return hashTable [ h ] ;
}
2018-04-05 19:40:33 +00:00
assert ( 0 ) ; return 0 ; /* forbidden case */
}
2018-02-02 16:45:59 +00:00
static const BYTE * LZ4_getPositionOnHash ( U32 h , const void * tableBase , tableType_t tableType , const BYTE * srcBase )
2013-12-30 17:16:52 +00:00
{
2018-02-02 16:45:59 +00:00
if ( tableType = = byPtr ) { const BYTE * const * hashTable = ( const BYTE * const * ) tableBase ; return hashTable [ h ] ; }
if ( tableType = = byU32 ) { const U32 * const hashTable = ( const U32 * ) tableBase ; return hashTable [ h ] + srcBase ; }
{ const U16 * const hashTable = ( const U16 * ) tableBase ; return hashTable [ h ] + srcBase ; } /* default, to ensure a return */
2013-12-30 17:16:52 +00:00
}
2018-04-18 23:49:27 +00:00
LZ4_FORCE_INLINE const BYTE * LZ4_getPosition ( const BYTE * p ,
const void * tableBase , tableType_t tableType ,
const BYTE * srcBase )
2013-12-30 17:16:52 +00:00
{
2016-06-29 10:54:23 +00:00
U32 const h = LZ4_hashPosition ( p , tableType ) ;
2013-12-30 17:16:52 +00:00
return LZ4_getPositionOnHash ( h , tableBase , tableType , srcBase ) ;
}
2018-03-12 22:13:24 +00:00
LZ4_FORCE_INLINE void LZ4_prepareTable (
2018-01-29 22:09:52 +00:00
LZ4_stream_t_internal * const cctx ,
const int inputSize ,
2018-04-10 17:12:30 +00:00
const tableType_t tableType ) {
2018-03-12 22:46:54 +00:00
/* If the table hasn't been used, it's guaranteed to be zeroed out, and is
* therefore safe to use no matter what mode we ' re in . Otherwise , we figure
* out if it ' s safe to leave as is or whether it needs to be reset .
*/
2018-03-13 19:07:19 +00:00
if ( cctx - > tableType ! = clearedTable ) {
2018-03-12 22:46:54 +00:00
if ( cctx - > tableType ! = tableType
| | ( tableType = = byU16 & & cctx - > currentOffset + inputSize > = 0xFFFFU )
| | ( tableType = = byU32 & & cctx - > currentOffset > 1 GB )
| | tableType = = byPtr
| | inputSize > = 4 KB )
{
2018-04-17 00:15:02 +00:00
DEBUGLOG ( 4 , " LZ4_prepareTable: Resetting table in %p " , cctx ) ;
2018-03-12 22:46:54 +00:00
MEM_INIT ( cctx - > hashTable , 0 , LZ4_HASHTABLESIZE ) ;
cctx - > currentOffset = 0 ;
2018-03-13 19:07:19 +00:00
cctx - > tableType = clearedTable ;
2018-04-06 02:05:49 +00:00
} else {
2018-04-17 00:15:02 +00:00
DEBUGLOG ( 4 , " LZ4_prepareTable: Re-use hash table (no reset) " ) ;
2018-03-12 22:46:54 +00:00
}
}
2018-04-10 17:12:30 +00:00
/* Adding a gap, so all previous entries are > MAX_DISTANCE back, is faster
* than compressing without a gap . However , compressing with
* currentOffset = = 0 is faster still , so we preserve that case .
2018-03-12 22:46:54 +00:00
*/
2018-04-10 17:12:30 +00:00
if ( cctx - > currentOffset ! = 0 & & tableType = = byU32 ) {
2018-04-17 06:59:42 +00:00
DEBUGLOG ( 5 , " LZ4_prepareTable: adding 64KB to currentOffset " ) ;
2018-04-06 20:52:29 +00:00
cctx - > currentOffset + = 64 KB ;
2018-03-12 22:46:54 +00:00
}
2018-04-10 17:12:30 +00:00
/* Finally, clear history */
cctx - > dictCtx = NULL ;
cctx - > dictionary = NULL ;
cctx - > dictSize = 0 ;
2018-01-29 22:09:52 +00:00
}
2016-06-29 10:54:23 +00:00
/** LZ4_compress_generic() :
inlined , to ensure branches are decided at compilation time */
2017-08-24 14:14:20 +00:00
LZ4_FORCE_INLINE int LZ4_compress_generic (
2016-11-19 01:05:06 +00:00
LZ4_stream_t_internal * const cctx ,
2015-03-30 20:32:25 +00:00
const char * const source ,
char * const dest ,
const int inputSize ,
2018-04-26 19:42:16 +00:00
int * inputConsumed , /* only written when outputLimited == fillOutput */
2015-03-30 20:32:25 +00:00
const int maxOutputSize ,
const limitedOutput_directive outputLimited ,
const tableType_t tableType ,
2018-02-12 17:18:24 +00:00
const dict_directive dictDirective ,
2015-03-30 20:32:25 +00:00
const dictIssue_directive dictIssue ,
const U32 acceleration )
2013-12-30 17:16:52 +00:00
{
const BYTE * ip = ( const BYTE * ) source ;
2018-02-12 17:09:38 +00:00
2018-04-06 00:16:33 +00:00
U32 const startIndex = cctx - > currentOffset ;
2018-04-05 23:38:43 +00:00
const BYTE * base = ( const BYTE * ) source - startIndex ;
2014-05-27 01:41:29 +00:00
const BYTE * lowLimit ;
2018-02-12 17:18:24 +00:00
const LZ4_stream_t_internal * dictCtx = ( const LZ4_stream_t_internal * ) cctx - > dictCtx ;
const BYTE * const dictionary =
2018-03-13 19:07:19 +00:00
dictDirective = = usingDictCtx ? dictCtx - > dictionary : cctx - > dictionary ;
2018-02-12 17:18:24 +00:00
const U32 dictSize =
2018-03-13 19:07:19 +00:00
dictDirective = = usingDictCtx ? dictCtx - > dictSize : cctx - > dictSize ;
2018-04-17 23:18:37 +00:00
const U32 dictDelta = ( dictDirective = = usingDictCtx ) ? startIndex - dictCtx - > currentOffset : 0 ; /* make indexes in dictCtx comparable with index in current context */
2018-02-12 17:18:24 +00:00
2018-04-17 06:59:42 +00:00
int const maybe_extMem = ( dictDirective = = usingExtDict ) | | ( dictDirective = = usingDictCtx ) ;
2018-04-05 23:38:43 +00:00
U32 const prefixIdxLimit = startIndex - dictSize ; /* used when dictDirective == dictSmall */
2018-02-12 17:18:24 +00:00
const BYTE * const dictEnd = dictionary + dictSize ;
2013-12-30 17:16:52 +00:00
const BYTE * anchor = ( const BYTE * ) source ;
const BYTE * const iend = ip + inputSize ;
edge case : compress up to end-mflimit (12 bytes)
The LZ4 block format specification
states that the last match must start
at a minimum distance of 12 bytes from the end of the block.
However, out of an abundance of caution,
the reference implementation would actually stop searching matches
at 13 bytes from the end of the block.
This patch fixes this small detail.
The new version is now able to properly compress a limit case
such as `aaaaaaaabaaa\n`
as reported by Gao Xiang (@hsiangkao).
Obviously, it doesn't change a lot of things.
This is just one additional match candidate per block, with a maximum match length of 7 (since last 5 bytes must remain literals).
With default policy, blocks are 4 MB long, so it doesn't happen too often
Compressing silesia.tar at default level 1 saves 5 bytes (100930101 -> 100930096).
At max level 12, it saves a grand 16 bytes (77389871 -> 77389855).
The impact is a bit more visible when blocks are smaller, hence more numerous.
For example, compressing silesia with blocks of 64 KB (using -12 -B4D) saves 543 bytes (77304583 -> 77304040).
So the smaller the packet size, the more visible the impact.
And it happens we have a ton of scenarios with little blocks using LZ4 compression ...
And a useless "hooray" sidenote :
the patch improves the LZ4 compression record of silesia (using -12 -B7D --no-frame-crc) by 16 bytes (77270672 -> 77270656)
and the record on enwik9 by 44 bytes (371680396 -> 371680352) (previously claimed by [smallz4](http://create.stephan-brumme.com/smallz4/) ).
2018-02-24 19:47:53 +00:00
const BYTE * const mflimitPlusOne = iend - MFLIMIT + 1 ;
2013-12-30 17:16:52 +00:00
const BYTE * const matchlimit = iend - LASTLITERALS ;
2018-02-12 17:18:24 +00:00
/* the dictCtx currentOffset is indexed on the start of the dictionary,
* while a dictionary in the current context precedes the currentOffset */
2018-03-13 19:07:19 +00:00
const BYTE * dictBase = dictDirective = = usingDictCtx ?
2018-04-18 23:49:27 +00:00
dictionary + dictSize - dictCtx - > currentOffset :
2018-04-06 00:16:33 +00:00
dictionary + dictSize - startIndex ;
2018-02-12 17:18:24 +00:00
2013-12-30 17:16:52 +00:00
BYTE * op = ( BYTE * ) dest ;
2014-06-09 17:08:23 +00:00
BYTE * const olimit = op + maxOutputSize ;
2013-12-30 17:16:52 +00:00
2018-04-05 23:38:43 +00:00
U32 offset = 0 ;
2013-12-30 17:16:52 +00:00
U32 forwardH ;
2018-04-17 06:59:42 +00:00
DEBUGLOG ( 5 , " LZ4_compress_generic: srcSize=%i, tableType=%u " , inputSize , tableType ) ;
2014-02-04 14:11:10 +00:00
/* Init conditions */
2018-04-26 19:42:16 +00:00
if ( outputLimited = = fillOutput & & maxOutputSize < 1 ) return 0 ; /* Impossible to store anything */
2016-06-29 11:21:23 +00:00
if ( ( U32 ) inputSize > ( U32 ) LZ4_MAX_INPUT_SIZE ) return 0 ; /* Unsupported inputSize, too large (or negative) */
2018-04-05 23:38:43 +00:00
if ( tableType = = byPtr ) assert ( dictDirective = = noDict ) ; /* only supported use case with byPtr */
2018-04-16 22:11:28 +00:00
assert ( acceleration > = 1 ) ;
2018-01-30 20:22:29 +00:00
2018-03-08 17:30:34 +00:00
lowLimit = ( const BYTE * ) source - ( dictDirective = = withPrefix64k ? dictSize : 0 ) ;
2018-01-30 20:22:29 +00:00
2018-04-18 23:49:27 +00:00
if ( ( tableType = = byU16 ) & & ( inputSize > = LZ4_64Klimit ) ) return 0 ; /* Size too large (not within 64K limit) */
2018-04-06 22:52:55 +00:00
/* Update context state */
if ( dictDirective = = usingDictCtx ) {
/* Subsequent linked blocks can't use the dictionary. */
/* Instead, they use the block we just compressed. */
cctx - > dictCtx = NULL ;
cctx - > dictSize = ( U32 ) inputSize ;
} else {
cctx - > dictSize + = ( U32 ) inputSize ;
}
cctx - > currentOffset + = ( U32 ) inputSize ;
cctx - > tableType = tableType ;
2018-04-18 23:49:27 +00:00
if ( inputSize < LZ4_minLength ) goto _last_literals ; /* Input too small, no compression (all literals) */
2013-12-30 17:16:52 +00:00
2014-02-04 14:11:10 +00:00
/* First Byte */
2016-11-19 01:05:06 +00:00
LZ4_putPosition ( ip , cctx - > hashTable , tableType , base ) ;
2013-12-30 17:16:52 +00:00
ip + + ; forwardH = LZ4_hashPosition ( ip , tableType ) ;
2014-02-04 14:11:10 +00:00
/* Main Loop */
2016-06-29 10:54:23 +00:00
for ( ; ; ) {
2014-12-02 22:57:15 +00:00
const BYTE * match ;
2013-12-30 17:16:52 +00:00
BYTE * token ;
2016-06-29 10:54:23 +00:00
/* Find a match */
2018-04-05 19:40:33 +00:00
if ( tableType = = byPtr ) {
const BYTE * forwardIp = ip ;
2015-04-01 13:48:24 +00:00
unsigned step = 1 ;
unsigned searchMatchNb = acceleration < < LZ4_skipTrigger ;
2014-06-10 05:10:08 +00:00
do {
2016-06-29 10:54:23 +00:00
U32 const h = forwardH ;
2014-06-10 05:10:08 +00:00
ip = forwardIp ;
forwardIp + = step ;
2015-03-30 20:32:25 +00:00
step = ( searchMatchNb + + > > LZ4_skipTrigger ) ;
2013-12-30 17:16:52 +00:00
edge case : compress up to end-mflimit (12 bytes)
The LZ4 block format specification
states that the last match must start
at a minimum distance of 12 bytes from the end of the block.
However, out of an abundance of caution,
the reference implementation would actually stop searching matches
at 13 bytes from the end of the block.
This patch fixes this small detail.
The new version is now able to properly compress a limit case
such as `aaaaaaaabaaa\n`
as reported by Gao Xiang (@hsiangkao).
Obviously, it doesn't change a lot of things.
This is just one additional match candidate per block, with a maximum match length of 7 (since last 5 bytes must remain literals).
With default policy, blocks are 4 MB long, so it doesn't happen too often
Compressing silesia.tar at default level 1 saves 5 bytes (100930101 -> 100930096).
At max level 12, it saves a grand 16 bytes (77389871 -> 77389855).
The impact is a bit more visible when blocks are smaller, hence more numerous.
For example, compressing silesia with blocks of 64 KB (using -12 -B4D) saves 543 bytes (77304583 -> 77304040).
So the smaller the packet size, the more visible the impact.
And it happens we have a ton of scenarios with little blocks using LZ4 compression ...
And a useless "hooray" sidenote :
the patch improves the LZ4 compression record of silesia (using -12 -B7D --no-frame-crc) by 16 bytes (77270672 -> 77270656)
and the record on enwik9 by 44 bytes (371680396 -> 371680352) (previously claimed by [smallz4](http://create.stephan-brumme.com/smallz4/) ).
2018-02-24 19:47:53 +00:00
if ( unlikely ( forwardIp > mflimitPlusOne ) ) goto _last_literals ;
assert ( ip < mflimitPlusOne ) ;
2014-06-10 05:10:08 +00:00
2016-11-19 01:05:06 +00:00
match = LZ4_getPositionOnHash ( h , cctx - > hashTable , tableType , base ) ;
2014-06-10 05:10:08 +00:00
forwardH = LZ4_hashPosition ( forwardIp , tableType ) ;
2016-11-19 01:05:06 +00:00
LZ4_putPositionOnHash ( ip , h , cctx - > hashTable , tableType , base ) ;
2013-12-30 17:16:52 +00:00
2018-04-06 00:52:54 +00:00
} while ( ( match + MAX_DISTANCE < ip )
| | ( LZ4_read32 ( match ) ! = LZ4_read32 ( ip ) ) ) ;
2018-04-05 19:40:33 +00:00
} else { /* byU32, byU16 */
const BYTE * forwardIp = ip ;
2018-04-16 22:11:28 +00:00
unsigned step = 1 ;
2018-04-05 19:40:33 +00:00
unsigned searchMatchNb = acceleration < < LZ4_skipTrigger ;
do {
U32 const h = forwardH ;
2018-04-10 00:08:17 +00:00
U32 const current = ( U32 ) ( forwardIp - base ) ;
2018-04-05 23:38:43 +00:00
U32 matchIndex = LZ4_getIndexOnHash ( h , cctx - > hashTable , tableType ) ;
assert ( matchIndex < = current ) ;
2018-04-10 00:08:17 +00:00
assert ( forwardIp - base < ( ptrdiff_t ) ( 2 GB - 1 ) ) ;
2018-04-05 19:40:33 +00:00
ip = forwardIp ;
2018-04-16 22:11:28 +00:00
forwardIp + = step ;
step = ( searchMatchNb + + > > LZ4_skipTrigger ) ;
2018-04-05 19:40:33 +00:00
if ( unlikely ( forwardIp > mflimitPlusOne ) ) goto _last_literals ;
assert ( ip < mflimitPlusOne ) ;
if ( dictDirective = = usingDictCtx ) {
2018-04-05 23:38:43 +00:00
if ( matchIndex < startIndex ) {
2018-04-05 19:40:33 +00:00
/* there was no match, try the dictionary */
2018-04-17 06:59:42 +00:00
assert ( tableType = = byU32 ) ;
2018-04-05 23:38:43 +00:00
matchIndex = LZ4_getIndexOnHash ( h , dictCtx - > hashTable , byU32 ) ;
match = dictBase + matchIndex ;
2018-04-17 06:59:42 +00:00
matchIndex + = dictDelta ; /* make dictCtx index comparable with current context */
2018-04-12 23:12:21 +00:00
lowLimit = dictionary ;
2018-04-05 19:40:33 +00:00
} else {
match = base + matchIndex ;
lowLimit = ( const BYTE * ) source ;
}
} else if ( dictDirective = = usingExtDict ) {
2018-04-05 23:38:43 +00:00
if ( matchIndex < startIndex ) {
2018-04-12 23:12:21 +00:00
DEBUGLOG ( 7 , " extDict candidate: matchIndex=%5u < startIndex=%5u " , matchIndex , startIndex ) ;
2018-04-05 19:40:33 +00:00
match = dictBase + matchIndex ;
2018-04-12 23:12:21 +00:00
lowLimit = dictionary ;
2018-04-05 19:40:33 +00:00
} else {
match = base + matchIndex ;
lowLimit = ( const BYTE * ) source ;
}
} else { /* single continuous memory segment */
match = base + matchIndex ;
}
forwardH = LZ4_hashPosition ( forwardIp , tableType ) ;
2018-04-05 23:38:43 +00:00
LZ4_putIndexOnHash ( current , h , cctx - > hashTable , tableType ) ;
2018-04-21 07:11:51 +00:00
if ( ( dictIssue = = dictSmall ) & & ( matchIndex < prefixIdxLimit ) ) continue ; /* match outside of valid area */
2018-04-21 01:09:51 +00:00
assert ( matchIndex < current ) ;
2018-04-21 07:11:51 +00:00
if ( ( tableType ! = byU16 ) & & ( matchIndex + MAX_DISTANCE < current ) ) continue ; /* too far */
if ( tableType = = byU16 ) assert ( ( current - matchIndex ) < = MAX_DISTANCE ) ; /* too_far presumed impossible with byU16 */
2018-04-05 23:38:43 +00:00
if ( LZ4_read32 ( match ) = = LZ4_read32 ( ip ) ) {
2018-04-17 06:59:42 +00:00
if ( maybe_extMem ) offset = current - matchIndex ;
2018-04-05 23:38:43 +00:00
break ; /* match found */
}
2018-04-05 19:40:33 +00:00
2018-04-05 23:38:43 +00:00
} while ( 1 ) ;
2014-06-10 05:10:08 +00:00
}
2013-12-30 17:16:52 +00:00
2014-02-04 14:11:10 +00:00
/* Catch up */
2018-04-05 23:38:43 +00:00
while ( ( ( ip > anchor ) & ( match > lowLimit ) ) & & ( unlikely ( ip [ - 1 ] = = match [ - 1 ] ) ) ) { ip - - ; match - - ; }
2013-12-30 17:16:52 +00:00
2016-06-29 10:54:23 +00:00
/* Encode Literals */
{ unsigned const litLength = ( unsigned ) ( ip - anchor ) ;
2014-05-19 23:40:29 +00:00
token = op + + ;
2018-04-26 19:42:16 +00:00
if ( ( outputLimited = = limitedOutput ) & & /* Check output buffer overflow */
2016-06-29 11:21:23 +00:00
( unlikely ( op + litLength + ( 2 + 1 + LASTLITERALS ) + ( litLength / 255 ) > olimit ) ) )
2018-04-06 22:52:55 +00:00
return 0 ;
2018-04-26 19:42:16 +00:00
if ( ( outputLimited = = fillOutput ) & &
( unlikely ( op + ( litLength + 240 ) / 255 /* litlen */ + litLength /* literals */ + 2 /* offset */ + 1 /* token */ + MFLIMIT - MINMATCH /* min last literals so last match is <= end - MFLIMIT */ > olimit ) ) ) {
op - - ;
goto _last_literals ;
}
2016-06-29 11:21:23 +00:00
if ( litLength > = RUN_MASK ) {
2014-05-19 23:40:29 +00:00
int len = ( int ) litLength - RUN_MASK ;
2016-06-29 11:21:23 +00:00
* token = ( RUN_MASK < < ML_BITS ) ;
2014-05-19 23:40:29 +00:00
for ( ; len > = 255 ; len - = 255 ) * op + + = 255 ;
* op + + = ( BYTE ) len ;
}
else * token = ( BYTE ) ( litLength < < ML_BITS ) ;
/* Copy Literals */
2014-11-27 21:44:36 +00:00
LZ4_wildCopy ( op , anchor , op + litLength ) ;
op + = litLength ;
2018-04-18 23:49:27 +00:00
DEBUGLOG ( 6 , " seq.start:%i, literals=%u, match.start:%i " ,
( int ) ( anchor - ( const BYTE * ) source ) , litLength , ( int ) ( ip - ( const BYTE * ) source ) ) ;
2014-05-19 23:40:29 +00:00
}
2013-12-30 17:16:52 +00:00
_next_match :
2018-04-13 09:26:14 +00:00
/* at this stage, the following variables must be correctly set :
* - ip : at start of LZ operation
* - match : at start of previous pattern occurence ; can be within current prefix , or within extDict
* - offset : if maybe_ext_memSegment = = 1 ( constant )
* - lowLimit : must be = = dictionary to mean " match is within extDict " ; must be = = source otherwise
* - token and * token : position to write 4 - bits for match length ; higher 4 - bits for literal length supposed already written
*/
2018-04-26 19:42:16 +00:00
if ( ( outputLimited = = fillOutput ) & &
( op + 2 /* offset */ + 1 /* token */ + MFLIMIT - MINMATCH /* min last literals so last match is <= end - MFLIMIT */ > olimit ) ) {
/* the match was too close to the end, rewind and go to last literals */
op = token ;
goto _last_literals ;
}
2014-02-04 14:11:10 +00:00
/* Encode Offset */
2018-04-17 06:59:42 +00:00
if ( maybe_extMem ) { /* static test */
2018-04-17 00:15:02 +00:00
DEBUGLOG ( 6 , " with offset=%u (ext if > %i) " , offset , ( int ) ( ip - ( const BYTE * ) source ) ) ;
2018-04-05 23:38:43 +00:00
assert ( offset < = MAX_DISTANCE & & offset > 0 ) ;
LZ4_writeLE16 ( op , ( U16 ) offset ) ; op + = 2 ;
} else {
2018-04-17 00:15:02 +00:00
DEBUGLOG ( 6 , " with offset=%u (same segment) " , ( U32 ) ( ip - match ) ) ;
2018-04-05 23:38:43 +00:00
assert ( ip - match < = MAX_DISTANCE ) ;
LZ4_writeLE16 ( op , ( U16 ) ( ip - match ) ) ; op + = 2 ;
}
2013-12-30 17:16:52 +00:00
2014-02-04 14:11:10 +00:00
/* Encode MatchLength */
2016-06-29 10:54:23 +00:00
{ unsigned matchCode ;
2014-05-27 01:41:29 +00:00
2018-04-05 19:40:33 +00:00
if ( ( dictDirective = = usingExtDict | | dictDirective = = usingDictCtx )
2018-04-12 23:12:21 +00:00
& & ( lowLimit = = dictionary ) /* match within extDict */ ) {
const BYTE * limit = ip + ( dictEnd - match ) ;
assert ( dictEnd > match ) ;
2014-05-27 01:41:29 +00:00
if ( limit > matchlimit ) limit = matchlimit ;
2016-06-29 10:54:23 +00:00
matchCode = LZ4_count ( ip + MINMATCH , match + MINMATCH , limit ) ;
ip + = MINMATCH + matchCode ;
if ( ip = = limit ) {
2018-04-12 23:12:21 +00:00
unsigned const more = LZ4_count ( limit , ( const BYTE * ) source , matchlimit ) ;
2016-06-29 10:54:23 +00:00
matchCode + = more ;
2014-05-27 01:41:29 +00:00
ip + = more ;
}
2018-04-17 00:15:02 +00:00
DEBUGLOG ( 6 , " with matchLength=%u starting in extDict " , matchCode + MINMATCH ) ;
2016-06-29 10:54:23 +00:00
} else {
matchCode = LZ4_count ( ip + MINMATCH , match + MINMATCH , matchlimit ) ;
ip + = MINMATCH + matchCode ;
2018-04-17 00:15:02 +00:00
DEBUGLOG ( 6 , " with matchLength=%u " , matchCode + MINMATCH ) ;
2014-05-27 01:41:29 +00:00
}
2018-04-26 19:42:16 +00:00
if ( ( outputLimited ) & & /* Check output buffer overflow */
( unlikely ( op + ( 1 + LASTLITERALS ) + ( matchCode > > 8 ) > olimit ) ) ) {
if ( outputLimited = = limitedOutput )
return 0 ;
if ( outputLimited = = fillOutput ) {
/* Match description too long : reduce it */
U32 newMatchCode = 15 /* in token */ - 1 /* to avoid needing a zero byte */ + ( ( U32 ) ( olimit - op ) - 2 - 1 - LASTLITERALS ) * 255 ;
ip - = matchCode - newMatchCode ;
matchCode = newMatchCode ;
}
}
2016-06-29 11:21:23 +00:00
if ( matchCode > = ML_MASK ) {
2014-05-19 23:40:29 +00:00
* token + = ML_MASK ;
2016-06-29 10:54:23 +00:00
matchCode - = ML_MASK ;
2016-06-29 15:02:09 +00:00
LZ4_write32 ( op , 0xFFFFFFFF ) ;
2017-09-10 21:32:38 +00:00
while ( matchCode > = 4 * 255 ) {
op + = 4 ;
LZ4_write32 ( op , 0xFFFFFFFF ) ;
matchCode - = 4 * 255 ;
}
2016-06-29 11:43:11 +00:00
op + = matchCode / 255 ;
* op + + = ( BYTE ) ( matchCode % 255 ) ;
2016-06-29 10:54:23 +00:00
} else
* token + = ( BYTE ) ( matchCode ) ;
2013-12-30 17:16:52 +00:00
}
2014-05-19 23:40:29 +00:00
anchor = ip ;
2013-12-30 17:16:52 +00:00
2014-02-04 14:11:10 +00:00
/* Test end of chunk */
edge case : compress up to end-mflimit (12 bytes)
The LZ4 block format specification
states that the last match must start
at a minimum distance of 12 bytes from the end of the block.
However, out of an abundance of caution,
the reference implementation would actually stop searching matches
at 13 bytes from the end of the block.
This patch fixes this small detail.
The new version is now able to properly compress a limit case
such as `aaaaaaaabaaa\n`
as reported by Gao Xiang (@hsiangkao).
Obviously, it doesn't change a lot of things.
This is just one additional match candidate per block, with a maximum match length of 7 (since last 5 bytes must remain literals).
With default policy, blocks are 4 MB long, so it doesn't happen too often
Compressing silesia.tar at default level 1 saves 5 bytes (100930101 -> 100930096).
At max level 12, it saves a grand 16 bytes (77389871 -> 77389855).
The impact is a bit more visible when blocks are smaller, hence more numerous.
For example, compressing silesia with blocks of 64 KB (using -12 -B4D) saves 543 bytes (77304583 -> 77304040).
So the smaller the packet size, the more visible the impact.
And it happens we have a ton of scenarios with little blocks using LZ4 compression ...
And a useless "hooray" sidenote :
the patch improves the LZ4 compression record of silesia (using -12 -B7D --no-frame-crc) by 16 bytes (77270672 -> 77270656)
and the record on enwik9 by 44 bytes (371680396 -> 371680352) (previously claimed by [smallz4](http://create.stephan-brumme.com/smallz4/) ).
2018-02-24 19:47:53 +00:00
if ( ip > = mflimitPlusOne ) break ;
2013-12-30 17:16:52 +00:00
2014-02-04 14:11:10 +00:00
/* Fill table */
2016-11-19 01:05:06 +00:00
LZ4_putPosition ( ip - 2 , cctx - > hashTable , tableType , base ) ;
2013-12-30 17:16:52 +00:00
2014-02-04 14:11:10 +00:00
/* Test next position */
2018-04-05 23:38:43 +00:00
if ( tableType = = byPtr ) {
match = LZ4_getPosition ( ip , cctx - > hashTable , tableType , base ) ;
LZ4_putPosition ( ip , cctx - > hashTable , tableType , base ) ;
if ( ( match + MAX_DISTANCE > = ip )
& & ( LZ4_read32 ( match ) = = LZ4_read32 ( ip ) ) )
{ token = op + + ; * token = 0 ; goto _next_match ; }
} else { /* byU32, byU16 */
U32 const h = LZ4_hashPosition ( ip , tableType ) ;
U32 const current = ( U32 ) ( ip - base ) ;
U32 matchIndex = LZ4_getIndexOnHash ( h , cctx - > hashTable , tableType ) ;
assert ( matchIndex < current ) ;
if ( dictDirective = = usingDictCtx ) {
2018-04-06 00:16:33 +00:00
if ( matchIndex < startIndex ) {
2018-04-05 23:38:43 +00:00
/* there was no match, try the dictionary */
matchIndex = LZ4_getIndexOnHash ( h , dictCtx - > hashTable , byU32 ) ;
match = dictBase + matchIndex ;
2018-04-12 23:12:21 +00:00
lowLimit = dictionary ; /* required for match length counter */
2018-04-17 06:59:42 +00:00
matchIndex + = dictDelta ;
2018-04-05 23:38:43 +00:00
} else {
match = base + matchIndex ;
2018-04-12 23:12:21 +00:00
lowLimit = ( const BYTE * ) source ; /* required for match length counter */
2018-04-05 23:38:43 +00:00
}
} else if ( dictDirective = = usingExtDict ) {
2018-04-06 00:16:33 +00:00
if ( matchIndex < startIndex ) {
2018-04-05 23:38:43 +00:00
match = dictBase + matchIndex ;
2018-04-12 23:12:21 +00:00
lowLimit = dictionary ; /* required for match length counter */
2018-04-05 23:38:43 +00:00
} else {
match = base + matchIndex ;
2018-04-12 23:12:21 +00:00
lowLimit = ( const BYTE * ) source ; /* required for match length counter */
2018-04-05 23:38:43 +00:00
}
} else { /* single memory segment */
match = base + matchIndex ;
2018-02-12 17:18:24 +00:00
}
2018-04-05 23:38:43 +00:00
LZ4_putIndexOnHash ( current , h , cctx - > hashTable , tableType ) ;
2018-04-21 01:09:51 +00:00
assert ( matchIndex < current ) ;
2018-04-05 23:38:43 +00:00
if ( ( ( dictIssue = = dictSmall ) ? ( matchIndex > = prefixIdxLimit ) : 1 )
2018-04-21 01:09:51 +00:00
& & ( ( tableType = = byU16 ) ? 1 : ( matchIndex + MAX_DISTANCE > = current ) )
2018-04-05 23:38:43 +00:00
& & ( LZ4_read32 ( match ) = = LZ4_read32 ( ip ) ) ) {
token = op + + ;
* token = 0 ;
2018-04-17 06:59:42 +00:00
if ( maybe_extMem ) offset = current - matchIndex ;
2018-04-18 23:49:27 +00:00
DEBUGLOG ( 6 , " seq.start:%i, literals=%u, match.start:%i " ,
( int ) ( anchor - ( const BYTE * ) source ) , 0 , ( int ) ( ip - ( const BYTE * ) source ) ) ;
2018-04-05 23:38:43 +00:00
goto _next_match ;
}
}
2013-12-30 17:16:52 +00:00
2014-02-04 14:11:10 +00:00
/* Prepare next loop */
2014-05-19 23:40:29 +00:00
forwardH = LZ4_hashPosition ( + + ip , tableType ) ;
2018-04-05 23:38:43 +00:00
2013-12-30 17:16:52 +00:00
}
_last_literals :
2014-02-04 14:11:10 +00:00
/* Encode Last Literals */
2018-04-26 19:42:16 +00:00
{ size_t lastRun = ( size_t ) ( iend - anchor ) ;
2016-06-29 10:54:23 +00:00
if ( ( outputLimited ) & & /* Check output buffer overflow */
2018-04-26 19:42:16 +00:00
( op + lastRun + 1 + ( ( lastRun + 255 - RUN_MASK ) / 255 ) > olimit ) ) {
if ( outputLimited = = fillOutput ) {
/* adapt lastRun to fill 'dst' */
lastRun = ( olimit - op ) - 1 ;
lastRun - = ( lastRun + 240 ) / 255 ;
}
if ( outputLimited = = limitedOutput )
return 0 ;
}
2016-06-29 10:54:23 +00:00
if ( lastRun > = RUN_MASK ) {
2015-04-01 13:48:24 +00:00
size_t accumulator = lastRun - RUN_MASK ;
* op + + = RUN_MASK < < ML_BITS ;
for ( ; accumulator > = 255 ; accumulator - = 255 ) * op + + = 255 ;
* op + + = ( BYTE ) accumulator ;
2016-06-29 10:54:23 +00:00
} else {
2015-04-01 13:48:24 +00:00
* op + + = ( BYTE ) ( lastRun < < ML_BITS ) ;
}
memcpy ( op , anchor , lastRun ) ;
2018-04-26 19:42:16 +00:00
ip = anchor + lastRun ;
2015-04-01 13:48:24 +00:00
op + = lastRun ;
2013-12-30 17:16:52 +00:00
}
2018-04-26 19:42:16 +00:00
if ( outputLimited = = fillOutput ) {
* inputConsumed = ( int ) ( ( ( const char * ) ip ) - source ) ;
}
2018-04-06 22:52:55 +00:00
return ( int ) ( ( ( char * ) op ) - dest ) ;
2013-12-30 17:16:52 +00:00
}
2015-05-03 17:06:01 +00:00
int LZ4_compress_fast_extState ( void * state , const char * source , char * dest , int inputSize , int maxOutputSize , int acceleration )
2018-02-02 16:41:11 +00:00
{
2018-03-09 17:14:42 +00:00
LZ4_stream_t_internal * ctx = & ( ( LZ4_stream_t * ) state ) - > internal_donotuse ;
if ( acceleration < 1 ) acceleration = ACCELERATION_DEFAULT ;
LZ4_resetStream ( ( LZ4_stream_t * ) state ) ;
if ( maxOutputSize > = LZ4_compressBound ( inputSize ) ) {
if ( inputSize < LZ4_64Klimit ) {
2018-04-26 19:42:16 +00:00
return LZ4_compress_generic ( ctx , source , dest , inputSize , NULL , 0 , notLimited , byU16 , noDict , noDictIssue , acceleration ) ;
2018-03-09 17:14:42 +00:00
} else {
2018-04-06 01:29:42 +00:00
const tableType_t tableType = ( ( sizeof ( void * ) = = 4 ) & & ( ( uptrval ) source > MAX_DISTANCE ) ) ? byPtr : byU32 ;
2018-04-26 19:42:16 +00:00
return LZ4_compress_generic ( ctx , source , dest , inputSize , NULL , 0 , notLimited , tableType , noDict , noDictIssue , acceleration ) ;
2018-03-09 17:14:42 +00:00
}
} else {
if ( inputSize < LZ4_64Klimit ) { ;
2018-04-26 19:42:16 +00:00
return LZ4_compress_generic ( ctx , source , dest , inputSize , NULL , maxOutputSize , limitedOutput , byU16 , noDict , noDictIssue , acceleration ) ;
2018-03-09 17:14:42 +00:00
} else {
2018-04-06 01:29:42 +00:00
const tableType_t tableType = ( ( sizeof ( void * ) = = 4 ) & & ( ( uptrval ) source > MAX_DISTANCE ) ) ? byPtr : byU32 ;
2018-04-26 19:42:16 +00:00
return LZ4_compress_generic ( ctx , source , dest , inputSize , NULL , maxOutputSize , limitedOutput , tableType , noDict , noDictIssue , acceleration ) ;
2018-03-09 17:14:42 +00:00
}
}
2018-02-02 16:41:11 +00:00
}
2018-03-12 22:13:24 +00:00
/**
2018-04-11 19:13:01 +00:00
* LZ4_compress_fast_extState_fastReset ( ) :
* A variant of LZ4_compress_fast_extState ( ) .
*
* Using this variant avoids an expensive initialization step . It is only safe
* to call if the state buffer is known to be correctly initialized already
* ( see comment in lz4 . h on LZ4_resetStream_fast ( ) for a definition of
* " correctly initialized " ) .
2018-03-12 22:13:24 +00:00
*/
2018-04-11 23:49:40 +00:00
int LZ4_compress_fast_extState_fastReset ( void * state , const char * src , char * dst , int srcSize , int dstCapacity , int acceleration )
2015-04-01 13:59:42 +00:00
{
2016-11-11 21:00:02 +00:00
LZ4_stream_t_internal * ctx = & ( ( LZ4_stream_t * ) state ) - > internal_donotuse ;
2015-05-03 16:57:46 +00:00
if ( acceleration < 1 ) acceleration = ACCELERATION_DEFAULT ;
2015-04-01 13:59:42 +00:00
2018-04-06 01:29:42 +00:00
if ( dstCapacity > = LZ4_compressBound ( srcSize ) ) {
if ( srcSize < LZ4_64Klimit ) {
2018-01-29 22:09:52 +00:00
const tableType_t tableType = byU16 ;
2018-04-11 23:49:40 +00:00
LZ4_prepareTable ( ctx , srcSize , tableType ) ;
2018-02-17 01:33:51 +00:00
if ( ctx - > currentOffset ) {
2018-04-26 19:42:16 +00:00
return LZ4_compress_generic ( ctx , src , dst , srcSize , NULL , 0 , notLimited , tableType , noDict , dictSmall , acceleration ) ;
2018-02-17 01:33:51 +00:00
} else {
2018-04-26 19:42:16 +00:00
return LZ4_compress_generic ( ctx , src , dst , srcSize , NULL , 0 , notLimited , tableType , noDict , noDictIssue , acceleration ) ;
2018-02-17 01:33:51 +00:00
}
2018-01-29 22:09:52 +00:00
} else {
2018-04-17 23:47:56 +00:00
const tableType_t tableType = ( ( sizeof ( void * ) = = 4 ) & & ( ( uptrval ) src > MAX_DISTANCE ) ) ? byPtr : byU32 ;
2018-04-11 23:49:40 +00:00
LZ4_prepareTable ( ctx , srcSize , tableType ) ;
2018-04-26 19:42:16 +00:00
return LZ4_compress_generic ( ctx , src , dst , srcSize , NULL , 0 , notLimited , tableType , noDict , noDictIssue , acceleration ) ;
2018-01-29 22:09:52 +00:00
}
2016-06-29 10:54:23 +00:00
} else {
2018-04-06 01:29:42 +00:00
if ( srcSize < LZ4_64Klimit ) {
2018-01-29 22:09:52 +00:00
const tableType_t tableType = byU16 ;
2018-04-11 23:49:40 +00:00
LZ4_prepareTable ( ctx , srcSize , tableType ) ;
2018-02-17 01:33:51 +00:00
if ( ctx - > currentOffset ) {
2018-04-26 19:42:16 +00:00
return LZ4_compress_generic ( ctx , src , dst , srcSize , NULL , dstCapacity , limitedOutput , tableType , noDict , dictSmall , acceleration ) ;
2018-02-17 01:33:51 +00:00
} else {
2018-04-26 19:42:16 +00:00
return LZ4_compress_generic ( ctx , src , dst , srcSize , NULL , dstCapacity , limitedOutput , tableType , noDict , noDictIssue , acceleration ) ;
2018-02-17 01:33:51 +00:00
}
2018-01-29 22:09:52 +00:00
} else {
2018-04-17 23:47:56 +00:00
const tableType_t tableType = ( ( sizeof ( void * ) = = 4 ) & & ( ( uptrval ) src > MAX_DISTANCE ) ) ? byPtr : byU32 ;
2018-04-11 23:49:40 +00:00
LZ4_prepareTable ( ctx , srcSize , tableType ) ;
2018-04-26 19:42:16 +00:00
return LZ4_compress_generic ( ctx , src , dst , srcSize , NULL , dstCapacity , limitedOutput , tableType , noDict , noDictIssue , acceleration ) ;
2018-01-29 22:09:52 +00:00
}
2015-04-01 13:59:42 +00:00
}
}
2015-05-03 16:57:46 +00:00
int LZ4_compress_fast ( const char * source , char * dest , int inputSize , int maxOutputSize , int acceleration )
2013-12-30 17:16:52 +00:00
{
2018-02-12 17:09:38 +00:00
int result ;
2017-05-02 05:32:21 +00:00
# if (LZ4_HEAPMODE)
2018-01-26 22:29:50 +00:00
LZ4_stream_t * ctxPtr = ALLOC ( sizeof ( LZ4_stream_t ) ) ; /* malloc-calloc always properly aligned */
2018-03-12 22:32:24 +00:00
if ( ctxPtr = = NULL ) return 0 ;
2013-12-30 17:16:52 +00:00
# else
2015-05-03 16:57:46 +00:00
LZ4_stream_t ctx ;
2018-02-12 17:09:38 +00:00
LZ4_stream_t * const ctxPtr = & ctx ;
2013-12-30 17:16:52 +00:00
# endif
2018-03-09 17:14:42 +00:00
result = LZ4_compress_fast_extState ( ctxPtr , source , dest , inputSize , maxOutputSize , acceleration ) ;
2015-04-01 14:53:08 +00:00
2017-05-02 05:32:21 +00:00
# if (LZ4_HEAPMODE)
2015-05-03 16:57:46 +00:00
FREEMEM ( ctxPtr ) ;
2013-12-30 17:16:52 +00:00
# endif
return result ;
}
2015-03-30 20:32:25 +00:00
2015-05-03 16:57:46 +00:00
int LZ4_compress_default ( const char * source , char * dest , int inputSize , int maxOutputSize )
2015-03-30 20:32:25 +00:00
{
2015-05-03 16:57:46 +00:00
return LZ4_compress_fast ( source , dest , inputSize , maxOutputSize , 1 ) ;
2015-04-23 06:46:35 +00:00
}
2015-05-03 16:57:46 +00:00
/* hidden debug function */
/* strangely enough, gcc generates faster code when this function is uncommented, even if unused */
int LZ4_compress_fast_force ( const char * source , char * dest , int inputSize , int maxOutputSize , int acceleration )
2015-04-23 06:46:35 +00:00
{
2015-05-03 16:57:46 +00:00
LZ4_stream_t ctx ;
LZ4_resetStream ( & ctx ) ;
2013-12-30 17:16:52 +00:00
2015-05-03 16:57:46 +00:00
if ( inputSize < LZ4_64Klimit )
2018-04-26 19:42:16 +00:00
return LZ4_compress_generic ( & ctx . internal_donotuse , source , dest , inputSize , NULL , maxOutputSize , limitedOutput , byU16 , noDict , noDictIssue , acceleration ) ;
2015-05-03 16:57:46 +00:00
else
2018-04-26 19:42:16 +00:00
return LZ4_compress_generic ( & ctx . internal_donotuse , source , dest , inputSize , NULL , maxOutputSize , limitedOutput , sizeof ( void * ) = = 8 ? byU32 : byPtr , noDict , noDictIssue , acceleration ) ;
2015-05-06 01:29:04 +00:00
}
2018-04-26 19:42:16 +00:00
/* Note!: This function leaves the stream in an unclean/broken state!
* It is not safe to subsequently use the same state with a _fastReset ( ) or
* _continue ( ) call without resetting it . */
2016-11-11 21:00:02 +00:00
static int LZ4_compress_destSize_extState ( LZ4_stream_t * state , const char * src , char * dst , int * srcSizePtr , int targetDstSize )
2015-05-06 01:29:04 +00:00
{
2016-11-11 21:00:02 +00:00
LZ4_resetStream ( state ) ;
2015-05-06 01:29:04 +00:00
2016-06-29 15:12:24 +00:00
if ( targetDstSize > = LZ4_compressBound ( * srcSizePtr ) ) { /* compression success is guaranteed */
2015-05-06 01:29:04 +00:00
return LZ4_compress_fast_extState ( state , src , dst , * srcSizePtr , targetDstSize , 1 ) ;
2016-06-29 15:12:24 +00:00
} else {
2018-04-06 01:29:42 +00:00
if ( * srcSizePtr < LZ4_64Klimit ) {
2018-04-26 19:42:16 +00:00
return LZ4_compress_generic ( & state - > internal_donotuse , src , dst , * srcSizePtr , srcSizePtr , targetDstSize , fillOutput , byU16 , noDict , noDictIssue , 1 ) ;
2018-04-06 01:29:42 +00:00
} else {
tableType_t const tableType = ( ( sizeof ( void * ) = = 4 ) & & ( ( uptrval ) src > MAX_DISTANCE ) ) ? byPtr : byU32 ;
2018-04-26 19:42:16 +00:00
return LZ4_compress_generic ( & state - > internal_donotuse , src , dst , * srcSizePtr , srcSizePtr , targetDstSize , fillOutput , tableType , noDict , noDictIssue , 1 ) ;
2018-04-06 01:29:42 +00:00
} }
2015-05-06 01:29:04 +00:00
}
int LZ4_compress_destSize ( const char * src , char * dst , int * srcSizePtr , int targetDstSize )
{
2017-05-02 05:32:21 +00:00
# if (LZ4_HEAPMODE)
2018-01-26 22:29:50 +00:00
LZ4_stream_t * ctx = ( LZ4_stream_t * ) ALLOC ( sizeof ( LZ4_stream_t ) ) ; /* malloc-calloc always properly aligned */
2018-03-12 22:32:24 +00:00
if ( ctx = = NULL ) return 0 ;
2015-05-06 01:29:04 +00:00
# else
LZ4_stream_t ctxBody ;
2016-11-11 21:00:02 +00:00
LZ4_stream_t * ctx = & ctxBody ;
2015-05-06 01:29:04 +00:00
# endif
2016-06-29 10:54:23 +00:00
int result = LZ4_compress_destSize_extState ( ctx , src , dst , srcSizePtr , targetDstSize ) ;
2015-05-06 01:29:04 +00:00
2017-05-02 05:32:21 +00:00
# if (LZ4_HEAPMODE)
2015-05-06 01:29:04 +00:00
FREEMEM ( ctx ) ;
# endif
return result ;
}
2016-06-29 12:44:05 +00:00
/*-******************************
2015-05-06 01:29:04 +00:00
* Streaming functions
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2013-12-30 17:16:52 +00:00
2015-04-01 13:48:24 +00:00
LZ4_stream_t * LZ4_createStream ( void )
{
2018-01-26 22:29:50 +00:00
LZ4_stream_t * lz4s = ( LZ4_stream_t * ) ALLOC ( sizeof ( LZ4_stream_t ) ) ;
2015-04-01 13:48:24 +00:00
LZ4_STATIC_ASSERT ( LZ4_STREAMSIZE > = sizeof ( LZ4_stream_t_internal ) ) ; /* A compilation error here means LZ4_STREAMSIZE is not large enough */
2018-02-12 17:09:38 +00:00
DEBUGLOG ( 4 , " LZ4_createStream %p " , lz4s ) ;
2018-03-12 22:32:24 +00:00
if ( lz4s = = NULL ) return NULL ;
2015-04-01 13:48:24 +00:00
LZ4_resetStream ( lz4s ) ;
return lz4s ;
}
2014-07-05 15:48:49 +00:00
void LZ4_resetStream ( LZ4_stream_t * LZ4_stream )
{
2018-04-17 00:15:02 +00:00
DEBUGLOG ( 5 , " LZ4_resetStream (ctx:%p) " , LZ4_stream ) ;
2014-07-05 15:48:49 +00:00
MEM_INIT ( LZ4_stream , 0 , sizeof ( LZ4_stream_t ) ) ;
}
2018-04-11 22:42:09 +00:00
void LZ4_resetStream_fast ( LZ4_stream_t * ctx ) {
2018-04-11 19:13:01 +00:00
LZ4_prepareTable ( & ( ctx - > internal_donotuse ) , 0 , byU32 ) ;
2014-07-05 15:48:49 +00:00
}
2014-07-14 22:04:10 +00:00
int LZ4_freeStream ( LZ4_stream_t * LZ4_stream )
2014-06-09 00:01:04 +00:00
{
2017-08-09 23:51:19 +00:00
if ( ! LZ4_stream ) return 0 ; /* support free on NULL */
2018-02-12 17:09:38 +00:00
DEBUGLOG ( 5 , " LZ4_freeStream %p " , LZ4_stream ) ;
2014-06-09 00:01:04 +00:00
FREEMEM ( LZ4_stream ) ;
return ( 0 ) ;
}
2016-11-19 01:05:06 +00:00
# define HASH_UNIT sizeof(reg_t)
2014-07-05 15:48:49 +00:00
int LZ4_loadDict ( LZ4_stream_t * LZ4_dict , const char * dictionary , int dictSize )
2014-06-02 06:07:19 +00:00
{
2016-11-11 21:00:02 +00:00
LZ4_stream_t_internal * dict = & LZ4_dict - > internal_donotuse ;
2018-04-06 20:52:29 +00:00
const tableType_t tableType = byU32 ;
2014-06-02 06:07:19 +00:00
const BYTE * p = ( const BYTE * ) dictionary ;
const BYTE * const dictEnd = p + dictSize ;
const BYTE * base ;
2018-04-17 06:59:42 +00:00
DEBUGLOG ( 4 , " LZ4_loadDict (%i bytes from %p into %p) " , dictSize , dictionary , LZ4_dict ) ;
2018-02-12 17:09:38 +00:00
2018-04-21 01:09:51 +00:00
/* It's necessary to reset the context,
* and not just continue it with prepareTable ( )
* to avoid any risk of generating overflowing matchIndex
* when compressing using this dictionary */
LZ4_resetStream ( LZ4_dict ) ;
2014-06-02 06:07:19 +00:00
2018-04-17 18:01:44 +00:00
/* We always increment the offset by 64 KB, since, if the dict is longer,
* we truncate it to the last 64 k , and if it ' s shorter , we still want to
* advance by a whole window length so we can provide the guarantee that
* there are only valid offsets in the window , which allows an optimization
* in LZ4_compress_fast_continue ( ) where it uses noDictIssue even when the
* dictionary isn ' t a full 64 k . */
2015-05-02 18:10:28 +00:00
if ( ( dictEnd - p ) > 64 KB ) p = dictEnd - 64 KB ;
2018-04-17 18:01:44 +00:00
base = dictEnd - 64 KB - dict - > currentOffset ;
2014-06-02 06:07:19 +00:00
dict - > dictionary = p ;
dict - > dictSize = ( U32 ) ( dictEnd - p ) ;
2018-04-17 18:01:44 +00:00
dict - > currentOffset + = 64 KB ;
2018-04-06 20:52:29 +00:00
dict - > tableType = tableType ;
2014-06-02 06:07:19 +00:00
2017-10-11 20:13:33 +00:00
if ( dictSize < ( int ) HASH_UNIT ) {
return 0 ;
}
2016-06-29 15:12:24 +00:00
while ( p < = dictEnd - HASH_UNIT ) {
2018-04-06 20:52:29 +00:00
LZ4_putPosition ( p , dict - > hashTable , tableType , base ) ;
2014-06-02 06:07:19 +00:00
p + = 3 ;
}
2014-11-02 21:32:12 +00:00
return dict - > dictSize ;
2014-06-02 06:07:19 +00:00
}
2018-04-11 20:04:24 +00:00
void LZ4_attach_dictionary ( LZ4_stream_t * working_stream , const LZ4_stream_t * dictionary_stream ) {
2018-04-11 20:55:12 +00:00
if ( dictionary_stream ! = NULL ) {
/* If the current offset is zero, we will never look in the
* external dictionary context , since there is no value a table
* entry can take that indicate a miss . In that case , we need
* to bump the offset to something non - zero .
*/
if ( working_stream - > internal_donotuse . currentOffset = = 0 ) {
working_stream - > internal_donotuse . currentOffset = 64 KB ;
}
working_stream - > internal_donotuse . dictCtx = & ( dictionary_stream - > internal_donotuse ) ;
} else {
working_stream - > internal_donotuse . dictCtx = NULL ;
}
2018-04-11 20:04:24 +00:00
}
2014-06-02 06:07:19 +00:00
2018-04-13 09:10:53 +00:00
static void LZ4_renormDictT ( LZ4_stream_t_internal * LZ4_dict , int nextSize )
2013-12-30 17:16:52 +00:00
{
2018-04-13 09:10:53 +00:00
if ( LZ4_dict - > currentOffset + nextSize > 0x80000000 ) { /* potential ptrdiff_t overflow (32-bits mode) */
2014-05-19 23:40:29 +00:00
/* rescale hash table */
2016-08-20 22:08:38 +00:00
U32 const delta = LZ4_dict - > currentOffset - 64 KB ;
2014-06-21 16:01:15 +00:00
const BYTE * dictEnd = LZ4_dict - > dictionary + LZ4_dict - > dictSize ;
2014-05-19 23:40:29 +00:00
int i ;
2018-04-13 09:10:53 +00:00
DEBUGLOG ( 4 , " LZ4_renormDictT " ) ;
2016-11-11 21:00:02 +00:00
for ( i = 0 ; i < LZ4_HASH_SIZE_U32 ; i + + ) {
2014-05-19 23:40:29 +00:00
if ( LZ4_dict - > hashTable [ i ] < delta ) LZ4_dict - > hashTable [ i ] = 0 ;
else LZ4_dict - > hashTable [ i ] - = delta ;
}
LZ4_dict - > currentOffset = 64 KB ;
2014-06-21 16:01:15 +00:00
if ( LZ4_dict - > dictSize > 64 KB ) LZ4_dict - > dictSize = 64 KB ;
LZ4_dict - > dictionary = dictEnd - LZ4_dict - > dictSize ;
2014-05-19 23:40:29 +00:00
}
2013-12-30 17:16:52 +00:00
}
2015-05-03 16:57:46 +00:00
int LZ4_compress_fast_continue ( LZ4_stream_t * LZ4_stream , const char * source , char * dest , int inputSize , int maxOutputSize , int acceleration )
2014-06-09 00:01:04 +00:00
{
2018-01-29 22:09:52 +00:00
const tableType_t tableType = byU32 ;
2016-11-11 21:00:02 +00:00
LZ4_stream_t_internal * streamPtr = & LZ4_stream - > internal_donotuse ;
2014-06-09 00:01:04 +00:00
const BYTE * const dictEnd = streamPtr - > dictionary + streamPtr - > dictSize ;
2014-06-14 15:56:24 +00:00
if ( streamPtr - > initCheck ) return 0 ; /* Uninitialized structure detected */
2018-04-13 09:10:53 +00:00
LZ4_renormDictT ( streamPtr , inputSize ) ; /* avoid index overflow */
2015-05-03 16:57:46 +00:00
if ( acceleration < 1 ) acceleration = ACCELERATION_DEFAULT ;
2014-06-09 00:01:04 +00:00
2014-06-14 15:56:24 +00:00
/* Check overlapping input/dictionary space */
2016-06-29 15:12:24 +00:00
{ const BYTE * sourceEnd = ( const BYTE * ) source + inputSize ;
if ( ( sourceEnd > streamPtr - > dictionary ) & & ( sourceEnd < dictEnd ) ) {
2014-06-17 20:41:59 +00:00
streamPtr - > dictSize = ( U32 ) ( dictEnd - sourceEnd ) ;
2014-06-14 15:56:24 +00:00
if ( streamPtr - > dictSize > 64 KB ) streamPtr - > dictSize = 64 KB ;
if ( streamPtr - > dictSize < 4 ) streamPtr - > dictSize = 0 ;
2014-06-14 16:04:30 +00:00
streamPtr - > dictionary = dictEnd - streamPtr - > dictSize ;
2014-06-14 15:56:24 +00:00
}
}
2014-06-19 21:54:16 +00:00
/* prefix mode : source data follows dictionary */
2016-06-29 15:12:24 +00:00
if ( dictEnd = = ( const BYTE * ) source ) {
2014-06-19 21:54:16 +00:00
if ( ( streamPtr - > dictSize < 64 KB ) & & ( streamPtr - > dictSize < streamPtr - > currentOffset ) )
2018-04-26 19:42:16 +00:00
return LZ4_compress_generic ( streamPtr , source , dest , inputSize , NULL , maxOutputSize , limitedOutput , tableType , withPrefix64k , dictSmall , acceleration ) ;
2014-06-17 20:41:59 +00:00
else
2018-04-26 19:42:16 +00:00
return LZ4_compress_generic ( streamPtr , source , dest , inputSize , NULL , maxOutputSize , limitedOutput , tableType , withPrefix64k , noDictIssue , acceleration ) ;
2014-06-09 00:01:04 +00:00
}
2014-06-19 21:54:16 +00:00
/* external dictionary mode */
2016-06-29 15:12:24 +00:00
{ int result ;
2018-03-05 16:59:22 +00:00
if ( streamPtr - > dictCtx ) {
/* We depend here on the fact that dictCtx'es (produced by
* LZ4_loadDict ) guarantee that their tables contain no references
* to offsets between dictCtx - > currentOffset - 64 KB and
* dictCtx - > currentOffset - dictCtx - > dictSize . This makes it safe
* to use noDictIssue even when the dict isn ' t a full 64 KB .
*/
2018-03-06 16:52:02 +00:00
if ( inputSize > 4 KB ) {
2018-03-05 16:59:22 +00:00
/* For compressing large blobs, it is faster to pay the setup
* cost to copy the dictionary ' s tables into the active context ,
2018-04-13 09:10:53 +00:00
* so that the compression loop is only looking into one table .
2018-03-05 16:59:22 +00:00
*/
memcpy ( streamPtr , streamPtr - > dictCtx , sizeof ( LZ4_stream_t ) ) ;
2018-04-26 19:42:16 +00:00
result = LZ4_compress_generic ( streamPtr , source , dest , inputSize , NULL , maxOutputSize , limitedOutput , tableType , usingExtDict , noDictIssue , acceleration ) ;
2018-02-12 17:19:13 +00:00
} else {
2018-04-26 19:42:16 +00:00
result = LZ4_compress_generic ( streamPtr , source , dest , inputSize , NULL , maxOutputSize , limitedOutput , tableType , usingDictCtx , noDictIssue , acceleration ) ;
2018-02-12 17:19:13 +00:00
}
} else {
2018-01-26 17:06:43 +00:00
if ( ( streamPtr - > dictSize < 64 KB ) & & ( streamPtr - > dictSize < streamPtr - > currentOffset ) ) {
2018-04-26 19:42:16 +00:00
result = LZ4_compress_generic ( streamPtr , source , dest , inputSize , NULL , maxOutputSize , limitedOutput , tableType , usingExtDict , dictSmall , acceleration ) ;
2018-02-12 17:19:13 +00:00
} else {
2018-04-26 19:42:16 +00:00
result = LZ4_compress_generic ( streamPtr , source , dest , inputSize , NULL , maxOutputSize , limitedOutput , tableType , usingExtDict , noDictIssue , acceleration ) ;
2018-02-12 17:19:13 +00:00
}
}
2014-06-09 00:01:04 +00:00
streamPtr - > dictionary = ( const BYTE * ) source ;
streamPtr - > dictSize = ( U32 ) inputSize ;
return result ;
}
}
2018-04-13 09:10:53 +00:00
/* Hidden debug function, to force-test external dictionary mode */
int LZ4_compress_forceExtDict ( LZ4_stream_t * LZ4_dict , const char * source , char * dest , int srcSize )
2014-05-21 18:46:36 +00:00
{
2016-11-11 21:00:02 +00:00
LZ4_stream_t_internal * streamPtr = & LZ4_dict - > internal_donotuse ;
2014-06-09 00:01:04 +00:00
int result ;
2018-04-13 09:10:53 +00:00
LZ4_renormDictT ( streamPtr , srcSize ) ;
2014-06-09 00:01:04 +00:00
2018-02-17 01:33:51 +00:00
if ( ( streamPtr - > dictSize < 64 KB ) & & ( streamPtr - > dictSize < streamPtr - > currentOffset ) ) {
2018-04-26 19:42:16 +00:00
result = LZ4_compress_generic ( streamPtr , source , dest , srcSize , NULL , 0 , notLimited , byU32 , usingExtDict , dictSmall , 1 ) ;
2018-02-17 01:33:51 +00:00
} else {
2018-04-26 19:42:16 +00:00
result = LZ4_compress_generic ( streamPtr , source , dest , srcSize , NULL , 0 , notLimited , byU32 , usingExtDict , noDictIssue , 1 ) ;
2018-02-17 01:33:51 +00:00
}
2014-05-27 01:41:29 +00:00
streamPtr - > dictionary = ( const BYTE * ) source ;
2018-04-13 09:10:53 +00:00
streamPtr - > dictSize = ( U32 ) srcSize ;
2014-05-27 01:41:29 +00:00
return result ;
2013-12-30 17:16:52 +00:00
}
2014-05-19 23:40:29 +00:00
2016-11-10 23:31:59 +00:00
/*! LZ4_saveDict() :
* If previously compressed data block is not guaranteed to remain available at its memory location ,
* save it into a safer place ( char * safeBuffer ) .
* Note : you don ' t need to call LZ4_loadDict ( ) afterwards ,
* dictionary is immediately usable , you can therefore call LZ4_compress_fast_continue ( ) .
* Return : saved dictionary size in bytes ( necessarily < = dictSize ) , or 0 if error .
*/
2014-07-05 15:48:49 +00:00
int LZ4_saveDict ( LZ4_stream_t * LZ4_dict , char * safeBuffer , int dictSize )
2014-05-21 18:46:36 +00:00
{
2016-11-11 21:00:02 +00:00
LZ4_stream_t_internal * const dict = & LZ4_dict - > internal_donotuse ;
2016-11-10 23:31:59 +00:00
const BYTE * const previousDictEnd = dict - > dictionary + dict - > dictSize ;
2014-05-21 18:46:36 +00:00
if ( ( U32 ) dictSize > 64 KB ) dictSize = 64 KB ; /* useless to define a dictionary > 64 KB */
if ( ( U32 ) dictSize > dict - > dictSize ) dictSize = dict - > dictSize ;
2014-09-10 12:00:39 +00:00
memmove ( safeBuffer , previousDictEnd - dictSize , dictSize ) ;
2014-05-21 18:46:36 +00:00
2014-06-02 06:07:19 +00:00
dict - > dictionary = ( const BYTE * ) safeBuffer ;
dict - > dictSize = ( U32 ) dictSize ;
2014-05-19 23:40:29 +00:00
2014-09-09 22:54:22 +00:00
return dictSize ;
2013-12-30 17:16:52 +00:00
}
2014-05-19 23:40:29 +00:00
2016-06-29 12:44:05 +00:00
/*-*****************************
2015-03-17 17:02:01 +00:00
* Decompression functions
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2016-06-29 12:44:05 +00:00
/*! LZ4_decompress_generic() :
2017-09-07 19:12:36 +00:00
* This generic decompression function covers all use cases .
* It shall be instantiated several times , using different sets of directives .
* Note that it is important for performance that this function really get inlined ,
2016-06-29 12:44:05 +00:00
* in order to remove useless branches during compilation optimization .
2014-02-04 14:11:10 +00:00
*/
2017-10-13 19:53:37 +00:00
LZ4_FORCE_O2_GCC_PPC64LE
2017-08-24 14:14:20 +00:00
LZ4_FORCE_INLINE int LZ4_decompress_generic (
2017-09-07 19:12:36 +00:00
const char * const src ,
char * const dst ,
int srcSize ,
int outputSize , /* If endOnInput==endOnInputSize, this value is `dstCapacity` */
2013-12-30 17:16:52 +00:00
2014-02-04 14:11:10 +00:00
int endOnInput , /* endOnOutputSize, endOnInputSize */
int partialDecoding , /* full, partial */
2014-04-28 20:45:35 +00:00
int targetOutputSize , /* only used if partialDecoding==partial */
2014-06-02 06:07:19 +00:00
int dict , /* noDict, withPrefix64k, usingExtDict */
2017-10-30 23:07:15 +00:00
const BYTE * const lowPrefix , /* always <= dst, == dst when no prefix */
2014-10-25 19:52:10 +00:00
const BYTE * const dictStart , /* only if dict==usingExtDict */
const size_t dictSize /* note : = 0 if noDict */
2013-12-30 17:16:52 +00:00
)
{
2017-09-07 19:12:36 +00:00
const BYTE * ip = ( const BYTE * ) src ;
const BYTE * const iend = ip + srcSize ;
2013-12-30 17:16:52 +00:00
2017-09-07 19:12:36 +00:00
BYTE * op = ( BYTE * ) dst ;
2013-12-30 17:16:52 +00:00
BYTE * const oend = op + outputSize ;
BYTE * cpy ;
BYTE * oexit = op + targetOutputSize ;
2014-06-12 22:29:06 +00:00
const BYTE * const dictEnd = ( const BYTE * ) dictStart + dictSize ;
2017-10-31 22:51:56 +00:00
const unsigned inc32table [ 8 ] = { 0 , 1 , 2 , 1 , 0 , 4 , 4 , 4 } ;
const int dec64table [ 8 ] = { 0 , 0 , 0 , - 1 , - 4 , 1 , 2 , 3 } ;
2013-12-30 17:16:52 +00:00
2014-07-14 22:04:10 +00:00
const int safeDecode = ( endOnInput = = endOnInputSize ) ;
const int checkOffset = ( ( safeDecode ) & & ( dictSize < ( int ) ( 64 KB ) ) ) ;
2014-06-21 16:01:15 +00:00
2018-04-28 08:14:40 +00:00
/* Set up the "end" pointers for the shortcut. */
const BYTE * const shortiend = iend - ( endOnInput ? 14 : 8 ) /*maxLL*/ - 2 /*offset*/ ;
const BYTE * const shortoend = oend - ( endOnInput ? 14 : 8 ) /*maxLL*/ - 18 /*maxML*/ ;
2013-12-30 17:16:52 +00:00
2014-02-04 14:11:10 +00:00
/* Special cases */
2017-10-30 23:07:15 +00:00
if ( ( partialDecoding ) & & ( oexit > oend - MFLIMIT ) ) oexit = oend - MFLIMIT ; /* targetOutputSize too high => just decode everything */
2017-09-07 19:12:36 +00:00
if ( ( endOnInput ) & & ( unlikely ( outputSize = = 0 ) ) ) return ( ( srcSize = = 1 ) & & ( * ip = = 0 ) ) ? 0 : - 1 ; /* Empty output buffer */
2014-02-04 14:11:10 +00:00
if ( ( ! endOnInput ) & & ( unlikely ( outputSize = = 0 ) ) ) return ( * ip = = 0 ? 1 : - 1 ) ;
2018-04-23 20:14:19 +00:00
if ( ( endOnInput ) & & unlikely ( srcSize = = 0 ) ) return - 1 ;
2013-12-30 17:16:52 +00:00
2016-06-29 13:53:21 +00:00
/* Main Loop : decode sequences */
2016-06-29 12:44:05 +00:00
while ( 1 ) {
2014-10-25 19:52:10 +00:00
const BYTE * match ;
2015-07-16 08:38:10 +00:00
size_t offset ;
2013-12-30 17:16:52 +00:00
2016-11-14 22:53:15 +00:00
unsigned const token = * ip + + ;
2018-04-28 08:14:40 +00:00
size_t length = token > > ML_BITS ; /* literal length */
2017-10-25 08:10:53 +00:00
2018-04-23 21:21:02 +00:00
assert ( ! endOnInput | | ip < = iend ) ; /* ip < iend before the increment */
2018-04-28 08:14:40 +00:00
/* A two-stage shortcut for the most common case:
* 1 ) If the literal length is 0. .14 , and there is enough space ,
* enter the shortcut and copy 16 bytes on behalf of the literals
* ( in the fast mode , only 8 bytes can be safely copied this way ) .
* 2 ) Further if the match length is 4. .18 , copy 18 bytes in a similar
* manner ; but we ensure that there ' s enough space in the output for
* those 18 bytes earlier , upon entering the shortcut ( in other words ,
* there is a combined check for both stages ) .
*/
2018-05-03 14:56:33 +00:00
if ( ( endOnInput ? length ! = RUN_MASK : length < = 8 )
2018-04-28 08:14:40 +00:00
/* strictly "less than" on input, to re-enter the loop with at least one byte */
2018-05-03 14:56:33 +00:00
& & likely ( ( endOnInput ? ip < shortiend : 1 ) & ( op < = shortoend ) ) ) {
2018-05-02 19:56:37 +00:00
/* Copy the literals */
2018-05-02 17:33:12 +00:00
memcpy ( op , ip , endOnInput ? 16 : 8 ) ;
op + = length ; ip + = length ;
/* The second stage: prepare for match copying, decode full info.
* If it doesn ' t work out , the info won ' t be wasted . */
length = token & ML_MASK ; /* match length */
offset = LZ4_readLE16 ( ip ) ; ip + = 2 ;
match = op - offset ;
/* Do not deal with overlapping matches. */
2018-05-03 14:56:33 +00:00
if ( ( length ! = ML_MASK )
& & ( offset > = 8 )
& & ( dict = = withPrefix64k | | match > = lowPrefix ) ) {
2018-05-02 17:33:12 +00:00
/* Copy the match. */
memcpy ( op + 0 , match + 0 , 8 ) ;
memcpy ( op + 8 , match + 8 , 8 ) ;
memcpy ( op + 16 , match + 16 , 2 ) ;
op + = length + MINMATCH ;
/* Both stages worked, load the next token. */
continue ;
2017-10-25 08:10:53 +00:00
}
2018-04-28 08:14:40 +00:00
/* The second stage didn't work out, but the info is ready.
* Propel it right to the point of match copying . */
goto _copy_match ;
2017-10-25 08:10:53 +00:00
}
2017-10-30 23:07:15 +00:00
/* decode literal length */
2018-04-28 08:14:40 +00:00
if ( length = = RUN_MASK ) {
2014-06-22 10:25:04 +00:00
unsigned s ;
2018-04-23 20:14:19 +00:00
if ( unlikely ( endOnInput ? ip > = iend - RUN_MASK : 0 ) ) goto _output_error ; /* overflow detection */
2016-06-29 12:44:05 +00:00
do {
2014-06-12 22:29:06 +00:00
s = * ip + + ;
length + = s ;
2016-06-29 13:04:19 +00:00
} while ( likely ( endOnInput ? ip < iend - RUN_MASK : 1 ) & ( s = = 255 ) ) ;
2016-11-17 21:02:06 +00:00
if ( ( safeDecode ) & & unlikely ( ( uptrval ) ( op ) + length < ( uptrval ) ( op ) ) ) goto _output_error ; /* overflow detection */
if ( ( safeDecode ) & & unlikely ( ( uptrval ) ( ip ) + length < ( uptrval ) ( ip ) ) ) goto _output_error ; /* overflow detection */
2013-12-30 17:16:52 +00:00
}
2014-02-04 14:11:10 +00:00
/* copy literals */
2013-12-30 17:16:52 +00:00
cpy = op + length ;
2016-06-29 15:48:28 +00:00
if ( ( ( endOnInput ) & & ( ( cpy > ( partialDecoding ? oexit : oend - MFLIMIT ) ) | | ( ip + length > iend - ( 2 + 1 + LASTLITERALS ) ) ) )
| | ( ( ! endOnInput ) & & ( cpy > oend - WILDCOPYLENGTH ) ) )
2013-12-30 17:16:52 +00:00
{
2016-06-29 12:44:05 +00:00
if ( partialDecoding ) {
2014-02-04 14:11:10 +00:00
if ( cpy > oend ) goto _output_error ; /* Error : write attempt beyond end of output buffer */
if ( ( endOnInput ) & & ( ip + length > iend ) ) goto _output_error ; /* Error : read attempt beyond end of input buffer */
2016-06-29 12:44:05 +00:00
} else {
2014-02-04 14:11:10 +00:00
if ( ( ! endOnInput ) & & ( cpy ! = oend ) ) goto _output_error ; /* Error : block decoding must stop exactly there */
if ( ( endOnInput ) & & ( ( ip + length ! = iend ) | | ( cpy > oend ) ) ) goto _output_error ; /* Error : input must be consumed */
2013-12-30 17:16:52 +00:00
}
2016-06-29 10:54:23 +00:00
memcpy ( op , ip , length ) ;
2013-12-30 17:16:52 +00:00
ip + = length ;
op + = length ;
2014-07-14 22:04:10 +00:00
break ; /* Necessarily EOF, due to parsing restrictions */
2013-12-30 17:16:52 +00:00
}
2014-11-27 21:44:36 +00:00
LZ4_wildCopy ( op , ip , cpy ) ;
ip + = length ; op = cpy ;
2013-12-30 17:16:52 +00:00
2014-02-04 14:11:10 +00:00
/* get offset */
2015-07-16 08:38:10 +00:00
offset = LZ4_readLE16 ( ip ) ; ip + = 2 ;
2015-07-16 07:55:48 +00:00
match = op - offset ;
2013-12-30 17:16:52 +00:00
2014-02-04 14:11:10 +00:00
/* get matchlength */
2014-11-22 23:46:15 +00:00
length = token & ML_MASK ;
2018-04-28 08:14:40 +00:00
_copy_match :
if ( ( checkOffset ) & & ( unlikely ( match + dictSize < lowPrefix ) ) ) goto _output_error ; /* Error : offset outside buffers */
LZ4_write32 ( op , ( U32 ) offset ) ; /* costs ~1%; silence an msan warning when offset==0 */
2016-06-29 12:44:05 +00:00
if ( length = = ML_MASK ) {
2014-06-12 22:29:06 +00:00
unsigned s ;
2016-06-29 12:44:05 +00:00
do {
2014-06-12 22:29:06 +00:00
s = * ip + + ;
2016-06-29 15:02:09 +00:00
if ( ( endOnInput ) & & ( ip > iend - LASTLITERALS ) ) goto _output_error ;
2013-12-30 17:16:52 +00:00
length + = s ;
2014-06-12 22:29:06 +00:00
} while ( s = = 255 ) ;
2016-11-17 21:02:06 +00:00
if ( ( safeDecode ) & & unlikely ( ( uptrval ) ( op ) + length < ( uptrval ) op ) ) goto _output_error ; /* overflow detection */
2013-12-30 17:16:52 +00:00
}
2014-08-13 15:44:44 +00:00
length + = MINMATCH ;
2013-12-30 17:16:52 +00:00
2014-04-28 20:45:35 +00:00
/* check external dictionary */
2016-06-29 12:44:05 +00:00
if ( ( dict = = usingExtDict ) & & ( match < lowPrefix ) ) {
2014-10-25 19:52:10 +00:00
if ( unlikely ( op + length > oend - LASTLITERALS ) ) goto _output_error ; /* doesn't respect parsing restriction */
2014-04-28 20:45:35 +00:00
2016-06-29 12:44:05 +00:00
if ( length < = ( size_t ) ( lowPrefix - match ) ) {
2014-10-25 19:52:10 +00:00
/* match can be copied as a single segment from external dictionary */
2016-06-29 13:53:21 +00:00
memmove ( op , dictEnd - ( lowPrefix - match ) , length ) ;
op + = length ;
2016-06-29 12:44:05 +00:00
} else {
2015-07-16 07:55:48 +00:00
/* match encompass external dictionary and current block */
2016-06-29 13:53:21 +00:00
size_t const copySize = ( size_t ) ( lowPrefix - match ) ;
size_t const restSize = length - copySize ;
2014-04-28 20:45:35 +00:00
memcpy ( op , dictEnd - copySize , copySize ) ;
op + = copySize ;
2016-06-29 13:53:21 +00:00
if ( restSize > ( size_t ) ( op - lowPrefix ) ) { /* overlap copy */
BYTE * const endOfMatch = op + restSize ;
2014-10-25 19:52:10 +00:00
const BYTE * copyFrom = lowPrefix ;
2014-07-05 12:33:57 +00:00
while ( op < endOfMatch ) * op + + = * copyFrom + + ;
2016-06-29 12:44:05 +00:00
} else {
2016-06-29 13:53:21 +00:00
memcpy ( op , lowPrefix , restSize ) ;
op + = restSize ;
2016-06-29 15:48:28 +00:00
} }
2014-04-28 20:45:35 +00:00
continue ;
}
2015-07-16 07:55:48 +00:00
/* copy match within block */
2014-08-13 15:44:44 +00:00
cpy = op + length ;
2016-06-29 12:44:05 +00:00
if ( unlikely ( offset < 8 ) ) {
2014-10-25 19:52:10 +00:00
op [ 0 ] = match [ 0 ] ;
op [ 1 ] = match [ 1 ] ;
op [ 2 ] = match [ 2 ] ;
op [ 3 ] = match [ 3 ] ;
2017-10-31 22:51:56 +00:00
match + = inc32table [ offset ] ;
2015-07-16 07:55:48 +00:00
memcpy ( op + 4 , match , 4 ) ;
2017-10-31 22:51:56 +00:00
match - = dec64table [ offset ] ;
2018-02-12 06:20:09 +00:00
} else { memcpy ( op , match , 8 ) ; match + = 8 ; }
2015-07-16 08:03:55 +00:00
op + = 8 ;
2013-12-30 17:16:52 +00:00
2016-06-29 12:44:05 +00:00
if ( unlikely ( cpy > oend - 12 ) ) {
2015-07-16 08:38:10 +00:00
BYTE * const oCopyLimit = oend - ( WILDCOPYLENGTH - 1 ) ;
if ( cpy > oend - LASTLITERALS ) goto _output_error ; /* Error : last LASTLITERALS bytes must be literals (uncompressed) */
2016-06-29 12:44:05 +00:00
if ( op < oCopyLimit ) {
2015-07-16 08:38:10 +00:00
LZ4_wildCopy ( op , match , oCopyLimit ) ;
match + = oCopyLimit - op ;
op = oCopyLimit ;
2014-11-28 01:48:21 +00:00
}
2014-11-27 21:44:36 +00:00
while ( op < cpy ) * op + + = * match + + ;
2016-08-20 21:59:45 +00:00
} else {
2018-02-12 06:20:09 +00:00
memcpy ( op , match , 8 ) ;
2016-08-20 21:59:45 +00:00
if ( length > 16 ) LZ4_wildCopy ( op + 8 , match + 8 , cpy ) ;
2016-08-20 21:52:20 +00:00
}
2017-10-31 22:51:56 +00:00
op = cpy ; /* correction */
2013-12-30 17:16:52 +00:00
}
2014-02-04 14:11:10 +00:00
/* end of decoding */
2013-12-30 17:16:52 +00:00
if ( endOnInput )
2017-09-07 19:12:36 +00:00
return ( int ) ( ( ( char * ) op ) - dst ) ; /* Nb of output bytes decoded */
2013-12-30 17:16:52 +00:00
else
2017-09-07 19:12:36 +00:00
return ( int ) ( ( ( const char * ) ip ) - src ) ; /* Nb of input bytes read */
2013-12-30 17:16:52 +00:00
2014-02-04 14:11:10 +00:00
/* Overflow error detected */
2013-12-30 17:16:52 +00:00
_output_error :
2017-09-07 19:12:36 +00:00
return ( int ) ( - ( ( ( const char * ) ip ) - src ) ) - 1 ;
2013-12-30 17:16:52 +00:00
}
lz4.c: refactor the decoding routines
I noticed that LZ4_decompress_generic is sometimes instantiated with
identical set of parameters, or (what's worse) with a subtly different
sets of parameters. For example, LZ4_decompress_fast_withPrefix64k is
instantiated as follows:
return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize,
full, 0, withPrefix64k, (BYTE*)dest - 64 KB, NULL, 64 KB);
while the equivalent withPrefix64k call in LZ4_decompress_usingDict_generic
passes 0 for the last argument instead of 64 KB. It turns out that there
is no difference in this case: if you change 64 KB to 0 KB in
LZ4_decompress_fast_withPrefix64k, you get the same binary code.
Moreover, because it's been clarified that LZ4_decompress_fast doesn't
check match offsets, it is now obvious that both of these fast/withPrefix64k
instantiations are simply redundant. Exactly because LZ4_decompress_fast
doesn't check offsets, it serves well with any prefixed dictionary.
There's a difference, though, with LZ4_decompress_safe_withPrefix64k.
It also passes 64 KB as the last argument, and if you change that to 0,
as in LZ4_decompress_usingDict_generic, you get a completely different
binary code. It seems that passing 0 enables offset checking:
const int checkOffset = ((safeDecode) && (dictSize < (int)(64 KB)));
However, the resulting code seems to run a bit faster. How come
enabling extra checks can make the code run faster? Curiouser and
curiouser! This needs extra study. Currently I take the view that
the dictSize should be set to non-zero when nothing else will do,
i.e. when passing the external dictionary via dictStart. Otherwise,
lowPrefix betrays just enough information about the dictionary.
* * *
Anyway, with this change, I instantiate all the necessary cases as
functions with distinctive names, which also take fewer arguments and
are therefore less error-prone. I also make the functions non-inline.
(The compiler won't inline the functions because they are used more than
once. Hence I attach LZ4_FORCE_O2_GCC_PPC64LE to the instances while
removing from the callers.) The number of instances is now is reduced
from 18 (safe+fast+partial+4*continue+4*prefix+4*dict+2*prefix64+forceExtDict)
down to 7 (safe+fast+partial+2*prefix+2*dict). The size of the code is
not the only issue here. Separate helper function are much more
amenable to profile-guided optimization: it is enough to profile only
a few basic functions, while the other less-often used functions, such
as LZ4_decompress_*_continue, will benefit automatically.
This is the list of LZ4_decompress* functions in liblz4.so, sorted by size.
Exported functions are marked with a capital T.
$ nm -S lib/liblz4.so |grep -wi T |grep LZ4_decompress |sort -k2
0000000000016260 0000000000000005 T LZ4_decompress_fast_withPrefix64k
0000000000016dc0 0000000000000025 T LZ4_decompress_fast_usingDict
0000000000016d80 0000000000000040 T LZ4_decompress_safe_usingDict
0000000000016d10 000000000000006b T LZ4_decompress_fast_continue
0000000000016c70 000000000000009f T LZ4_decompress_safe_continue
00000000000156c0 000000000000059c T LZ4_decompress_fast
0000000000014a90 00000000000005fa T LZ4_decompress_safe
0000000000015c60 00000000000005fa T LZ4_decompress_safe_withPrefix64k
0000000000002280 00000000000005fa t LZ4_decompress_safe_withSmallPrefix
0000000000015090 000000000000062f T LZ4_decompress_safe_partial
0000000000002880 00000000000008ea t LZ4_decompress_fast_extDict
0000000000016270 0000000000000993 t LZ4_decompress_safe_forceExtDict
2018-04-23 05:37:44 +00:00
/*===== Instantiate the API decoding functions. =====*/
2017-10-13 19:53:37 +00:00
LZ4_FORCE_O2_GCC_PPC64LE
2014-07-14 22:04:10 +00:00
int LZ4_decompress_safe ( const char * source , char * dest , int compressedSize , int maxDecompressedSize )
2014-04-28 20:45:35 +00:00
{
2018-04-18 23:49:27 +00:00
return LZ4_decompress_generic ( source , dest , compressedSize , maxDecompressedSize ,
endOnInputSize , full , 0 , noDict ,
( BYTE * ) dest , NULL , 0 ) ;
2014-04-28 20:45:35 +00:00
}
2017-10-13 19:53:37 +00:00
LZ4_FORCE_O2_GCC_PPC64LE
2014-07-14 22:04:10 +00:00
int LZ4_decompress_safe_partial ( const char * source , char * dest , int compressedSize , int targetOutputSize , int maxDecompressedSize )
2013-12-30 17:16:52 +00:00
{
2018-04-18 23:49:27 +00:00
return LZ4_decompress_generic ( source , dest , compressedSize , maxDecompressedSize ,
endOnInputSize , partial , targetOutputSize ,
noDict , ( BYTE * ) dest , NULL , 0 ) ;
2013-12-30 17:16:52 +00:00
}
2017-10-13 19:53:37 +00:00
LZ4_FORCE_O2_GCC_PPC64LE
2014-06-17 20:41:59 +00:00
int LZ4_decompress_fast ( const char * source , char * dest , int originalSize )
2013-12-30 17:16:52 +00:00
{
2018-04-18 23:49:27 +00:00
return LZ4_decompress_generic ( source , dest , 0 , originalSize ,
endOnOutputSize , full , 0 , withPrefix64k ,
lz4.c: refactor the decoding routines
I noticed that LZ4_decompress_generic is sometimes instantiated with
identical set of parameters, or (what's worse) with a subtly different
sets of parameters. For example, LZ4_decompress_fast_withPrefix64k is
instantiated as follows:
return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize,
full, 0, withPrefix64k, (BYTE*)dest - 64 KB, NULL, 64 KB);
while the equivalent withPrefix64k call in LZ4_decompress_usingDict_generic
passes 0 for the last argument instead of 64 KB. It turns out that there
is no difference in this case: if you change 64 KB to 0 KB in
LZ4_decompress_fast_withPrefix64k, you get the same binary code.
Moreover, because it's been clarified that LZ4_decompress_fast doesn't
check match offsets, it is now obvious that both of these fast/withPrefix64k
instantiations are simply redundant. Exactly because LZ4_decompress_fast
doesn't check offsets, it serves well with any prefixed dictionary.
There's a difference, though, with LZ4_decompress_safe_withPrefix64k.
It also passes 64 KB as the last argument, and if you change that to 0,
as in LZ4_decompress_usingDict_generic, you get a completely different
binary code. It seems that passing 0 enables offset checking:
const int checkOffset = ((safeDecode) && (dictSize < (int)(64 KB)));
However, the resulting code seems to run a bit faster. How come
enabling extra checks can make the code run faster? Curiouser and
curiouser! This needs extra study. Currently I take the view that
the dictSize should be set to non-zero when nothing else will do,
i.e. when passing the external dictionary via dictStart. Otherwise,
lowPrefix betrays just enough information about the dictionary.
* * *
Anyway, with this change, I instantiate all the necessary cases as
functions with distinctive names, which also take fewer arguments and
are therefore less error-prone. I also make the functions non-inline.
(The compiler won't inline the functions because they are used more than
once. Hence I attach LZ4_FORCE_O2_GCC_PPC64LE to the instances while
removing from the callers.) The number of instances is now is reduced
from 18 (safe+fast+partial+4*continue+4*prefix+4*dict+2*prefix64+forceExtDict)
down to 7 (safe+fast+partial+2*prefix+2*dict). The size of the code is
not the only issue here. Separate helper function are much more
amenable to profile-guided optimization: it is enough to profile only
a few basic functions, while the other less-often used functions, such
as LZ4_decompress_*_continue, will benefit automatically.
This is the list of LZ4_decompress* functions in liblz4.so, sorted by size.
Exported functions are marked with a capital T.
$ nm -S lib/liblz4.so |grep -wi T |grep LZ4_decompress |sort -k2
0000000000016260 0000000000000005 T LZ4_decompress_fast_withPrefix64k
0000000000016dc0 0000000000000025 T LZ4_decompress_fast_usingDict
0000000000016d80 0000000000000040 T LZ4_decompress_safe_usingDict
0000000000016d10 000000000000006b T LZ4_decompress_fast_continue
0000000000016c70 000000000000009f T LZ4_decompress_safe_continue
00000000000156c0 000000000000059c T LZ4_decompress_fast
0000000000014a90 00000000000005fa T LZ4_decompress_safe
0000000000015c60 00000000000005fa T LZ4_decompress_safe_withPrefix64k
0000000000002280 00000000000005fa t LZ4_decompress_safe_withSmallPrefix
0000000000015090 000000000000062f T LZ4_decompress_safe_partial
0000000000002880 00000000000008ea t LZ4_decompress_fast_extDict
0000000000016270 0000000000000993 t LZ4_decompress_safe_forceExtDict
2018-04-23 05:37:44 +00:00
( BYTE * ) dest - 64 KB , NULL , 0 ) ;
}
/*===== Instantiate a few more decoding cases, used more than once. =====*/
LZ4_FORCE_O2_GCC_PPC64LE /* Exported, an obsolete API function. */
int LZ4_decompress_safe_withPrefix64k ( const char * source , char * dest , int compressedSize , int maxOutputSize )
{
return LZ4_decompress_generic ( source , dest , compressedSize , maxOutputSize ,
endOnInputSize , full , 0 , withPrefix64k ,
( BYTE * ) dest - 64 KB , NULL , 0 ) ;
}
/* Another obsolete API function, paired with the previous one. */
int LZ4_decompress_fast_withPrefix64k ( const char * source , char * dest , int originalSize )
{
/* LZ4_decompress_fast doesn't validate match offsets,
* and thus serves well with any prefixed dictionary . */
return LZ4_decompress_fast ( source , dest , originalSize ) ;
}
LZ4_FORCE_O2_GCC_PPC64LE
static int LZ4_decompress_safe_withSmallPrefix ( const char * source , char * dest , int compressedSize , int maxOutputSize ,
lz4.c: fixed the LZ4_decompress_safe_continue case
The previous change broke decoding with a ring buffer. That's because
I didn't realize that the "double dictionary mode" was possible, i.e.
that the decoding routine can look both at the first part of the
dictionary passed as prefix and the second part passed via dictStart+dictSize.
So this change introduces the LZ4_decompress_safe_doubleDict helper,
which handles this "double dictionary" situation. (This is a bit of
a misnomer, there is only one dictionary, but I can't think of a better
name, and perhaps the designation is not all too bad.) The helper is
used only once, in LZ4_decompress_safe_continue, it should be inlined
with LZ4_FORCE_O2_GCC_PPC64LE attached to LZ4_decompress_safe_continue.
(Also, in the helper functions, I change the dictStart parameter type
to "const void*", to avoid a cast when calling helpers. In the helpers,
the upcast to "BYTE*" is still required, for compatibility with C++.)
So this fixes the case of LZ4_decompress_safe_continue, and I'm
surprised by the fact that the fuzzer is now happy and does not detect
a similar problem with LZ4_decompress_fast_continue. So before fixing
LZ4_decompress_fast_continue, the next logical step is to enhance
the fuzzer.
2018-04-26 04:46:26 +00:00
size_t prefixSize )
lz4.c: refactor the decoding routines
I noticed that LZ4_decompress_generic is sometimes instantiated with
identical set of parameters, or (what's worse) with a subtly different
sets of parameters. For example, LZ4_decompress_fast_withPrefix64k is
instantiated as follows:
return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize,
full, 0, withPrefix64k, (BYTE*)dest - 64 KB, NULL, 64 KB);
while the equivalent withPrefix64k call in LZ4_decompress_usingDict_generic
passes 0 for the last argument instead of 64 KB. It turns out that there
is no difference in this case: if you change 64 KB to 0 KB in
LZ4_decompress_fast_withPrefix64k, you get the same binary code.
Moreover, because it's been clarified that LZ4_decompress_fast doesn't
check match offsets, it is now obvious that both of these fast/withPrefix64k
instantiations are simply redundant. Exactly because LZ4_decompress_fast
doesn't check offsets, it serves well with any prefixed dictionary.
There's a difference, though, with LZ4_decompress_safe_withPrefix64k.
It also passes 64 KB as the last argument, and if you change that to 0,
as in LZ4_decompress_usingDict_generic, you get a completely different
binary code. It seems that passing 0 enables offset checking:
const int checkOffset = ((safeDecode) && (dictSize < (int)(64 KB)));
However, the resulting code seems to run a bit faster. How come
enabling extra checks can make the code run faster? Curiouser and
curiouser! This needs extra study. Currently I take the view that
the dictSize should be set to non-zero when nothing else will do,
i.e. when passing the external dictionary via dictStart. Otherwise,
lowPrefix betrays just enough information about the dictionary.
* * *
Anyway, with this change, I instantiate all the necessary cases as
functions with distinctive names, which also take fewer arguments and
are therefore less error-prone. I also make the functions non-inline.
(The compiler won't inline the functions because they are used more than
once. Hence I attach LZ4_FORCE_O2_GCC_PPC64LE to the instances while
removing from the callers.) The number of instances is now is reduced
from 18 (safe+fast+partial+4*continue+4*prefix+4*dict+2*prefix64+forceExtDict)
down to 7 (safe+fast+partial+2*prefix+2*dict). The size of the code is
not the only issue here. Separate helper function are much more
amenable to profile-guided optimization: it is enough to profile only
a few basic functions, while the other less-often used functions, such
as LZ4_decompress_*_continue, will benefit automatically.
This is the list of LZ4_decompress* functions in liblz4.so, sorted by size.
Exported functions are marked with a capital T.
$ nm -S lib/liblz4.so |grep -wi T |grep LZ4_decompress |sort -k2
0000000000016260 0000000000000005 T LZ4_decompress_fast_withPrefix64k
0000000000016dc0 0000000000000025 T LZ4_decompress_fast_usingDict
0000000000016d80 0000000000000040 T LZ4_decompress_safe_usingDict
0000000000016d10 000000000000006b T LZ4_decompress_fast_continue
0000000000016c70 000000000000009f T LZ4_decompress_safe_continue
00000000000156c0 000000000000059c T LZ4_decompress_fast
0000000000014a90 00000000000005fa T LZ4_decompress_safe
0000000000015c60 00000000000005fa T LZ4_decompress_safe_withPrefix64k
0000000000002280 00000000000005fa t LZ4_decompress_safe_withSmallPrefix
0000000000015090 000000000000062f T LZ4_decompress_safe_partial
0000000000002880 00000000000008ea t LZ4_decompress_fast_extDict
0000000000016270 0000000000000993 t LZ4_decompress_safe_forceExtDict
2018-04-23 05:37:44 +00:00
{
return LZ4_decompress_generic ( source , dest , compressedSize , maxOutputSize ,
endOnInputSize , full , 0 , noDict ,
lz4.c: fixed the LZ4_decompress_safe_continue case
The previous change broke decoding with a ring buffer. That's because
I didn't realize that the "double dictionary mode" was possible, i.e.
that the decoding routine can look both at the first part of the
dictionary passed as prefix and the second part passed via dictStart+dictSize.
So this change introduces the LZ4_decompress_safe_doubleDict helper,
which handles this "double dictionary" situation. (This is a bit of
a misnomer, there is only one dictionary, but I can't think of a better
name, and perhaps the designation is not all too bad.) The helper is
used only once, in LZ4_decompress_safe_continue, it should be inlined
with LZ4_FORCE_O2_GCC_PPC64LE attached to LZ4_decompress_safe_continue.
(Also, in the helper functions, I change the dictStart parameter type
to "const void*", to avoid a cast when calling helpers. In the helpers,
the upcast to "BYTE*" is still required, for compatibility with C++.)
So this fixes the case of LZ4_decompress_safe_continue, and I'm
surprised by the fact that the fuzzer is now happy and does not detect
a similar problem with LZ4_decompress_fast_continue. So before fixing
LZ4_decompress_fast_continue, the next logical step is to enhance
the fuzzer.
2018-04-26 04:46:26 +00:00
( BYTE * ) dest - prefixSize , NULL , 0 ) ;
2013-12-30 17:16:52 +00:00
}
lz4.c: refactor the decoding routines
I noticed that LZ4_decompress_generic is sometimes instantiated with
identical set of parameters, or (what's worse) with a subtly different
sets of parameters. For example, LZ4_decompress_fast_withPrefix64k is
instantiated as follows:
return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize,
full, 0, withPrefix64k, (BYTE*)dest - 64 KB, NULL, 64 KB);
while the equivalent withPrefix64k call in LZ4_decompress_usingDict_generic
passes 0 for the last argument instead of 64 KB. It turns out that there
is no difference in this case: if you change 64 KB to 0 KB in
LZ4_decompress_fast_withPrefix64k, you get the same binary code.
Moreover, because it's been clarified that LZ4_decompress_fast doesn't
check match offsets, it is now obvious that both of these fast/withPrefix64k
instantiations are simply redundant. Exactly because LZ4_decompress_fast
doesn't check offsets, it serves well with any prefixed dictionary.
There's a difference, though, with LZ4_decompress_safe_withPrefix64k.
It also passes 64 KB as the last argument, and if you change that to 0,
as in LZ4_decompress_usingDict_generic, you get a completely different
binary code. It seems that passing 0 enables offset checking:
const int checkOffset = ((safeDecode) && (dictSize < (int)(64 KB)));
However, the resulting code seems to run a bit faster. How come
enabling extra checks can make the code run faster? Curiouser and
curiouser! This needs extra study. Currently I take the view that
the dictSize should be set to non-zero when nothing else will do,
i.e. when passing the external dictionary via dictStart. Otherwise,
lowPrefix betrays just enough information about the dictionary.
* * *
Anyway, with this change, I instantiate all the necessary cases as
functions with distinctive names, which also take fewer arguments and
are therefore less error-prone. I also make the functions non-inline.
(The compiler won't inline the functions because they are used more than
once. Hence I attach LZ4_FORCE_O2_GCC_PPC64LE to the instances while
removing from the callers.) The number of instances is now is reduced
from 18 (safe+fast+partial+4*continue+4*prefix+4*dict+2*prefix64+forceExtDict)
down to 7 (safe+fast+partial+2*prefix+2*dict). The size of the code is
not the only issue here. Separate helper function are much more
amenable to profile-guided optimization: it is enough to profile only
a few basic functions, while the other less-often used functions, such
as LZ4_decompress_*_continue, will benefit automatically.
This is the list of LZ4_decompress* functions in liblz4.so, sorted by size.
Exported functions are marked with a capital T.
$ nm -S lib/liblz4.so |grep -wi T |grep LZ4_decompress |sort -k2
0000000000016260 0000000000000005 T LZ4_decompress_fast_withPrefix64k
0000000000016dc0 0000000000000025 T LZ4_decompress_fast_usingDict
0000000000016d80 0000000000000040 T LZ4_decompress_safe_usingDict
0000000000016d10 000000000000006b T LZ4_decompress_fast_continue
0000000000016c70 000000000000009f T LZ4_decompress_safe_continue
00000000000156c0 000000000000059c T LZ4_decompress_fast
0000000000014a90 00000000000005fa T LZ4_decompress_safe
0000000000015c60 00000000000005fa T LZ4_decompress_safe_withPrefix64k
0000000000002280 00000000000005fa t LZ4_decompress_safe_withSmallPrefix
0000000000015090 000000000000062f T LZ4_decompress_safe_partial
0000000000002880 00000000000008ea t LZ4_decompress_fast_extDict
0000000000016270 0000000000000993 t LZ4_decompress_safe_forceExtDict
2018-04-23 05:37:44 +00:00
LZ4_FORCE_O2_GCC_PPC64LE /* Exported under another name, for tests/fullbench.c */
# define LZ4_decompress_safe_extDict LZ4_decompress_safe_forceExtDict
int LZ4_decompress_safe_extDict ( const char * source , char * dest , int compressedSize , int maxOutputSize ,
lz4.c: fixed the LZ4_decompress_safe_continue case
The previous change broke decoding with a ring buffer. That's because
I didn't realize that the "double dictionary mode" was possible, i.e.
that the decoding routine can look both at the first part of the
dictionary passed as prefix and the second part passed via dictStart+dictSize.
So this change introduces the LZ4_decompress_safe_doubleDict helper,
which handles this "double dictionary" situation. (This is a bit of
a misnomer, there is only one dictionary, but I can't think of a better
name, and perhaps the designation is not all too bad.) The helper is
used only once, in LZ4_decompress_safe_continue, it should be inlined
with LZ4_FORCE_O2_GCC_PPC64LE attached to LZ4_decompress_safe_continue.
(Also, in the helper functions, I change the dictStart parameter type
to "const void*", to avoid a cast when calling helpers. In the helpers,
the upcast to "BYTE*" is still required, for compatibility with C++.)
So this fixes the case of LZ4_decompress_safe_continue, and I'm
surprised by the fact that the fuzzer is now happy and does not detect
a similar problem with LZ4_decompress_fast_continue. So before fixing
LZ4_decompress_fast_continue, the next logical step is to enhance
the fuzzer.
2018-04-26 04:46:26 +00:00
const void * dictStart , size_t dictSize )
lz4.c: refactor the decoding routines
I noticed that LZ4_decompress_generic is sometimes instantiated with
identical set of parameters, or (what's worse) with a subtly different
sets of parameters. For example, LZ4_decompress_fast_withPrefix64k is
instantiated as follows:
return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize,
full, 0, withPrefix64k, (BYTE*)dest - 64 KB, NULL, 64 KB);
while the equivalent withPrefix64k call in LZ4_decompress_usingDict_generic
passes 0 for the last argument instead of 64 KB. It turns out that there
is no difference in this case: if you change 64 KB to 0 KB in
LZ4_decompress_fast_withPrefix64k, you get the same binary code.
Moreover, because it's been clarified that LZ4_decompress_fast doesn't
check match offsets, it is now obvious that both of these fast/withPrefix64k
instantiations are simply redundant. Exactly because LZ4_decompress_fast
doesn't check offsets, it serves well with any prefixed dictionary.
There's a difference, though, with LZ4_decompress_safe_withPrefix64k.
It also passes 64 KB as the last argument, and if you change that to 0,
as in LZ4_decompress_usingDict_generic, you get a completely different
binary code. It seems that passing 0 enables offset checking:
const int checkOffset = ((safeDecode) && (dictSize < (int)(64 KB)));
However, the resulting code seems to run a bit faster. How come
enabling extra checks can make the code run faster? Curiouser and
curiouser! This needs extra study. Currently I take the view that
the dictSize should be set to non-zero when nothing else will do,
i.e. when passing the external dictionary via dictStart. Otherwise,
lowPrefix betrays just enough information about the dictionary.
* * *
Anyway, with this change, I instantiate all the necessary cases as
functions with distinctive names, which also take fewer arguments and
are therefore less error-prone. I also make the functions non-inline.
(The compiler won't inline the functions because they are used more than
once. Hence I attach LZ4_FORCE_O2_GCC_PPC64LE to the instances while
removing from the callers.) The number of instances is now is reduced
from 18 (safe+fast+partial+4*continue+4*prefix+4*dict+2*prefix64+forceExtDict)
down to 7 (safe+fast+partial+2*prefix+2*dict). The size of the code is
not the only issue here. Separate helper function are much more
amenable to profile-guided optimization: it is enough to profile only
a few basic functions, while the other less-often used functions, such
as LZ4_decompress_*_continue, will benefit automatically.
This is the list of LZ4_decompress* functions in liblz4.so, sorted by size.
Exported functions are marked with a capital T.
$ nm -S lib/liblz4.so |grep -wi T |grep LZ4_decompress |sort -k2
0000000000016260 0000000000000005 T LZ4_decompress_fast_withPrefix64k
0000000000016dc0 0000000000000025 T LZ4_decompress_fast_usingDict
0000000000016d80 0000000000000040 T LZ4_decompress_safe_usingDict
0000000000016d10 000000000000006b T LZ4_decompress_fast_continue
0000000000016c70 000000000000009f T LZ4_decompress_safe_continue
00000000000156c0 000000000000059c T LZ4_decompress_fast
0000000000014a90 00000000000005fa T LZ4_decompress_safe
0000000000015c60 00000000000005fa T LZ4_decompress_safe_withPrefix64k
0000000000002280 00000000000005fa t LZ4_decompress_safe_withSmallPrefix
0000000000015090 000000000000062f T LZ4_decompress_safe_partial
0000000000002880 00000000000008ea t LZ4_decompress_fast_extDict
0000000000016270 0000000000000993 t LZ4_decompress_safe_forceExtDict
2018-04-23 05:37:44 +00:00
{
return LZ4_decompress_generic ( source , dest , compressedSize , maxOutputSize ,
endOnInputSize , full , 0 , usingExtDict ,
( BYTE * ) dest , ( const BYTE * ) dictStart , dictSize ) ;
}
LZ4_FORCE_O2_GCC_PPC64LE
static int LZ4_decompress_fast_extDict ( const char * source , char * dest , int originalSize ,
lz4.c: fixed the LZ4_decompress_safe_continue case
The previous change broke decoding with a ring buffer. That's because
I didn't realize that the "double dictionary mode" was possible, i.e.
that the decoding routine can look both at the first part of the
dictionary passed as prefix and the second part passed via dictStart+dictSize.
So this change introduces the LZ4_decompress_safe_doubleDict helper,
which handles this "double dictionary" situation. (This is a bit of
a misnomer, there is only one dictionary, but I can't think of a better
name, and perhaps the designation is not all too bad.) The helper is
used only once, in LZ4_decompress_safe_continue, it should be inlined
with LZ4_FORCE_O2_GCC_PPC64LE attached to LZ4_decompress_safe_continue.
(Also, in the helper functions, I change the dictStart parameter type
to "const void*", to avoid a cast when calling helpers. In the helpers,
the upcast to "BYTE*" is still required, for compatibility with C++.)
So this fixes the case of LZ4_decompress_safe_continue, and I'm
surprised by the fact that the fuzzer is now happy and does not detect
a similar problem with LZ4_decompress_fast_continue. So before fixing
LZ4_decompress_fast_continue, the next logical step is to enhance
the fuzzer.
2018-04-26 04:46:26 +00:00
const void * dictStart , size_t dictSize )
lz4.c: refactor the decoding routines
I noticed that LZ4_decompress_generic is sometimes instantiated with
identical set of parameters, or (what's worse) with a subtly different
sets of parameters. For example, LZ4_decompress_fast_withPrefix64k is
instantiated as follows:
return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize,
full, 0, withPrefix64k, (BYTE*)dest - 64 KB, NULL, 64 KB);
while the equivalent withPrefix64k call in LZ4_decompress_usingDict_generic
passes 0 for the last argument instead of 64 KB. It turns out that there
is no difference in this case: if you change 64 KB to 0 KB in
LZ4_decompress_fast_withPrefix64k, you get the same binary code.
Moreover, because it's been clarified that LZ4_decompress_fast doesn't
check match offsets, it is now obvious that both of these fast/withPrefix64k
instantiations are simply redundant. Exactly because LZ4_decompress_fast
doesn't check offsets, it serves well with any prefixed dictionary.
There's a difference, though, with LZ4_decompress_safe_withPrefix64k.
It also passes 64 KB as the last argument, and if you change that to 0,
as in LZ4_decompress_usingDict_generic, you get a completely different
binary code. It seems that passing 0 enables offset checking:
const int checkOffset = ((safeDecode) && (dictSize < (int)(64 KB)));
However, the resulting code seems to run a bit faster. How come
enabling extra checks can make the code run faster? Curiouser and
curiouser! This needs extra study. Currently I take the view that
the dictSize should be set to non-zero when nothing else will do,
i.e. when passing the external dictionary via dictStart. Otherwise,
lowPrefix betrays just enough information about the dictionary.
* * *
Anyway, with this change, I instantiate all the necessary cases as
functions with distinctive names, which also take fewer arguments and
are therefore less error-prone. I also make the functions non-inline.
(The compiler won't inline the functions because they are used more than
once. Hence I attach LZ4_FORCE_O2_GCC_PPC64LE to the instances while
removing from the callers.) The number of instances is now is reduced
from 18 (safe+fast+partial+4*continue+4*prefix+4*dict+2*prefix64+forceExtDict)
down to 7 (safe+fast+partial+2*prefix+2*dict). The size of the code is
not the only issue here. Separate helper function are much more
amenable to profile-guided optimization: it is enough to profile only
a few basic functions, while the other less-often used functions, such
as LZ4_decompress_*_continue, will benefit automatically.
This is the list of LZ4_decompress* functions in liblz4.so, sorted by size.
Exported functions are marked with a capital T.
$ nm -S lib/liblz4.so |grep -wi T |grep LZ4_decompress |sort -k2
0000000000016260 0000000000000005 T LZ4_decompress_fast_withPrefix64k
0000000000016dc0 0000000000000025 T LZ4_decompress_fast_usingDict
0000000000016d80 0000000000000040 T LZ4_decompress_safe_usingDict
0000000000016d10 000000000000006b T LZ4_decompress_fast_continue
0000000000016c70 000000000000009f T LZ4_decompress_safe_continue
00000000000156c0 000000000000059c T LZ4_decompress_fast
0000000000014a90 00000000000005fa T LZ4_decompress_safe
0000000000015c60 00000000000005fa T LZ4_decompress_safe_withPrefix64k
0000000000002280 00000000000005fa t LZ4_decompress_safe_withSmallPrefix
0000000000015090 000000000000062f T LZ4_decompress_safe_partial
0000000000002880 00000000000008ea t LZ4_decompress_fast_extDict
0000000000016270 0000000000000993 t LZ4_decompress_safe_forceExtDict
2018-04-23 05:37:44 +00:00
{
return LZ4_decompress_generic ( source , dest , 0 , originalSize ,
endOnOutputSize , full , 0 , usingExtDict ,
( BYTE * ) dest , ( const BYTE * ) dictStart , dictSize ) ;
}
2014-10-25 19:52:10 +00:00
lz4.c: fixed the LZ4_decompress_safe_continue case
The previous change broke decoding with a ring buffer. That's because
I didn't realize that the "double dictionary mode" was possible, i.e.
that the decoding routine can look both at the first part of the
dictionary passed as prefix and the second part passed via dictStart+dictSize.
So this change introduces the LZ4_decompress_safe_doubleDict helper,
which handles this "double dictionary" situation. (This is a bit of
a misnomer, there is only one dictionary, but I can't think of a better
name, and perhaps the designation is not all too bad.) The helper is
used only once, in LZ4_decompress_safe_continue, it should be inlined
with LZ4_FORCE_O2_GCC_PPC64LE attached to LZ4_decompress_safe_continue.
(Also, in the helper functions, I change the dictStart parameter type
to "const void*", to avoid a cast when calling helpers. In the helpers,
the upcast to "BYTE*" is still required, for compatibility with C++.)
So this fixes the case of LZ4_decompress_safe_continue, and I'm
surprised by the fact that the fuzzer is now happy and does not detect
a similar problem with LZ4_decompress_fast_continue. So before fixing
LZ4_decompress_fast_continue, the next logical step is to enhance
the fuzzer.
2018-04-26 04:46:26 +00:00
/* The "double dictionary" mode, for use with e.g. ring buffers: the first part
* of the dictionary is passed as prefix , and the second via dictStart + dictSize .
* These routines are used only once , in LZ4_decompress_ * _continue ( ) .
*/
LZ4_FORCE_INLINE
int LZ4_decompress_safe_doubleDict ( const char * source , char * dest , int compressedSize , int maxOutputSize ,
size_t prefixSize , const void * dictStart , size_t dictSize )
{
return LZ4_decompress_generic ( source , dest , compressedSize , maxOutputSize ,
endOnInputSize , full , 0 , usingExtDict ,
( BYTE * ) dest - prefixSize , ( const BYTE * ) dictStart , dictSize ) ;
}
2018-04-27 12:00:11 +00:00
LZ4_FORCE_INLINE
int LZ4_decompress_fast_doubleDict ( const char * source , char * dest , int originalSize ,
size_t prefixSize , const void * dictStart , size_t dictSize )
{
return LZ4_decompress_generic ( source , dest , 0 , originalSize ,
endOnOutputSize , full , 0 , usingExtDict ,
( BYTE * ) dest - prefixSize , ( const BYTE * ) dictStart , dictSize ) ;
}
2014-10-25 19:52:10 +00:00
2016-06-29 12:44:05 +00:00
/*===== streaming decompression functions =====*/
2014-06-17 20:41:59 +00:00
2014-07-14 22:04:10 +00:00
LZ4_streamDecode_t * LZ4_createStreamDecode ( void )
2014-06-17 20:41:59 +00:00
{
2018-01-26 22:29:50 +00:00
LZ4_streamDecode_t * lz4s = ( LZ4_streamDecode_t * ) ALLOC_AND_ZERO ( sizeof ( LZ4_streamDecode_t ) ) ;
2014-06-17 20:41:59 +00:00
return lz4s ;
2013-12-30 17:16:52 +00:00
}
2014-07-14 22:04:10 +00:00
int LZ4_freeStreamDecode ( LZ4_streamDecode_t * LZ4_stream )
{
2017-08-09 23:51:19 +00:00
if ( ! LZ4_stream ) return 0 ; /* support free on NULL */
2014-07-14 22:04:10 +00:00
FREEMEM ( LZ4_stream ) ;
return 0 ;
}
2018-05-02 19:56:37 +00:00
/*! LZ4_setStreamDecode() :
* Use this function to instruct where to find the dictionary .
* This function is not necessary if previous data is still available where it was decoded .
* Loading a size of 0 is allowed ( same effect as no dictionary ) .
* @ return : 1 if OK , 0 if error
2014-06-17 20:41:59 +00:00
*/
2014-07-14 22:04:10 +00:00
int LZ4_setStreamDecode ( LZ4_streamDecode_t * LZ4_streamDecode , const char * dictionary , int dictSize )
2013-12-30 17:16:52 +00:00
{
2016-11-11 21:00:02 +00:00
LZ4_streamDecode_t_internal * lz4sd = & LZ4_streamDecode - > internal_donotuse ;
2014-10-25 19:52:10 +00:00
lz4sd - > prefixSize = ( size_t ) dictSize ;
2015-05-06 00:58:24 +00:00
lz4sd - > prefixEnd = ( const BYTE * ) dictionary + dictSize ;
2014-10-25 19:52:10 +00:00
lz4sd - > externalDict = NULL ;
lz4sd - > extDictSize = 0 ;
2014-06-17 20:41:59 +00:00
return 1 ;
2013-12-30 17:16:52 +00:00
}
2018-05-02 19:56:37 +00:00
/*! LZ4_decoderRingBufferSize() :
* when setting a ring buffer for streaming decompression ( optional scenario ) ,
* provides the minimum size of this ring buffer
* to be compatible with any source respecting maxBlockSize condition .
* Note : in a ring buffer scenario ,
2018-05-03 14:56:33 +00:00
* blocks are presumed decompressed next to each other .
* When not enough space remains for next block ( remainingSize < maxBlockSize ) ,
* decoding resumes from beginning of ring buffer .
2018-05-02 19:56:37 +00:00
* @ return : minimum ring buffer size ,
* or 0 if there is an error ( invalid maxBlockSize ) .
*/
int LZ4_decoderRingBufferSize ( int maxBlockSize )
{
if ( maxBlockSize < 0 ) return 0 ;
if ( maxBlockSize > LZ4_MAX_INPUT_SIZE ) return 0 ;
if ( maxBlockSize < 16 ) maxBlockSize = 16 ;
return LZ4_DECODER_RING_BUFFER_SIZE ( maxBlockSize ) ;
}
2014-06-17 20:41:59 +00:00
/*
* _continue ( ) :
These decoding functions allow decompression of multiple blocks in " streaming " mode .
Previously decoded blocks must still be available at the memory position where they were decoded .
2014-06-19 21:54:16 +00:00
If it ' s not possible , save the relevant part of decoded data into a safe buffer ,
2014-10-25 19:52:10 +00:00
and indicate where it stands using LZ4_setStreamDecode ( )
2014-06-17 20:41:59 +00:00
*/
2017-10-13 19:53:37 +00:00
LZ4_FORCE_O2_GCC_PPC64LE
2014-07-14 22:04:10 +00:00
int LZ4_decompress_safe_continue ( LZ4_streamDecode_t * LZ4_streamDecode , const char * source , char * dest , int compressedSize , int maxOutputSize )
2014-05-04 12:26:05 +00:00
{
2016-11-11 21:00:02 +00:00
LZ4_streamDecode_t_internal * lz4sd = & LZ4_streamDecode - > internal_donotuse ;
2014-06-17 20:41:59 +00:00
int result ;
lz4.c: refactor the decoding routines
I noticed that LZ4_decompress_generic is sometimes instantiated with
identical set of parameters, or (what's worse) with a subtly different
sets of parameters. For example, LZ4_decompress_fast_withPrefix64k is
instantiated as follows:
return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize,
full, 0, withPrefix64k, (BYTE*)dest - 64 KB, NULL, 64 KB);
while the equivalent withPrefix64k call in LZ4_decompress_usingDict_generic
passes 0 for the last argument instead of 64 KB. It turns out that there
is no difference in this case: if you change 64 KB to 0 KB in
LZ4_decompress_fast_withPrefix64k, you get the same binary code.
Moreover, because it's been clarified that LZ4_decompress_fast doesn't
check match offsets, it is now obvious that both of these fast/withPrefix64k
instantiations are simply redundant. Exactly because LZ4_decompress_fast
doesn't check offsets, it serves well with any prefixed dictionary.
There's a difference, though, with LZ4_decompress_safe_withPrefix64k.
It also passes 64 KB as the last argument, and if you change that to 0,
as in LZ4_decompress_usingDict_generic, you get a completely different
binary code. It seems that passing 0 enables offset checking:
const int checkOffset = ((safeDecode) && (dictSize < (int)(64 KB)));
However, the resulting code seems to run a bit faster. How come
enabling extra checks can make the code run faster? Curiouser and
curiouser! This needs extra study. Currently I take the view that
the dictSize should be set to non-zero when nothing else will do,
i.e. when passing the external dictionary via dictStart. Otherwise,
lowPrefix betrays just enough information about the dictionary.
* * *
Anyway, with this change, I instantiate all the necessary cases as
functions with distinctive names, which also take fewer arguments and
are therefore less error-prone. I also make the functions non-inline.
(The compiler won't inline the functions because they are used more than
once. Hence I attach LZ4_FORCE_O2_GCC_PPC64LE to the instances while
removing from the callers.) The number of instances is now is reduced
from 18 (safe+fast+partial+4*continue+4*prefix+4*dict+2*prefix64+forceExtDict)
down to 7 (safe+fast+partial+2*prefix+2*dict). The size of the code is
not the only issue here. Separate helper function are much more
amenable to profile-guided optimization: it is enough to profile only
a few basic functions, while the other less-often used functions, such
as LZ4_decompress_*_continue, will benefit automatically.
This is the list of LZ4_decompress* functions in liblz4.so, sorted by size.
Exported functions are marked with a capital T.
$ nm -S lib/liblz4.so |grep -wi T |grep LZ4_decompress |sort -k2
0000000000016260 0000000000000005 T LZ4_decompress_fast_withPrefix64k
0000000000016dc0 0000000000000025 T LZ4_decompress_fast_usingDict
0000000000016d80 0000000000000040 T LZ4_decompress_safe_usingDict
0000000000016d10 000000000000006b T LZ4_decompress_fast_continue
0000000000016c70 000000000000009f T LZ4_decompress_safe_continue
00000000000156c0 000000000000059c T LZ4_decompress_fast
0000000000014a90 00000000000005fa T LZ4_decompress_safe
0000000000015c60 00000000000005fa T LZ4_decompress_safe_withPrefix64k
0000000000002280 00000000000005fa t LZ4_decompress_safe_withSmallPrefix
0000000000015090 000000000000062f T LZ4_decompress_safe_partial
0000000000002880 00000000000008ea t LZ4_decompress_fast_extDict
0000000000016270 0000000000000993 t LZ4_decompress_safe_forceExtDict
2018-04-23 05:37:44 +00:00
if ( lz4sd - > prefixSize = = 0 ) {
lz4.c: fixed the LZ4_decompress_safe_continue case
The previous change broke decoding with a ring buffer. That's because
I didn't realize that the "double dictionary mode" was possible, i.e.
that the decoding routine can look both at the first part of the
dictionary passed as prefix and the second part passed via dictStart+dictSize.
So this change introduces the LZ4_decompress_safe_doubleDict helper,
which handles this "double dictionary" situation. (This is a bit of
a misnomer, there is only one dictionary, but I can't think of a better
name, and perhaps the designation is not all too bad.) The helper is
used only once, in LZ4_decompress_safe_continue, it should be inlined
with LZ4_FORCE_O2_GCC_PPC64LE attached to LZ4_decompress_safe_continue.
(Also, in the helper functions, I change the dictStart parameter type
to "const void*", to avoid a cast when calling helpers. In the helpers,
the upcast to "BYTE*" is still required, for compatibility with C++.)
So this fixes the case of LZ4_decompress_safe_continue, and I'm
surprised by the fact that the fuzzer is now happy and does not detect
a similar problem with LZ4_decompress_fast_continue. So before fixing
LZ4_decompress_fast_continue, the next logical step is to enhance
the fuzzer.
2018-04-26 04:46:26 +00:00
/* The first call, no dictionary yet. */
assert ( lz4sd - > extDictSize = = 0 ) ;
lz4.c: refactor the decoding routines
I noticed that LZ4_decompress_generic is sometimes instantiated with
identical set of parameters, or (what's worse) with a subtly different
sets of parameters. For example, LZ4_decompress_fast_withPrefix64k is
instantiated as follows:
return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize,
full, 0, withPrefix64k, (BYTE*)dest - 64 KB, NULL, 64 KB);
while the equivalent withPrefix64k call in LZ4_decompress_usingDict_generic
passes 0 for the last argument instead of 64 KB. It turns out that there
is no difference in this case: if you change 64 KB to 0 KB in
LZ4_decompress_fast_withPrefix64k, you get the same binary code.
Moreover, because it's been clarified that LZ4_decompress_fast doesn't
check match offsets, it is now obvious that both of these fast/withPrefix64k
instantiations are simply redundant. Exactly because LZ4_decompress_fast
doesn't check offsets, it serves well with any prefixed dictionary.
There's a difference, though, with LZ4_decompress_safe_withPrefix64k.
It also passes 64 KB as the last argument, and if you change that to 0,
as in LZ4_decompress_usingDict_generic, you get a completely different
binary code. It seems that passing 0 enables offset checking:
const int checkOffset = ((safeDecode) && (dictSize < (int)(64 KB)));
However, the resulting code seems to run a bit faster. How come
enabling extra checks can make the code run faster? Curiouser and
curiouser! This needs extra study. Currently I take the view that
the dictSize should be set to non-zero when nothing else will do,
i.e. when passing the external dictionary via dictStart. Otherwise,
lowPrefix betrays just enough information about the dictionary.
* * *
Anyway, with this change, I instantiate all the necessary cases as
functions with distinctive names, which also take fewer arguments and
are therefore less error-prone. I also make the functions non-inline.
(The compiler won't inline the functions because they are used more than
once. Hence I attach LZ4_FORCE_O2_GCC_PPC64LE to the instances while
removing from the callers.) The number of instances is now is reduced
from 18 (safe+fast+partial+4*continue+4*prefix+4*dict+2*prefix64+forceExtDict)
down to 7 (safe+fast+partial+2*prefix+2*dict). The size of the code is
not the only issue here. Separate helper function are much more
amenable to profile-guided optimization: it is enough to profile only
a few basic functions, while the other less-often used functions, such
as LZ4_decompress_*_continue, will benefit automatically.
This is the list of LZ4_decompress* functions in liblz4.so, sorted by size.
Exported functions are marked with a capital T.
$ nm -S lib/liblz4.so |grep -wi T |grep LZ4_decompress |sort -k2
0000000000016260 0000000000000005 T LZ4_decompress_fast_withPrefix64k
0000000000016dc0 0000000000000025 T LZ4_decompress_fast_usingDict
0000000000016d80 0000000000000040 T LZ4_decompress_safe_usingDict
0000000000016d10 000000000000006b T LZ4_decompress_fast_continue
0000000000016c70 000000000000009f T LZ4_decompress_safe_continue
00000000000156c0 000000000000059c T LZ4_decompress_fast
0000000000014a90 00000000000005fa T LZ4_decompress_safe
0000000000015c60 00000000000005fa T LZ4_decompress_safe_withPrefix64k
0000000000002280 00000000000005fa t LZ4_decompress_safe_withSmallPrefix
0000000000015090 000000000000062f T LZ4_decompress_safe_partial
0000000000002880 00000000000008ea t LZ4_decompress_fast_extDict
0000000000016270 0000000000000993 t LZ4_decompress_safe_forceExtDict
2018-04-23 05:37:44 +00:00
result = LZ4_decompress_safe ( source , dest , compressedSize , maxOutputSize ) ;
if ( result < = 0 ) return result ;
lz4sd - > prefixSize = result ;
lz4sd - > prefixEnd = ( BYTE * ) dest + result ;
} else if ( lz4sd - > prefixEnd = = ( BYTE * ) dest ) {
lz4.c: fixed the LZ4_decompress_safe_continue case
The previous change broke decoding with a ring buffer. That's because
I didn't realize that the "double dictionary mode" was possible, i.e.
that the decoding routine can look both at the first part of the
dictionary passed as prefix and the second part passed via dictStart+dictSize.
So this change introduces the LZ4_decompress_safe_doubleDict helper,
which handles this "double dictionary" situation. (This is a bit of
a misnomer, there is only one dictionary, but I can't think of a better
name, and perhaps the designation is not all too bad.) The helper is
used only once, in LZ4_decompress_safe_continue, it should be inlined
with LZ4_FORCE_O2_GCC_PPC64LE attached to LZ4_decompress_safe_continue.
(Also, in the helper functions, I change the dictStart parameter type
to "const void*", to avoid a cast when calling helpers. In the helpers,
the upcast to "BYTE*" is still required, for compatibility with C++.)
So this fixes the case of LZ4_decompress_safe_continue, and I'm
surprised by the fact that the fuzzer is now happy and does not detect
a similar problem with LZ4_decompress_fast_continue. So before fixing
LZ4_decompress_fast_continue, the next logical step is to enhance
the fuzzer.
2018-04-26 04:46:26 +00:00
/* They're rolling the current segment. */
if ( lz4sd - > prefixSize > = 64 KB - 1 )
result = LZ4_decompress_safe_withPrefix64k ( source , dest , compressedSize , maxOutputSize ) ;
else if ( lz4sd - > extDictSize = = 0 )
result = LZ4_decompress_safe_withSmallPrefix ( source , dest , compressedSize , maxOutputSize ,
lz4sd - > prefixSize ) ;
else
result = LZ4_decompress_safe_doubleDict ( source , dest , compressedSize , maxOutputSize ,
lz4sd - > prefixSize , lz4sd - > externalDict , lz4sd - > extDictSize ) ;
2014-10-25 19:52:10 +00:00
if ( result < = 0 ) return result ;
lz4sd - > prefixSize + = result ;
lz4sd - > prefixEnd + = result ;
2016-08-20 22:08:38 +00:00
} else {
lz4.c: fixed the LZ4_decompress_safe_continue case
The previous change broke decoding with a ring buffer. That's because
I didn't realize that the "double dictionary mode" was possible, i.e.
that the decoding routine can look both at the first part of the
dictionary passed as prefix and the second part passed via dictStart+dictSize.
So this change introduces the LZ4_decompress_safe_doubleDict helper,
which handles this "double dictionary" situation. (This is a bit of
a misnomer, there is only one dictionary, but I can't think of a better
name, and perhaps the designation is not all too bad.) The helper is
used only once, in LZ4_decompress_safe_continue, it should be inlined
with LZ4_FORCE_O2_GCC_PPC64LE attached to LZ4_decompress_safe_continue.
(Also, in the helper functions, I change the dictStart parameter type
to "const void*", to avoid a cast when calling helpers. In the helpers,
the upcast to "BYTE*" is still required, for compatibility with C++.)
So this fixes the case of LZ4_decompress_safe_continue, and I'm
surprised by the fact that the fuzzer is now happy and does not detect
a similar problem with LZ4_decompress_fast_continue. So before fixing
LZ4_decompress_fast_continue, the next logical step is to enhance
the fuzzer.
2018-04-26 04:46:26 +00:00
/* The buffer wraps around, or they're switching to another buffer. */
2014-10-25 19:52:10 +00:00
lz4sd - > extDictSize = lz4sd - > prefixSize ;
lz4sd - > externalDict = lz4sd - > prefixEnd - lz4sd - > extDictSize ;
lz4.c: refactor the decoding routines
I noticed that LZ4_decompress_generic is sometimes instantiated with
identical set of parameters, or (what's worse) with a subtly different
sets of parameters. For example, LZ4_decompress_fast_withPrefix64k is
instantiated as follows:
return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize,
full, 0, withPrefix64k, (BYTE*)dest - 64 KB, NULL, 64 KB);
while the equivalent withPrefix64k call in LZ4_decompress_usingDict_generic
passes 0 for the last argument instead of 64 KB. It turns out that there
is no difference in this case: if you change 64 KB to 0 KB in
LZ4_decompress_fast_withPrefix64k, you get the same binary code.
Moreover, because it's been clarified that LZ4_decompress_fast doesn't
check match offsets, it is now obvious that both of these fast/withPrefix64k
instantiations are simply redundant. Exactly because LZ4_decompress_fast
doesn't check offsets, it serves well with any prefixed dictionary.
There's a difference, though, with LZ4_decompress_safe_withPrefix64k.
It also passes 64 KB as the last argument, and if you change that to 0,
as in LZ4_decompress_usingDict_generic, you get a completely different
binary code. It seems that passing 0 enables offset checking:
const int checkOffset = ((safeDecode) && (dictSize < (int)(64 KB)));
However, the resulting code seems to run a bit faster. How come
enabling extra checks can make the code run faster? Curiouser and
curiouser! This needs extra study. Currently I take the view that
the dictSize should be set to non-zero when nothing else will do,
i.e. when passing the external dictionary via dictStart. Otherwise,
lowPrefix betrays just enough information about the dictionary.
* * *
Anyway, with this change, I instantiate all the necessary cases as
functions with distinctive names, which also take fewer arguments and
are therefore less error-prone. I also make the functions non-inline.
(The compiler won't inline the functions because they are used more than
once. Hence I attach LZ4_FORCE_O2_GCC_PPC64LE to the instances while
removing from the callers.) The number of instances is now is reduced
from 18 (safe+fast+partial+4*continue+4*prefix+4*dict+2*prefix64+forceExtDict)
down to 7 (safe+fast+partial+2*prefix+2*dict). The size of the code is
not the only issue here. Separate helper function are much more
amenable to profile-guided optimization: it is enough to profile only
a few basic functions, while the other less-often used functions, such
as LZ4_decompress_*_continue, will benefit automatically.
This is the list of LZ4_decompress* functions in liblz4.so, sorted by size.
Exported functions are marked with a capital T.
$ nm -S lib/liblz4.so |grep -wi T |grep LZ4_decompress |sort -k2
0000000000016260 0000000000000005 T LZ4_decompress_fast_withPrefix64k
0000000000016dc0 0000000000000025 T LZ4_decompress_fast_usingDict
0000000000016d80 0000000000000040 T LZ4_decompress_safe_usingDict
0000000000016d10 000000000000006b T LZ4_decompress_fast_continue
0000000000016c70 000000000000009f T LZ4_decompress_safe_continue
00000000000156c0 000000000000059c T LZ4_decompress_fast
0000000000014a90 00000000000005fa T LZ4_decompress_safe
0000000000015c60 00000000000005fa T LZ4_decompress_safe_withPrefix64k
0000000000002280 00000000000005fa t LZ4_decompress_safe_withSmallPrefix
0000000000015090 000000000000062f T LZ4_decompress_safe_partial
0000000000002880 00000000000008ea t LZ4_decompress_fast_extDict
0000000000016270 0000000000000993 t LZ4_decompress_safe_forceExtDict
2018-04-23 05:37:44 +00:00
result = LZ4_decompress_safe_extDict ( source , dest , compressedSize , maxOutputSize ,
lz4.c: fixed the LZ4_decompress_safe_continue case
The previous change broke decoding with a ring buffer. That's because
I didn't realize that the "double dictionary mode" was possible, i.e.
that the decoding routine can look both at the first part of the
dictionary passed as prefix and the second part passed via dictStart+dictSize.
So this change introduces the LZ4_decompress_safe_doubleDict helper,
which handles this "double dictionary" situation. (This is a bit of
a misnomer, there is only one dictionary, but I can't think of a better
name, and perhaps the designation is not all too bad.) The helper is
used only once, in LZ4_decompress_safe_continue, it should be inlined
with LZ4_FORCE_O2_GCC_PPC64LE attached to LZ4_decompress_safe_continue.
(Also, in the helper functions, I change the dictStart parameter type
to "const void*", to avoid a cast when calling helpers. In the helpers,
the upcast to "BYTE*" is still required, for compatibility with C++.)
So this fixes the case of LZ4_decompress_safe_continue, and I'm
surprised by the fact that the fuzzer is now happy and does not detect
a similar problem with LZ4_decompress_fast_continue. So before fixing
LZ4_decompress_fast_continue, the next logical step is to enhance
the fuzzer.
2018-04-26 04:46:26 +00:00
lz4sd - > externalDict , lz4sd - > extDictSize ) ;
2014-10-25 19:52:10 +00:00
if ( result < = 0 ) return result ;
lz4sd - > prefixSize = result ;
lz4sd - > prefixEnd = ( BYTE * ) dest + result ;
2014-06-19 21:54:16 +00:00
}
2014-06-17 20:41:59 +00:00
return result ;
}
2017-10-13 19:53:37 +00:00
LZ4_FORCE_O2_GCC_PPC64LE
2014-07-14 22:04:10 +00:00
int LZ4_decompress_fast_continue ( LZ4_streamDecode_t * LZ4_streamDecode , const char * source , char * dest , int originalSize )
2014-06-17 20:41:59 +00:00
{
2016-11-11 21:00:02 +00:00
LZ4_streamDecode_t_internal * lz4sd = & LZ4_streamDecode - > internal_donotuse ;
2014-06-17 20:41:59 +00:00
int result ;
2018-04-27 12:00:11 +00:00
if ( lz4sd - > prefixSize = = 0 ) {
assert ( lz4sd - > extDictSize = = 0 ) ;
lz4.c: refactor the decoding routines
I noticed that LZ4_decompress_generic is sometimes instantiated with
identical set of parameters, or (what's worse) with a subtly different
sets of parameters. For example, LZ4_decompress_fast_withPrefix64k is
instantiated as follows:
return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize,
full, 0, withPrefix64k, (BYTE*)dest - 64 KB, NULL, 64 KB);
while the equivalent withPrefix64k call in LZ4_decompress_usingDict_generic
passes 0 for the last argument instead of 64 KB. It turns out that there
is no difference in this case: if you change 64 KB to 0 KB in
LZ4_decompress_fast_withPrefix64k, you get the same binary code.
Moreover, because it's been clarified that LZ4_decompress_fast doesn't
check match offsets, it is now obvious that both of these fast/withPrefix64k
instantiations are simply redundant. Exactly because LZ4_decompress_fast
doesn't check offsets, it serves well with any prefixed dictionary.
There's a difference, though, with LZ4_decompress_safe_withPrefix64k.
It also passes 64 KB as the last argument, and if you change that to 0,
as in LZ4_decompress_usingDict_generic, you get a completely different
binary code. It seems that passing 0 enables offset checking:
const int checkOffset = ((safeDecode) && (dictSize < (int)(64 KB)));
However, the resulting code seems to run a bit faster. How come
enabling extra checks can make the code run faster? Curiouser and
curiouser! This needs extra study. Currently I take the view that
the dictSize should be set to non-zero when nothing else will do,
i.e. when passing the external dictionary via dictStart. Otherwise,
lowPrefix betrays just enough information about the dictionary.
* * *
Anyway, with this change, I instantiate all the necessary cases as
functions with distinctive names, which also take fewer arguments and
are therefore less error-prone. I also make the functions non-inline.
(The compiler won't inline the functions because they are used more than
once. Hence I attach LZ4_FORCE_O2_GCC_PPC64LE to the instances while
removing from the callers.) The number of instances is now is reduced
from 18 (safe+fast+partial+4*continue+4*prefix+4*dict+2*prefix64+forceExtDict)
down to 7 (safe+fast+partial+2*prefix+2*dict). The size of the code is
not the only issue here. Separate helper function are much more
amenable to profile-guided optimization: it is enough to profile only
a few basic functions, while the other less-often used functions, such
as LZ4_decompress_*_continue, will benefit automatically.
This is the list of LZ4_decompress* functions in liblz4.so, sorted by size.
Exported functions are marked with a capital T.
$ nm -S lib/liblz4.so |grep -wi T |grep LZ4_decompress |sort -k2
0000000000016260 0000000000000005 T LZ4_decompress_fast_withPrefix64k
0000000000016dc0 0000000000000025 T LZ4_decompress_fast_usingDict
0000000000016d80 0000000000000040 T LZ4_decompress_safe_usingDict
0000000000016d10 000000000000006b T LZ4_decompress_fast_continue
0000000000016c70 000000000000009f T LZ4_decompress_safe_continue
00000000000156c0 000000000000059c T LZ4_decompress_fast
0000000000014a90 00000000000005fa T LZ4_decompress_safe
0000000000015c60 00000000000005fa T LZ4_decompress_safe_withPrefix64k
0000000000002280 00000000000005fa t LZ4_decompress_safe_withSmallPrefix
0000000000015090 000000000000062f T LZ4_decompress_safe_partial
0000000000002880 00000000000008ea t LZ4_decompress_fast_extDict
0000000000016270 0000000000000993 t LZ4_decompress_safe_forceExtDict
2018-04-23 05:37:44 +00:00
result = LZ4_decompress_fast ( source , dest , originalSize ) ;
2014-10-25 19:52:10 +00:00
if ( result < = 0 ) return result ;
2018-04-27 12:00:11 +00:00
lz4sd - > prefixSize = originalSize ;
lz4sd - > prefixEnd = ( BYTE * ) dest + originalSize ;
} else if ( lz4sd - > prefixEnd = = ( BYTE * ) dest ) {
if ( lz4sd - > prefixSize > = 64 KB - 1 | | lz4sd - > extDictSize = = 0 )
result = LZ4_decompress_fast ( source , dest , originalSize ) ;
else
result = LZ4_decompress_fast_doubleDict ( source , dest , originalSize ,
lz4sd - > prefixSize , lz4sd - > externalDict , lz4sd - > extDictSize ) ;
2014-10-25 19:52:10 +00:00
if ( result < = 0 ) return result ;
lz4sd - > prefixSize + = originalSize ;
lz4sd - > prefixEnd + = originalSize ;
2016-08-20 22:08:38 +00:00
} else {
2014-10-25 19:52:10 +00:00
lz4sd - > extDictSize = lz4sd - > prefixSize ;
2016-11-05 02:59:50 +00:00
lz4sd - > externalDict = lz4sd - > prefixEnd - lz4sd - > extDictSize ;
lz4.c: refactor the decoding routines
I noticed that LZ4_decompress_generic is sometimes instantiated with
identical set of parameters, or (what's worse) with a subtly different
sets of parameters. For example, LZ4_decompress_fast_withPrefix64k is
instantiated as follows:
return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize,
full, 0, withPrefix64k, (BYTE*)dest - 64 KB, NULL, 64 KB);
while the equivalent withPrefix64k call in LZ4_decompress_usingDict_generic
passes 0 for the last argument instead of 64 KB. It turns out that there
is no difference in this case: if you change 64 KB to 0 KB in
LZ4_decompress_fast_withPrefix64k, you get the same binary code.
Moreover, because it's been clarified that LZ4_decompress_fast doesn't
check match offsets, it is now obvious that both of these fast/withPrefix64k
instantiations are simply redundant. Exactly because LZ4_decompress_fast
doesn't check offsets, it serves well with any prefixed dictionary.
There's a difference, though, with LZ4_decompress_safe_withPrefix64k.
It also passes 64 KB as the last argument, and if you change that to 0,
as in LZ4_decompress_usingDict_generic, you get a completely different
binary code. It seems that passing 0 enables offset checking:
const int checkOffset = ((safeDecode) && (dictSize < (int)(64 KB)));
However, the resulting code seems to run a bit faster. How come
enabling extra checks can make the code run faster? Curiouser and
curiouser! This needs extra study. Currently I take the view that
the dictSize should be set to non-zero when nothing else will do,
i.e. when passing the external dictionary via dictStart. Otherwise,
lowPrefix betrays just enough information about the dictionary.
* * *
Anyway, with this change, I instantiate all the necessary cases as
functions with distinctive names, which also take fewer arguments and
are therefore less error-prone. I also make the functions non-inline.
(The compiler won't inline the functions because they are used more than
once. Hence I attach LZ4_FORCE_O2_GCC_PPC64LE to the instances while
removing from the callers.) The number of instances is now is reduced
from 18 (safe+fast+partial+4*continue+4*prefix+4*dict+2*prefix64+forceExtDict)
down to 7 (safe+fast+partial+2*prefix+2*dict). The size of the code is
not the only issue here. Separate helper function are much more
amenable to profile-guided optimization: it is enough to profile only
a few basic functions, while the other less-often used functions, such
as LZ4_decompress_*_continue, will benefit automatically.
This is the list of LZ4_decompress* functions in liblz4.so, sorted by size.
Exported functions are marked with a capital T.
$ nm -S lib/liblz4.so |grep -wi T |grep LZ4_decompress |sort -k2
0000000000016260 0000000000000005 T LZ4_decompress_fast_withPrefix64k
0000000000016dc0 0000000000000025 T LZ4_decompress_fast_usingDict
0000000000016d80 0000000000000040 T LZ4_decompress_safe_usingDict
0000000000016d10 000000000000006b T LZ4_decompress_fast_continue
0000000000016c70 000000000000009f T LZ4_decompress_safe_continue
00000000000156c0 000000000000059c T LZ4_decompress_fast
0000000000014a90 00000000000005fa T LZ4_decompress_safe
0000000000015c60 00000000000005fa T LZ4_decompress_safe_withPrefix64k
0000000000002280 00000000000005fa t LZ4_decompress_safe_withSmallPrefix
0000000000015090 000000000000062f T LZ4_decompress_safe_partial
0000000000002880 00000000000008ea t LZ4_decompress_fast_extDict
0000000000016270 0000000000000993 t LZ4_decompress_safe_forceExtDict
2018-04-23 05:37:44 +00:00
result = LZ4_decompress_fast_extDict ( source , dest , originalSize ,
2018-04-27 12:00:11 +00:00
lz4sd - > externalDict , lz4sd - > extDictSize ) ;
2014-10-25 19:52:10 +00:00
if ( result < = 0 ) return result ;
lz4sd - > prefixSize = originalSize ;
lz4sd - > prefixEnd = ( BYTE * ) dest + originalSize ;
2014-06-19 21:54:16 +00:00
}
2014-06-17 20:41:59 +00:00
return result ;
}
/*
Advanced decoding functions :
* _usingDict ( ) :
These decoding functions work the same as " _continue " ones ,
the dictionary must be explicitly provided within parameters
*/
int LZ4_decompress_safe_usingDict ( const char * source , char * dest , int compressedSize , int maxOutputSize , const char * dictStart , int dictSize )
2014-09-13 18:49:01 +00:00
{
2014-09-21 08:56:21 +00:00
if ( dictSize = = 0 )
lz4.c: refactor the decoding routines
I noticed that LZ4_decompress_generic is sometimes instantiated with
identical set of parameters, or (what's worse) with a subtly different
sets of parameters. For example, LZ4_decompress_fast_withPrefix64k is
instantiated as follows:
return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize,
full, 0, withPrefix64k, (BYTE*)dest - 64 KB, NULL, 64 KB);
while the equivalent withPrefix64k call in LZ4_decompress_usingDict_generic
passes 0 for the last argument instead of 64 KB. It turns out that there
is no difference in this case: if you change 64 KB to 0 KB in
LZ4_decompress_fast_withPrefix64k, you get the same binary code.
Moreover, because it's been clarified that LZ4_decompress_fast doesn't
check match offsets, it is now obvious that both of these fast/withPrefix64k
instantiations are simply redundant. Exactly because LZ4_decompress_fast
doesn't check offsets, it serves well with any prefixed dictionary.
There's a difference, though, with LZ4_decompress_safe_withPrefix64k.
It also passes 64 KB as the last argument, and if you change that to 0,
as in LZ4_decompress_usingDict_generic, you get a completely different
binary code. It seems that passing 0 enables offset checking:
const int checkOffset = ((safeDecode) && (dictSize < (int)(64 KB)));
However, the resulting code seems to run a bit faster. How come
enabling extra checks can make the code run faster? Curiouser and
curiouser! This needs extra study. Currently I take the view that
the dictSize should be set to non-zero when nothing else will do,
i.e. when passing the external dictionary via dictStart. Otherwise,
lowPrefix betrays just enough information about the dictionary.
* * *
Anyway, with this change, I instantiate all the necessary cases as
functions with distinctive names, which also take fewer arguments and
are therefore less error-prone. I also make the functions non-inline.
(The compiler won't inline the functions because they are used more than
once. Hence I attach LZ4_FORCE_O2_GCC_PPC64LE to the instances while
removing from the callers.) The number of instances is now is reduced
from 18 (safe+fast+partial+4*continue+4*prefix+4*dict+2*prefix64+forceExtDict)
down to 7 (safe+fast+partial+2*prefix+2*dict). The size of the code is
not the only issue here. Separate helper function are much more
amenable to profile-guided optimization: it is enough to profile only
a few basic functions, while the other less-often used functions, such
as LZ4_decompress_*_continue, will benefit automatically.
This is the list of LZ4_decompress* functions in liblz4.so, sorted by size.
Exported functions are marked with a capital T.
$ nm -S lib/liblz4.so |grep -wi T |grep LZ4_decompress |sort -k2
0000000000016260 0000000000000005 T LZ4_decompress_fast_withPrefix64k
0000000000016dc0 0000000000000025 T LZ4_decompress_fast_usingDict
0000000000016d80 0000000000000040 T LZ4_decompress_safe_usingDict
0000000000016d10 000000000000006b T LZ4_decompress_fast_continue
0000000000016c70 000000000000009f T LZ4_decompress_safe_continue
00000000000156c0 000000000000059c T LZ4_decompress_fast
0000000000014a90 00000000000005fa T LZ4_decompress_safe
0000000000015c60 00000000000005fa T LZ4_decompress_safe_withPrefix64k
0000000000002280 00000000000005fa t LZ4_decompress_safe_withSmallPrefix
0000000000015090 000000000000062f T LZ4_decompress_safe_partial
0000000000002880 00000000000008ea t LZ4_decompress_fast_extDict
0000000000016270 0000000000000993 t LZ4_decompress_safe_forceExtDict
2018-04-23 05:37:44 +00:00
return LZ4_decompress_safe ( source , dest , compressedSize , maxOutputSize ) ;
2016-09-06 14:46:52 +00:00
if ( dictStart + dictSize = = dest ) {
lz4.c: fixed the LZ4_decompress_safe_continue case
The previous change broke decoding with a ring buffer. That's because
I didn't realize that the "double dictionary mode" was possible, i.e.
that the decoding routine can look both at the first part of the
dictionary passed as prefix and the second part passed via dictStart+dictSize.
So this change introduces the LZ4_decompress_safe_doubleDict helper,
which handles this "double dictionary" situation. (This is a bit of
a misnomer, there is only one dictionary, but I can't think of a better
name, and perhaps the designation is not all too bad.) The helper is
used only once, in LZ4_decompress_safe_continue, it should be inlined
with LZ4_FORCE_O2_GCC_PPC64LE attached to LZ4_decompress_safe_continue.
(Also, in the helper functions, I change the dictStart parameter type
to "const void*", to avoid a cast when calling helpers. In the helpers,
the upcast to "BYTE*" is still required, for compatibility with C++.)
So this fixes the case of LZ4_decompress_safe_continue, and I'm
surprised by the fact that the fuzzer is now happy and does not detect
a similar problem with LZ4_decompress_fast_continue. So before fixing
LZ4_decompress_fast_continue, the next logical step is to enhance
the fuzzer.
2018-04-26 04:46:26 +00:00
if ( dictSize > = 64 KB - 1 )
return LZ4_decompress_safe_withPrefix64k ( source , dest , compressedSize , maxOutputSize ) ;
return LZ4_decompress_safe_withSmallPrefix ( source , dest , compressedSize , maxOutputSize , dictSize ) ;
2014-10-27 23:39:06 +00:00
}
lz4.c: refactor the decoding routines
I noticed that LZ4_decompress_generic is sometimes instantiated with
identical set of parameters, or (what's worse) with a subtly different
sets of parameters. For example, LZ4_decompress_fast_withPrefix64k is
instantiated as follows:
return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize,
full, 0, withPrefix64k, (BYTE*)dest - 64 KB, NULL, 64 KB);
while the equivalent withPrefix64k call in LZ4_decompress_usingDict_generic
passes 0 for the last argument instead of 64 KB. It turns out that there
is no difference in this case: if you change 64 KB to 0 KB in
LZ4_decompress_fast_withPrefix64k, you get the same binary code.
Moreover, because it's been clarified that LZ4_decompress_fast doesn't
check match offsets, it is now obvious that both of these fast/withPrefix64k
instantiations are simply redundant. Exactly because LZ4_decompress_fast
doesn't check offsets, it serves well with any prefixed dictionary.
There's a difference, though, with LZ4_decompress_safe_withPrefix64k.
It also passes 64 KB as the last argument, and if you change that to 0,
as in LZ4_decompress_usingDict_generic, you get a completely different
binary code. It seems that passing 0 enables offset checking:
const int checkOffset = ((safeDecode) && (dictSize < (int)(64 KB)));
However, the resulting code seems to run a bit faster. How come
enabling extra checks can make the code run faster? Curiouser and
curiouser! This needs extra study. Currently I take the view that
the dictSize should be set to non-zero when nothing else will do,
i.e. when passing the external dictionary via dictStart. Otherwise,
lowPrefix betrays just enough information about the dictionary.
* * *
Anyway, with this change, I instantiate all the necessary cases as
functions with distinctive names, which also take fewer arguments and
are therefore less error-prone. I also make the functions non-inline.
(The compiler won't inline the functions because they are used more than
once. Hence I attach LZ4_FORCE_O2_GCC_PPC64LE to the instances while
removing from the callers.) The number of instances is now is reduced
from 18 (safe+fast+partial+4*continue+4*prefix+4*dict+2*prefix64+forceExtDict)
down to 7 (safe+fast+partial+2*prefix+2*dict). The size of the code is
not the only issue here. Separate helper function are much more
amenable to profile-guided optimization: it is enough to profile only
a few basic functions, while the other less-often used functions, such
as LZ4_decompress_*_continue, will benefit automatically.
This is the list of LZ4_decompress* functions in liblz4.so, sorted by size.
Exported functions are marked with a capital T.
$ nm -S lib/liblz4.so |grep -wi T |grep LZ4_decompress |sort -k2
0000000000016260 0000000000000005 T LZ4_decompress_fast_withPrefix64k
0000000000016dc0 0000000000000025 T LZ4_decompress_fast_usingDict
0000000000016d80 0000000000000040 T LZ4_decompress_safe_usingDict
0000000000016d10 000000000000006b T LZ4_decompress_fast_continue
0000000000016c70 000000000000009f T LZ4_decompress_safe_continue
00000000000156c0 000000000000059c T LZ4_decompress_fast
0000000000014a90 00000000000005fa T LZ4_decompress_safe
0000000000015c60 00000000000005fa T LZ4_decompress_safe_withPrefix64k
0000000000002280 00000000000005fa t LZ4_decompress_safe_withSmallPrefix
0000000000015090 000000000000062f T LZ4_decompress_safe_partial
0000000000002880 00000000000008ea t LZ4_decompress_fast_extDict
0000000000016270 0000000000000993 t LZ4_decompress_safe_forceExtDict
2018-04-23 05:37:44 +00:00
return LZ4_decompress_safe_extDict ( source , dest , compressedSize , maxOutputSize , dictStart , dictSize ) ;
2014-05-04 12:26:05 +00:00
}
int LZ4_decompress_fast_usingDict ( const char * source , char * dest , int originalSize , const char * dictStart , int dictSize )
{
lz4.c: refactor the decoding routines
I noticed that LZ4_decompress_generic is sometimes instantiated with
identical set of parameters, or (what's worse) with a subtly different
sets of parameters. For example, LZ4_decompress_fast_withPrefix64k is
instantiated as follows:
return LZ4_decompress_generic(source, dest, 0, originalSize, endOnOutputSize,
full, 0, withPrefix64k, (BYTE*)dest - 64 KB, NULL, 64 KB);
while the equivalent withPrefix64k call in LZ4_decompress_usingDict_generic
passes 0 for the last argument instead of 64 KB. It turns out that there
is no difference in this case: if you change 64 KB to 0 KB in
LZ4_decompress_fast_withPrefix64k, you get the same binary code.
Moreover, because it's been clarified that LZ4_decompress_fast doesn't
check match offsets, it is now obvious that both of these fast/withPrefix64k
instantiations are simply redundant. Exactly because LZ4_decompress_fast
doesn't check offsets, it serves well with any prefixed dictionary.
There's a difference, though, with LZ4_decompress_safe_withPrefix64k.
It also passes 64 KB as the last argument, and if you change that to 0,
as in LZ4_decompress_usingDict_generic, you get a completely different
binary code. It seems that passing 0 enables offset checking:
const int checkOffset = ((safeDecode) && (dictSize < (int)(64 KB)));
However, the resulting code seems to run a bit faster. How come
enabling extra checks can make the code run faster? Curiouser and
curiouser! This needs extra study. Currently I take the view that
the dictSize should be set to non-zero when nothing else will do,
i.e. when passing the external dictionary via dictStart. Otherwise,
lowPrefix betrays just enough information about the dictionary.
* * *
Anyway, with this change, I instantiate all the necessary cases as
functions with distinctive names, which also take fewer arguments and
are therefore less error-prone. I also make the functions non-inline.
(The compiler won't inline the functions because they are used more than
once. Hence I attach LZ4_FORCE_O2_GCC_PPC64LE to the instances while
removing from the callers.) The number of instances is now is reduced
from 18 (safe+fast+partial+4*continue+4*prefix+4*dict+2*prefix64+forceExtDict)
down to 7 (safe+fast+partial+2*prefix+2*dict). The size of the code is
not the only issue here. Separate helper function are much more
amenable to profile-guided optimization: it is enough to profile only
a few basic functions, while the other less-often used functions, such
as LZ4_decompress_*_continue, will benefit automatically.
This is the list of LZ4_decompress* functions in liblz4.so, sorted by size.
Exported functions are marked with a capital T.
$ nm -S lib/liblz4.so |grep -wi T |grep LZ4_decompress |sort -k2
0000000000016260 0000000000000005 T LZ4_decompress_fast_withPrefix64k
0000000000016dc0 0000000000000025 T LZ4_decompress_fast_usingDict
0000000000016d80 0000000000000040 T LZ4_decompress_safe_usingDict
0000000000016d10 000000000000006b T LZ4_decompress_fast_continue
0000000000016c70 000000000000009f T LZ4_decompress_safe_continue
00000000000156c0 000000000000059c T LZ4_decompress_fast
0000000000014a90 00000000000005fa T LZ4_decompress_safe
0000000000015c60 00000000000005fa T LZ4_decompress_safe_withPrefix64k
0000000000002280 00000000000005fa t LZ4_decompress_safe_withSmallPrefix
0000000000015090 000000000000062f T LZ4_decompress_safe_partial
0000000000002880 00000000000008ea t LZ4_decompress_fast_extDict
0000000000016270 0000000000000993 t LZ4_decompress_safe_forceExtDict
2018-04-23 05:37:44 +00:00
if ( dictSize = = 0 | | dictStart + dictSize = = dest )
return LZ4_decompress_fast ( source , dest , originalSize ) ;
return LZ4_decompress_fast_extDict ( source , dest , originalSize , dictStart , dictSize ) ;
2014-05-04 12:26:05 +00:00
}
2014-04-28 20:45:35 +00:00
2016-08-20 22:08:38 +00:00
/*=*************************************************
2015-03-17 17:02:01 +00:00
* Obsolete Functions
2014-06-17 20:41:59 +00:00
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
2015-04-09 12:34:38 +00:00
/* obsolete compression functions */
2018-04-19 17:50:40 +00:00
int LZ4_compress_limitedOutput ( const char * source , char * dest , int inputSize , int maxOutputSize )
{
return LZ4_compress_default ( source , dest , inputSize , maxOutputSize ) ;
}
int LZ4_compress ( const char * source , char * dest , int inputSize )
{
return LZ4_compress_default ( source , dest , inputSize , LZ4_compressBound ( inputSize ) ) ;
}
int LZ4_compress_limitedOutput_withState ( void * state , const char * src , char * dst , int srcSize , int dstSize )
{
return LZ4_compress_fast_extState ( state , src , dst , srcSize , dstSize , 1 ) ;
}
int LZ4_compress_withState ( void * state , const char * src , char * dst , int srcSize )
{
return LZ4_compress_fast_extState ( state , src , dst , srcSize , LZ4_compressBound ( srcSize ) , 1 ) ;
}
int LZ4_compress_limitedOutput_continue ( LZ4_stream_t * LZ4_stream , const char * src , char * dst , int srcSize , int dstCapacity )
{
return LZ4_compress_fast_continue ( LZ4_stream , src , dst , srcSize , dstCapacity , 1 ) ;
}
int LZ4_compress_continue ( LZ4_stream_t * LZ4_stream , const char * source , char * dest , int inputSize )
{
return LZ4_compress_fast_continue ( LZ4_stream , source , dest , inputSize , LZ4_compressBound ( inputSize ) , 1 ) ;
}
2015-04-09 12:34:38 +00:00
2014-04-28 20:45:35 +00:00
/*
2018-04-19 17:50:40 +00:00
These decompression functions are deprecated and should no longer be used .
2014-06-09 00:01:04 +00:00
They are only provided here for compatibility with older user programs .
- LZ4_uncompress is totally equivalent to LZ4_decompress_fast
- LZ4_uncompress_unknownOutputSize is totally equivalent to LZ4_decompress_safe
2014-04-28 20:45:35 +00:00
*/
2018-04-19 17:50:40 +00:00
int LZ4_uncompress ( const char * source , char * dest , int outputSize )
{
return LZ4_decompress_fast ( source , dest , outputSize ) ;
}
int LZ4_uncompress_unknownOutputSize ( const char * source , char * dest , int isize , int maxOutputSize )
{
return LZ4_decompress_safe ( source , dest , isize , maxOutputSize ) ;
}
2014-05-19 23:40:29 +00:00
2018-03-13 19:42:03 +00:00
/* Obsolete Streaming functions */
int LZ4_sizeofStreamState ( ) { return LZ4_STREAMSIZE ; }
2014-06-09 00:01:04 +00:00
2018-03-14 19:51:59 +00:00
int LZ4_resetStreamState ( void * state , char * inputBuffer )
{
( void ) inputBuffer ;
LZ4_resetStream ( ( LZ4_stream_t * ) state ) ;
return 0 ;
}
void * LZ4_create ( char * inputBuffer )
{
( void ) inputBuffer ;
return LZ4_createStream ( ) ;
}
char * LZ4_slideInputBuffer ( void * state )
{
2018-03-21 14:07:24 +00:00
/* avoid const char * -> char * conversion warning */
2018-03-14 19:51:59 +00:00
return ( char * ) ( uptrval ) ( ( LZ4_stream_t * ) state ) - > internal_donotuse . dictionary ;
}
2014-11-29 19:19:39 +00:00
# endif /* LZ4_COMMONDEFS_ONLY */