]> git.ipfire.org Git - thirdparty/zlib-ng.git/log
thirdparty/zlib-ng.git
6 years agoFixed optimizations not being used when compiler is msvc. (#376)
Nathan Moinvaziri [Sun, 11 Aug 2019 10:49:01 +0000 (03:49 -0700)] 
Fixed optimizations not being used when compiler is msvc. (#376)

This issue I mentioned in #370. Optimization code such as crc_folding.c, deflate_quick_sse.c, fill_window_sse.c, and insert_string_sse.c were not being compiled when the compiler was MSVC because the checks for the instrincs were not being done and the HAVE_[TARGET]_INTRIN variables weren't being set. I could have simply set HAVE_[TARGET]_INTRIN variables to ON manually in the case of MSVC, but it is better this way to have one path for all the compilers (that it runs and checks some code for determination). I have just added MSVC code where necessary in the checks.

* Rename HAVE_SSE42_INTRIN to HAVE_SSE42CRC_INLINE_ASM.
* Added msvc inline asm support to insert_string_sse.c

6 years agoRemove pdf from readme contents.
Nathan Moinvaziri [Thu, 8 Aug 2019 18:01:39 +0000 (11:01 -0700)] 
Remove pdf from readme contents.

6 years agoRemove BUILDFIXED and MAKEFIXED. (#375)
Hans Kristian Rosbach [Thu, 8 Aug 2019 08:38:06 +0000 (10:38 +0200)] 
Remove BUILDFIXED and MAKEFIXED. (#375)

Remove BUILDFIXED support.
Split out MAKEFIXED into a separate 'makefixed' util that is easy
to use if we want to regenerate/verify inffixed.h.

6 years agoRemove syntax, whitespace and comment differences between inflate.c
Hans Kristian Rosbach [Tue, 6 Aug 2019 10:50:57 +0000 (12:50 +0200)] 
Remove syntax, whitespace and comment differences between inflate.c
and infback.c, making actual differences much easier to spot, easing maintenance.

6 years agoReadme and index restructuring (#346)
Nathan Moinvaziri [Thu, 8 Aug 2019 08:13:28 +0000 (01:13 -0700)] 
Readme and index restructuring (#346)

* Added cmake build instructions, build options, install instructions, and repository contents to README.md.
* Moved INDEX file content to README.md files.
* Added configure instructions and options.
* Added CodeFactor to build integration.

6 years agoRemove old zlib artifacts (#345)
Nathan Moinvaziri [Thu, 8 Aug 2019 08:08:20 +0000 (01:08 -0700)] 
Remove old zlib artifacts (#345)

* Remove old zlib readme.
* Remove old zlib change history from inflate.c.
* Remove old treebuild.xml and zlib pdf.

6 years agoEnables neon implementation of memcopy on Android arm64-v8a
taigacon [Tue, 23 Jul 2019 18:58:35 +0000 (02:58 +0800)] 
Enables neon implementation of memcopy on Android arm64-v8a

6 years agoFix wrong chunkmemset_6 implementation
taigacon [Tue, 23 Jul 2019 18:20:17 +0000 (02:20 +0800)] 
Fix wrong chunkmemset_6 implementation

6 years agoRename gzendian to zendian since it is included in more than just the gzip library...
Nathan Moinvaziri [Sat, 20 Jul 2019 04:53:24 +0000 (21:53 -0700)] 
Rename gzendian to zendian since it is included in more than just the gzip library code.

6 years agoDeduplicate inflate's fixedtables(), and no longer inline the inffixed tables.
Hans Kristian Rosbach [Thu, 18 Jul 2019 14:17:49 +0000 (16:17 +0200)] 
Deduplicate inflate's fixedtables(), and no longer inline the inffixed tables.
This also reduces the library size by 4120bytes or ~2.9%.

6 years agoDeduplicate common inflate/inflatefast/inflateBack macros into inflate_p.h
Hans Kristian Rosbach [Thu, 18 Jul 2019 13:49:54 +0000 (15:49 +0200)] 
Deduplicate common inflate/inflatefast/inflateBack macros into inflate_p.h

6 years agoAdd zng_ prefix to internal functions to avoid linking conflicts with zlib. (#363)
Nathan Moinvaziri [Thu, 18 Jul 2019 11:21:13 +0000 (04:21 -0700)] 
Add zng_ prefix to internal functions to avoid linking conflicts with zlib. (#363)

6 years agoAdd "reproducible" deflate parameter
Ilya Leoshkevich [Fri, 24 May 2019 09:18:33 +0000 (11:18 +0200)] 
Add "reproducible" deflate parameter

IBM Z DEFLATE CONVERSION CALL may produce different (but valid)
compressed data for the same uncompressed data. This behavior might be
unacceptable for certain use cases (e.g. reproducible builds). This
patch introduces Z_DEFLATE_REPRODUCIBLE parameter, which can be used to
indicate that this is the case, and turn off IBM Z DEFLATE CONVERSION
CALL.

6 years agoAdd two new public zng_deflate{Set,Get}Params() functions
Ilya Leoshkevich [Thu, 23 May 2019 11:57:43 +0000 (13:57 +0200)] 
Add two new public zng_deflate{Set,Get}Params() functions

These functions allow zlib-ng callers to modify and query the
compression parameters in a future-proof way. When the caller requests a
parameter, which is not supported by the current zlib-ng version, this
situation is detected and reported to the caller. The caller may modify
or query multiple parameters at once. Currently only "level" and
"strategy" parameters are supported. It is planned to add a
"reproducible" parameter, which would affect whether IBM Z DEFLATE
CONVERSION CALL is used.

Passing enum and void * buffer was chosen over passing strings, because
of simplicity for the caller. If strings were used, C callers would have
to call snprintf() and strtoul() for setting and getting integer-valued
parameters respectively, which is quite tedious.

Bulk updates were chosen over updating individual parameters separately,
because it might make sense to apply some parameters atomically, e.g.
level and strategy.

The new functions are defined only for zlib-ng, but not compat zlib.

6 years agoFixed use of uninitialized value found by memory sanitizer and reported by @sebpop.
Nathan Moinvaziri [Wed, 17 Jul 2019 03:00:33 +0000 (20:00 -0700)] 
Fixed use of uninitialized value found by memory sanitizer and reported by @sebpop.

6 years agoIBM Z DFLTCC: fix 31-bit build
Ilya Leoshkevich [Mon, 8 Jul 2019 13:23:12 +0000 (15:23 +0200)] 
IBM Z DFLTCC: fix 31-bit build

* Add machine mode hint for STFLE.
* Adjust offset calculations.

6 years agolongest_match: avoid using negative indices
Ilya Leoshkevich [Mon, 24 Jun 2019 14:57:19 +0000 (16:57 +0200)] 
longest_match: avoid using negative indices

Fixes #364

6 years agodeflate_medium: fix handling of overlapping matches
Ilya Leoshkevich [Fri, 14 Jun 2019 13:33:04 +0000 (15:33 +0200)] 
deflate_medium: fix handling of overlapping matches

Fixes #361

6 years agoAdded cmake support for testing against CVEs (#354)
Nathan Moinvaziri [Sat, 22 Jun 2019 07:49:32 +0000 (00:49 -0700)] 
Added cmake support for testing against CVEs (#354)

6 years agoRemove duplicate gz functions in test code (#348)
Nathan Moinvaziri [Sat, 22 Jun 2019 07:25:39 +0000 (00:25 -0700)] 
Remove duplicate gz functions in test code (#348)

Change CMakeLists.txt so that if WITH_GZFILEOP is OFF, gz* sources are still compiled against the tests which need them.
Remove duplicate gz functions from test code.
Always compile with gz functions when zlib tests enabled in makefile.

6 years agoAdded linux arm for cmake to travis matrix.
Nathan Moinvaziri [Tue, 4 Jun 2019 16:34:20 +0000 (09:34 -0700)] 
Added linux arm for cmake to travis matrix.

6 years agoUnify most of the option() and add_feature_info() statements to the top.
Nathan Moinvaziri [Wed, 29 May 2019 19:19:13 +0000 (12:19 -0700)] 
Unify most of the option() and add_feature_info() statements to the top.
Updated comments to all begin with proper casing.
Convert tabs to spaces.

6 years agoIBM Z DFLTCC: fix STFLE usage
Ilya Leoshkevich [Mon, 3 Jun 2019 14:47:14 +0000 (16:47 +0200)] 
IBM Z DFLTCC: fix STFLE usage

QEMU maintainers have found and issue related to incorrect usage of
STFLE instruction [1], which is used to get features supported by the
machine. There are three potential problems with the current usage:

- R0 must contain the number of requested doublewords *minus one*. The
existing code lacks the "minus one" part.
- Older machines may not fill all the doublewords - this is fixed by
calling `memset`.
- STFLE updates R0, but we don't tell the compiler about this - this is
fixed by using a `+` constraint.
- Not really a problem, but it's enough to load 8 bits into R0, so its
type was changed to `uint8_t`. Also, STFLE only writes to `facilities`
variable, therefore memory clobber is unnecessary.

[1] https://lists.gnu.org/archive/html/qemu-devel/2019-06/msg00113.html

6 years agoIBM Z DFLTCC: minor documentation fixes
Ilya Leoshkevich [Fri, 24 May 2019 10:36:46 +0000 (12:36 +0200)] 
IBM Z DFLTCC: minor documentation fixes

* Replace "DEFLATE COMPRESSION CALL" term with "DEFLATE CONVERSION
  CALL", since the latter is the proper name of the new IBM Z
  instruction.
* Mention CMake options in README.md.
* Replace "new macro" term with just "macro" in README.md (calling
  macros "new" is not correct in this context).
* Replace "zlib" term with "zlib-ng", except in probe point names - it's
  better to keep those common between gzip, zlib and zlib-ng.

6 years agoAdded Windows OS to travis matrix (#355)
Nathan Moinvaziri [Tue, 4 Jun 2019 08:57:55 +0000 (01:57 -0700)] 
Added Windows OS to travis matrix (#355)

This pull request adds Windows OS to travis matrix using cmake.

I had to rename the environment variables because I believed there might have been a conflict with the previous naming. I had to break the script section into multiple lines because Windows didn't like them altogether using &&.

6 years agoFixed float-abi detection command in cmake. Should have been using $ENV{CC} but using...
Nathan Moinvaziri [Wed, 29 May 2019 19:32:29 +0000 (12:32 -0700)] 
Fixed float-abi detection command in cmake. Should have been using $ENV{CC} but using ${CMAKE_C_COMPILER} is more exact.

6 years agoSimplify creating cmake fuzzer test executables.
Nathan Moinvaziri [Wed, 29 May 2019 19:03:20 +0000 (12:03 -0700)] 
Simplify creating cmake fuzzer test executables.

6 years agoFixed compiler warnings on Windows in release mode (#349)
Nathan Moinvaziri [Tue, 4 Jun 2019 08:50:22 +0000 (01:50 -0700)] 
Fixed compiler warnings on Windows in release mode (#349)

This pull request attempts to fix some compiler warnings on Windows when compiled in Release mode.

```
"zlib-ng\ALL_BUILD.vcxproj" (default target) (1) ->
"zlib-ng\zlibstatic.vcxproj" (default target) (6) ->
  zlib-ng\deflate.c(1626): warning C4244: '=': conversion from 'uint16_t' to 'unsigned cha
r', possible loss of data [zlib-ng\zlibstatic.vcxproj]
  zlib-ng\deflate_fast.c(61): warning C4244: '=': conversion from 'uint16_t' to 'unsigned
char', possible loss of data [zlib-ng\zlibstatic.vcxproj]
  zlib-ng\deflate_slow.c(89): warning C4244: '=': conversion from 'uint16_t' to 'unsigned
char', possible loss of data [zlib-ng\zlibstatic.vcxproj]
```

6 years agoAdded cmake toolchain arm support. (#350)
Nathan Moinvaziri [Tue, 4 Jun 2019 08:48:43 +0000 (01:48 -0700)] 
Added cmake toolchain arm support. (#350)

This PR only adds cmake toolchain files for ARM. NAME/COMMAND stuff is so CMAKE_CROSSCOMPILING_EMULATOR is used. The message() is to prevent a warning about unused variable when specifying CMAKE_TOOLCHAIN_FILE.

6 years agoFixed assert(n_read == len) in standalone fuzz target runner on certain file types.
Nathan Moinvaziri [Mon, 27 May 2019 05:01:01 +0000 (22:01 -0700)] 
Fixed assert(n_read == len) in standalone fuzz target runner on certain file types.

6 years agoFix build when DYNAMIC_CRC_TABLE is defined.
Mika T. Lindqvist [Mon, 20 May 2019 08:41:09 +0000 (11:41 +0300)] 
Fix build when DYNAMIC_CRC_TABLE is defined.

6 years agoAdd support for IBM Z hardware-accelerated deflate
Ilya Leoshkevich [Wed, 10 Apr 2019 13:46:58 +0000 (15:46 +0200)] 
Add support for IBM Z hardware-accelerated deflate

Future versions of IBM Z mainframes will provide DFLTCC instruction,
which implements deflate algorithm in hardware with estimated
compression and decompression performance orders of magnitude faster
than the current zlib-ng and ratio comparable with that of level 1.

This patch adds DFLTCC support to zlib-ng. In order to enable it, the
following build commands should be used:

    $ ./configure --with-dfltcc-deflate --with-dfltcc-inflate
    $ make

When built like this, zlib-ng would compress in hardware on level 1,
and in software on all other levels. Decompression will always happen
in hardware. In order to enable DFLTCC compression for levels 1-6 (i.e.
to make it used by default) one could add -DDFLTCC_LEVEL_MASK=0x7e to
CFLAGS when building zlib-ng.

Two DFLTCC compression calls produce the same results only when they
both are made on machines of the same generation, and when the
respective buffers have the same offset relative to the start of the
page. Therefore care should be taken when using hardware compression
when reproducible results are desired.

DFLTCC does not support every single zlib-ng feature, in particular:

    * inflate(Z_BLOCK) and inflate(Z_TREES)
    * inflateMark()
    * inflatePrime()
    * deflateParams() after the first deflate() call

When used, these functions will either switch to software, or, in case
this is not possible, gracefully fail.

This patch tries to add DFLTCC support in a least intrusive way.
All SystemZ-specific code was placed into a separate file, but
unfortunately there is still a noticeable amount of changes in the
main zlib-ng code. Below is the summary of those changes.

DFLTCC takes as arguments a parameter block, an input buffer, an output
buffer and a window. Since DFLTCC requires parameter block to be
doubleword-aligned, and it's reasonable to allocate it alongside
deflate and inflate states, ZALLOC_STATE, ZFREE_STATE and ZCOPY_STATE
macros were introduced in order to encapsulate the allocation details.
The same is true for window, for which ZALLOC_WINDOW and
TRY_FREE_WINDOW macros were introduced.

While for inflate software and hardware window formats match, this is
not the case for deflate. Therefore, deflateSetDictionary and
deflateGetDictionary need special handling, which is triggered using the
new DEFLATE_SET_DICTIONARY_HOOK and DEFLATE_GET_DICTIONARY_HOOK macros.

deflateResetKeep() and inflateResetKeep() now update the DFLTCC
parameter block, which is allocated alongside zlib-ng state, using
the new DEFLATE_RESET_KEEP_HOOK and INFLATE_RESET_KEEP_HOOK macros.

In order to make unsupported deflateParams(), inflatePrime() and
inflateMark() calls to fail gracefully, the new DEFLATE_PARAMS_HOOK,
INFLATE_PRIME_HOOK and INFLATE_MARK_HOOK macros were introduced.

The algorithm implemented in hardware has different compression ratio
than the one implemented in software. In order for deflateBound() to
return the correct results for the hardware implementation, the new
DEFLATE_BOUND_ADJUST_COMPLEN and DEFLATE_NEED_CONSERVATIVE_BOUND macros
were introduced.

Actual compression and decompression are handled by the new DEFLATE_HOOK
and INFLATE_TYPEDO_HOOK macros. Since inflation with DFLTCC manages the
window on its own, calling updatewindow() is suppressed using the new
INFLATE_NEED_UPDATEWINDOW() macro.

In addition to compression, DFLTCC computes CRC-32 and Adler-32
checksums, therefore, whenever it's used, software checksumming needs to
be suppressed using the new DEFLATE_NEED_CHECKSUM and
INFLATE_NEED_CHECKSUM macros.

DFLTCC will refuse to write an End-of-block Symbol if there is no input
data, thus in some cases it is necessary to do this manually. In order
to achieve this, bi_reverse and flush_pending were promoted from static
to ZLIB_INTERNAL and exposed via deflate.h.

Since the first call to dfltcc_inflate already needs the window, and it
might be not allocated yet, inflate_ensure_window was factored out of
updatewindow and made ZLIB_INTERNAL.

6 years agoIntroduce inflate and deflate hooks
Ilya Leoshkevich [Wed, 10 Apr 2019 11:52:07 +0000 (13:52 +0200)] 
Introduce inflate and deflate hooks

6 years agoIntroduce inflate_ensure_window, make bi_reverse and flush_pending ZLIB_INTERNAL
Ilya Leoshkevich [Wed, 10 Apr 2019 11:41:58 +0000 (13:41 +0200)] 
Introduce inflate_ensure_window, make bi_reverse and flush_pending ZLIB_INTERNAL

6 years agoIgnore CLion files
Ilya Leoshkevich [Fri, 12 Apr 2019 14:21:15 +0000 (16:21 +0200)] 
Ignore CLion files

6 years agoFix infcover.c build
Ilya Leoshkevich [Tue, 26 Mar 2019 12:30:51 +0000 (13:30 +0100)] 
Fix infcover.c build

infcover.c includes inflate.h, which makes use of PREFIX3 macro. This
macro is defined in zbuild.h, which is not included.

6 years agocleanup arm/adler32_neon.c code
Sebastian Pop [Mon, 1 Apr 2019 20:05:53 +0000 (15:05 -0500)] 
cleanup arm/adler32_neon.c code

6 years agoonly call NEON adler32 for more than 16 bytes
Sebastian Pop [Mon, 28 Jan 2019 22:05:50 +0000 (16:05 -0600)] 
only call NEON adler32 for more than 16 bytes

improves performance of inflate by up to 6% on an A-73 Hikey running at 2.36 GHz
when executing the chromium benchmark on the snappy data set.  In a few cases
inflate is slower by up to 0.8%.  Overall performance of inflate is better by
about 0.3%.

6 years agofix configure output when compiler is clang
Sebastian Pop [Mon, 1 Apr 2019 18:21:18 +0000 (13:21 -0500)] 
fix configure output when compiler is clang

The patch cleans up the expected errors that clutter the output of configure:

$ CC=clang ./configure
Checking for compiler... clang-6.0
clang: error: unknown argument: '-print-multiarch'
clang: error: no input files

With this patch the last two lines disappear.

6 years agofix configure --help text to match parsed options
Sebastian Pop [Wed, 3 Apr 2019 14:50:02 +0000 (09:50 -0500)] 
fix configure --help text to match parsed options

6 years agofix warning when compiling for AArch64
Sebastian Pop [Wed, 3 Apr 2019 15:00:08 +0000 (10:00 -0500)] 
fix warning when compiling for AArch64

gcc stopped warning about an unused function when I declared `arm_has_neon` as
`static inline`.  However clang still warns about an unused function:

```
arch/arm/armfeature.c:20:19: warning: unused function 'arm_has_neon' [-Wunused-function]
static inline int arm_has_neon()

                  ^
1 warning generated.
```

This patch moves the function under a preprocessor `#if !defined(__aarch64)`
which makes clang stop warn about it.

6 years agoFix building with gcc 8.2.1 and -Wall -Wextra -pedantic -Werror
Ilya Leoshkevich [Tue, 26 Mar 2019 09:52:02 +0000 (10:52 +0100)] 
Fix building with gcc 8.2.1 and -Wall -Wextra -pedantic -Werror

* ptrdiff_t check always failed because of unused parameter
* sizeof(void *) check always failed because of double semicolon
* Sign issue in nice_match assignment
* dist parameter of set_bytes may be unused
* Parameters of main may be unused in test/example.c
* snprintf requires a _POSIX_C_SOURCE #define in test/minigzip.c,
  because a _POSIX_SOURCE #define is present

6 years agoIncrease verbosity required to warn about bit length overflow.
Mark Adler [Sun, 20 Nov 2016 19:36:15 +0000 (11:36 -0800)] 
Increase verbosity required to warn about bit length overflow.

When debugging the Huffman coding would warn about resulting codes
greater than 15 bits in length. This is handled properly, and is
not uncommon. This increases the verbosity of the warning by one,
so that it is not displayed by default.

6 years agoFix endianness detection in memcopy.h
Ilya Leoshkevich [Tue, 26 Mar 2019 12:06:36 +0000 (13:06 +0100)] 
Fix endianness detection in memcopy.h

When memcopy.h is included into inffast.c, endianness-related
preperocessor defines are not set, which leads to
BYTE_ORDER == LITTLE_ENDIAN condition being always true. This breaks
decompression at least on s390x.

6 years agofix oss-fuzz/13863
Sebastian Pop [Tue, 26 Mar 2019 16:59:45 +0000 (11:59 -0500)] 
fix oss-fuzz/13863

The oss fuzzers started failing with the following assert
```
ASSERT: 0 == memcmp(data + offset, buf, len)
```
after the following patch has been pulled in the tree:

```
commit 20ca64fa5d2d8a7421ed86b68709ef971dcfbddf
Author: Sebastian Pop <s.pop@samsung.com>
Date:   Wed Mar 6 14:16:20 2019 -0600

    define and use chunkmemset instead of byte_memset for INFFAST_CHUNKSIZE
```

The function chunkcopysafe is assuming that the input `len` is less than 16 bytes:
```
    if ((safe - out) < (ptrdiff_t)INFFAST_CHUNKSIZE) {
```
but we were called with `len = 22` because `safe` was defined too small:

```
-    safe = out + (strm->avail_out - INFFAST_CHUNKSIZE);
```
and the difference `safe - out` was 16 bytes smaller than the actual `len`.
The patch fixes the initialization of `safe` to:
```
+    safe = out + strm->avail_out;
```

6 years agouse sizeof(type) instead of magic numbers
Sebastian Pop [Tue, 5 Mar 2019 19:36:25 +0000 (19:36 +0000)] 
use sizeof(type) instead of magic numbers

6 years agoautomatically update makefile dependences
Sebastian Pop [Sat, 26 Jan 2019 21:54:59 +0000 (15:54 -0600)] 
automatically update makefile dependences

6 years agofix all ASan errors on arm/aarch64
Sebastian Pop [Tue, 5 Mar 2019 19:15:17 +0000 (19:15 +0000)] 
fix all ASan errors on arm/aarch64

6 years agofactor out code in arch/{arm,aarch64}
Sebastian Pop [Tue, 5 Mar 2019 15:57:05 +0000 (09:57 -0600)] 
factor out code in arch/{arm,aarch64}

6 years agofix UBSan warnings of unsigned overflow
Sebastian Pop [Wed, 6 Mar 2019 20:33:49 +0000 (14:33 -0600)] 
fix UBSan warnings of unsigned overflow

6 years agochunk_memcpy is not needed under INFFAST_CHUNKSIZE
Sebastian Pop [Wed, 6 Mar 2019 20:32:14 +0000 (14:32 -0600)] 
chunk_memcpy is not needed under INFFAST_CHUNKSIZE

6 years agouse chunkcopysafe and chunkmemsetsafe under INFFAST_CHUNKSIZE from inflate
Sebastian Pop [Wed, 6 Mar 2019 20:20:04 +0000 (14:20 -0600)] 
use chunkcopysafe and chunkmemsetsafe under INFFAST_CHUNKSIZE from inflate

6 years agodefine and use chunkmemset instead of byte_memset for INFFAST_CHUNKSIZE
Sebastian Pop [Wed, 6 Mar 2019 20:16:20 +0000 (14:16 -0600)] 
define and use chunkmemset instead of byte_memset for INFFAST_CHUNKSIZE

6 years agofactor out code
Sebastian Pop [Wed, 6 Mar 2019 20:00:30 +0000 (14:00 -0600)] 
factor out code

6 years agoenable INFFAST_CHUNKSIZE on x86
Sebastian Pop [Fri, 1 Mar 2019 15:48:58 +0000 (09:48 -0600)] 
enable INFFAST_CHUNKSIZE on x86

6 years agofix indent for pre-processor
Sebastian Pop [Wed, 6 Mar 2019 19:37:18 +0000 (13:37 -0600)] 
fix indent for pre-processor

6 years agomove INFFAST_CHUCKSIZE code to memcopy.h
Sebastian Pop [Fri, 1 Mar 2019 15:45:33 +0000 (09:45 -0600)] 
move INFFAST_CHUCKSIZE code to memcopy.h

6 years agofix typo: deflate is compression
Sebastian Pop [Wed, 6 Mar 2019 19:16:06 +0000 (13:16 -0600)] 
fix typo: deflate is compression

6 years agoUpdate x86 and x86_64 arch checks to use the recommended
Hans Kristian Rosbach [Wed, 6 Mar 2019 09:59:06 +0000 (10:59 +0100)] 
Update x86 and x86_64 arch checks to use the recommended
define names, resulting in improved compiler support.
Based on the overviews from several sites, such as:
http://nadeausoftware.com/articles/2012/02/c_c_tip_how_detect_processor_type_using_compiler_predefined_macros

6 years agoDefault sse2 to be available on x86_64 arch.
Hans Kristian Rosbach [Wed, 6 Mar 2019 09:39:32 +0000 (10:39 +0100)] 
Default sse2 to be available on x86_64 arch.
Allow x86 arch to force sse2 availability.
It still depends on sse2 intrinsics being detected and optimizations enabled.

6 years agoremove MEMSET, replace with memset
Sebastian Pop [Wed, 6 Mar 2019 15:19:43 +0000 (15:19 +0000)] 
remove MEMSET, replace with memset

6 years agoremove MEMCPY, replace with memcpy
Sebastian Pop [Tue, 5 Mar 2019 18:27:05 +0000 (18:27 +0000)] 
remove MEMCPY, replace with memcpy

6 years agounify uses of __ARM_FEATURE_CRC32
Sebastian Pop [Tue, 5 Mar 2019 15:28:27 +0000 (09:28 -0600)] 
unify uses of __ARM_FEATURE_CRC32

6 years agounify uses of __ARM_NEON__ and __ARM_NEON
Sebastian Pop [Tue, 5 Mar 2019 15:47:03 +0000 (09:47 -0600)] 
unify uses of __ARM_NEON__ and __ARM_NEON

6 years agofactor out common cmake code for x86_64 and i386
Sebastian Pop [Tue, 5 Mar 2019 15:08:02 +0000 (09:08 -0600)] 
factor out common cmake code for x86_64 and i386

6 years agorename X86_SSE2_FILL_WINDOW to X86_SSE2
Sebastian Pop [Fri, 1 Mar 2019 14:48:38 +0000 (08:48 -0600)] 
rename X86_SSE2_FILL_WINDOW to X86_SSE2

6 years agoremove unused variable NM
Sebastian Pop [Fri, 8 Feb 2019 20:46:48 +0000 (14:46 -0600)] 
remove unused variable NM

6 years agoFixed arithmetic overflow warnings on Windows (#302)
Nathan Moinvaziri [Fri, 1 Mar 2019 10:44:37 +0000 (02:44 -0800)] 
Fixed arithmetic overflow warnings on Windows (#302)

Fixed arithmetic overflow warnings in MSVC.
Fixed uint64_t to uint32_t casting warning.
Added assert to check if bits is greater than 32 before cast.

6 years agowin32: update makefile dependences
Sebastian Pop [Sat, 26 Jan 2019 20:37:07 +0000 (14:37 -0600)] 
win32: update makefile dependences

6 years agowin32: add missing makefile dependence
Sebastian Pop [Sat, 26 Jan 2019 20:06:04 +0000 (14:06 -0600)] 
win32: add missing makefile dependence

6 years agoARM: check cpu feature once at init time
Sebastian Pop [Fri, 25 Jan 2019 17:44:46 +0000 (11:44 -0600)] 
ARM: check cpu feature once at init time

This makes the checks for arm cpu features as inexpensive as on the x86 side
by calling the runtime feature detection once in deflate/inflate init and then
storing the result in a global variable.

6 years agofix auto-detection of cross compilation for bare-metal linaro compilers
Sebastian Pop [Fri, 8 Feb 2019 20:41:07 +0000 (14:41 -0600)] 
fix auto-detection of cross compilation for bare-metal linaro compilers

6 years agoARM: enable neon and acle when available
Sebastian Pop [Wed, 23 Jan 2019 20:17:49 +0000 (14:17 -0600)] 
ARM: enable neon and acle when available

this patch changes the default for cmake and configure to enable neon and acle
when no flags have been specified.  This mimics the default for x86.  The flags
--neon and --acle are changed to the opposite --without-neon and --without-acle
allowing the user to disable detection of neon and acle.

6 years agocleanup: remove unused file
Sebastian Pop [Thu, 24 Jan 2019 18:26:55 +0000 (12:26 -0600)] 
cleanup: remove unused file

6 years agocleanup: move code from arch/x86/crc_pclmulqdq.c to crc32.c
Sebastian Pop [Wed, 23 Jan 2019 19:15:33 +0000 (13:15 -0600)] 
cleanup: move code from arch/x86/crc_pclmulqdq.c to crc32.c

6 years agocleanup: remove partial do { } while constructs from macros
Sebastian Pop [Wed, 23 Jan 2019 17:30:05 +0000 (11:30 -0600)] 
cleanup: remove partial do { } while constructs from macros

also remove dead code that was there only to close the open braces of the
do-while construct.

6 years agoENH: Use modern cmake variable conventions
Hans Johnson [Wed, 16 Jan 2019 16:11:00 +0000 (10:11 -0600)] 
ENH: Use modern cmake variable conventions

Use recommended naming conventions for variables

See https://cmake.org/cmake/help/v3.0/command/project.html?highlight=project for
the common conventions.

The project() command stores the version number and its components in variables

PROJECT_VERSION, <PROJECT-NAME>_VERSION
PROJECT_VERSION_MAJOR, <PROJECT-NAME>_VERSION_MAJOR
PROJECT_VERSION_MINOR, <PROJECT-NAME>_VERSION_MINOR
PROJECT_VERSION_PATCH, <PROJECT-NAME>_VERSION_PATCH
PROJECT_VERSION_TWEAK, <PROJECT-NAME>_VERSION_TWEAK

6 years agoENH: Conistently read version information from one place
Hans Johnson [Wed, 16 Jan 2019 16:07:14 +0000 (10:07 -0600)] 
ENH: Conistently read version information from one place

Apply "one-definition-rule" getting the version information.

The zlib.h file is the definitive source for version
information.  Add code to extract version information
for both ZLIB and ZLIBNG variants from the zlib.h file.

6 years agoENH: Use modern (cmake 3.0+) project signature
Hans Johnson [Wed, 16 Jan 2019 15:48:04 +0000 (09:48 -0600)] 
ENH: Use modern (cmake 3.0+) project signature

Set a name, version, and enable languages for the entire project.
This signature uses a common paradigm for propogating defaults
for setting version information in several targets.

6 years agoENH: Allow setting the C_STANDARD version from command line
Hans Johnson [Wed, 16 Jan 2019 15:41:53 +0000 (09:41 -0600)] 
ENH: Allow setting the C_STANDARD version from command line

Allow for both C99 and C11 standards to be used. By default,
do not support compiler extensions, but allow this setting to
be overridden by the developer.

The setting of the language standard needs to be performed before
the "project" directive.

6 years agoBUG: CMake 2.8.4 does not support required features
Hans Johnson [Wed, 16 Jan 2019 15:13:36 +0000 (09:13 -0600)] 
BUG:  CMake 2.8.4 does not support required features

CMake Error at CMakeLists.txt:682 (target_include_directories):
  Unknown CMake command "target_include_directories".

target_include_directories was introduced in cmake 3

C_STANDARD 99 support was added in cmake 3.1

Ubuntu 16.04 (Xenial) was distributed with cmake 3.5.1 by default.

CMake versions > 3.3 allow simplified implementations of modern
cmake compilation support.

===
For newer versions of cmake (upto a maximum validated version [3.13.2 in this case]),
use newer cmake policies available.  The newer policies often provide better
diagnostics for subtle build related issues.

6 years agofix bug #289: use strcpy instead of strncpy 294/head
Sebastian Pop [Tue, 22 Jan 2019 19:46:34 +0000 (13:46 -0600)] 
fix bug #289: use strcpy instead of strncpy

to avoid a GCC 8 warning:

test/example.c:465:48: warning: argument to ‘sizeof’ in ‘strncpy’ call is the same expression as the source; did you mean to use the size of the destination? [-Wsizeof-pointer-memaccess]
     strncpy((char*)uncompr, garbage_str, sizeof(garbage_str));

6 years agofix bug #208: let the compiler generate code for unaligned stores
Sebastian Pop [Thu, 17 Jan 2019 19:07:16 +0000 (13:07 -0600)] 
fix bug #208: let the compiler generate code for unaligned stores

to avoid this error:
zlib-ng/arch/x86/deflate_quick.c:154:5: runtime error: store to misaligned address 0x631000014801 for type 'unsigned int', which requires 4 byte alignment
0x631000014801: note: pointer points here
00 80 02  d3 07 00 00 be be be be  be be be be be be be be  be be be be be be be be  be be be be be
               ^
SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior zlib-ng/arch/x86/deflate_quick.c:154:5 in

6 years agofix bug #225: account bits sent
Sebastian Pop [Thu, 17 Jan 2019 18:26:30 +0000 (12:26 -0600)] 
fix bug #225: account bits sent

6 years agoclean up logic of configure and make for sanitizer flags
Sebastian Pop [Wed, 16 Jan 2019 21:37:10 +0000 (15:37 -0600)] 
clean up logic of configure and make for sanitizer flags

6 years agocleanup configure output for checking the compiler
Sebastian Pop [Tue, 22 Jan 2019 19:05:53 +0000 (13:05 -0600)] 
cleanup configure output for checking the compiler

6 years agocleanup configure output by using echo -n
Sebastian Pop [Tue, 22 Jan 2019 18:32:40 +0000 (12:32 -0600)] 
cleanup configure output by using echo -n

6 years agoonly check for -mfpu=neon on ARM processors
Sebastian Pop [Tue, 22 Jan 2019 18:24:30 +0000 (12:24 -0600)] 
only check for -mfpu=neon on ARM processors

6 years agocleanup multiple test -o expressions by using case
Sebastian Pop [Tue, 22 Jan 2019 18:18:56 +0000 (12:18 -0600)] 
cleanup multiple test -o expressions by using case

6 years agoThis patch fixes a problem with detecting the target that gcc compiles for when
Sebastian Pop [Wed, 16 Jan 2019 16:24:37 +0000 (10:24 -0600)] 
This patch fixes a problem with detecting the target that gcc compiles for when
using -m32.  The error is in the way we detect GCC_ARCH in configure:

GCC_ARCH=`$CC $CFLAGS -dumpmachine | sed 's/-.*//g'`

Here is the output of gcc and clang:

$ gcc  -m32 -std=c99 -dumpmachine
x86_64-linux-gnu

$ clang  -m32 -std=c99 -dumpmachine
i386-pc-linux-gnu

It looks like it is a known problem:
https://gcc.gnu.org/ml/gcc-help/2018-05/msg00053.html This patch checks whether
the compiler has the flag -print-multiarch in which case it uses it instead of
-dumpmachine to print the compiler target:

$ gcc -print-multiarch
x86_64-linux-gnu
$ gcc -print-multiarch -m32
i386-linux-gnu
$ clang -print-multiarch
clang: error: unknown argument: '-print-multiarch'

There were a few places that used an explicit test for i686 that are now also
checking for i386 as this is the value set in ARCH for gcc and clang when
configuring zlib-ng with --32.

6 years agoremove -DX86
Sebastian Pop [Wed, 2 Jan 2019 21:12:57 +0000 (15:12 -0600)] 
remove -DX86

6 years agoremove unused compilation flag -DX86_64
Sebastian Pop [Wed, 2 Jan 2019 20:33:49 +0000 (14:33 -0600)] 
remove unused compilation flag -DX86_64

6 years agobug #266: select std2 for gcc/clang ARM 32-bit builds
Brian Rzycki [Thu, 17 Jan 2019 22:19:27 +0000 (16:19 -0600)] 
bug #266: select std2 for gcc/clang ARM 32-bit builds

Running the Chromium zlib benchmark tool on a Hikey 970 device
showed uplifts for both gcc and clang when using std2 (larger is
better):

arm_h02_std3_gcc_0ca47588bd2e38/score.out  =  7.964881
arm_h02_std3_llvm_2e8efbb084ae87/score.out =  9.522024
arm_h02_std1_gcc_0ca47588bd2e38/score.out  =  9.641071
arm_h02_std2_gcc_0ca47588bd2e38/score.out  =  9.919345
arm_h02_std1_llvm_2e8efbb084ae87/score.out =  9.925893
arm_h02_std2_llvm_2e8efbb084ae87/score.out = 10.049107

6 years agoremove unused variable
Sebastian Pop [Thu, 17 Jan 2019 16:25:40 +0000 (10:25 -0600)] 
remove unused variable

6 years agoremove unused variables
Sebastian Pop [Thu, 17 Jan 2019 16:25:19 +0000 (10:25 -0600)] 
remove unused variables

6 years agoCOMP: Fix missing header unistd.h
Hans Johnson [Wed, 16 Jan 2019 16:37:30 +0000 (10:37 -0600)] 
COMP: Fix missing header unistd.h

zlib-ng/gzlib.c:196:9: warning: implicit declaration of function 'lseek' is invalid in C99 [-Wimplicit-function-declaration]
        LSEEK(state->fd, 0, SEEK_END);  /* so gzoffset() is correct */
        ^
zlib-ng/gzlib.c:17:17: note: expanded from macro 'LSEEK'
                ^
[ 61%] Building C object CMakeFiles/zlibstatic.dir/gzread.c.o
zlib-ng/gzread.c:27:15: warning: implicit declaration of function 'read' is invalid in C99 [-Wimplicit-function-declaration]
        ret = read(state->fd, buf + *have, len - *have);
              ^
zlib-ng/gzread.c:596:11: warning: implicit declaration of function 'close' is invalid in C99 [-Wimplicit-function-declaration]
    ret = close(state->fd);
          ^
[ 62%] Building C object CMakeFiles/zlibstatic.dir/gzwrite.c.o
zlib-ng/gzwrite.c:84:15: warning: implicit declaration of function 'write' is invalid in C99 [-Wimplicit-function-declaration]
        got = write(state->fd, strm->next_in, strm->avail_in);
              ^
zlib-ng/gzwrite.c:100:33: warning: implicit declaration of function 'write' is invalid in C99 [-Wimplicit-function-declaration]
            if (have && ((got = write(state->fd, state->x.next, (unsigned long)have)) < 0 || (unsigned)got != have)) {
                                ^
zlib-ng/gzwrite.c:512:9: warning: implicit declaration of function 'close' is invalid in C99 [-Wimplicit-function-declaration]
    if (close(state->fd) == -1)"

6 years agoLet deflate_medium be enabled by default.
Hans Kristian Rosbach [Wed, 16 Jan 2019 11:35:34 +0000 (12:35 +0100)] 
Let deflate_medium be enabled by default.

6 years agoReplace the UNROLL_LESS define with UNROLL_MORE, making UNROLL_LESS the default.
Hans Kristian Rosbach [Wed, 16 Jan 2019 10:49:29 +0000 (11:49 +0100)] 
Replace the UNROLL_LESS define with UNROLL_MORE, making UNROLL_LESS the default.
Performance benchmarks have so far not shown that any platform benefits from UNROLL_MORE,
although this might be beneficial on older compilers/cpus or for compiling without optimizations.

The extra UNROLL_MORE code should be considered for removal since it is never enabled by us
and will likely only serve to confuse and contribute to bitrot.

6 years agofix warning with configure --debug
Sebastian Pop [Thu, 17 Jan 2019 16:32:25 +0000 (10:32 -0600)] 
fix warning with configure --debug

arch/x86/deflate_quick.c:184:21: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 5 has type ‘size_t {aka long unsigned int}’ [-Wformat=]

6 years agoENH: Remove superflous setting for cmake 2.6.0+
Hans Johnson [Wed, 16 Jan 2019 14:46:08 +0000 (08:46 -0600)] 
ENH: Remove superflous setting for cmake 2.6.0+

As of CMake 2.6.0 the ELSE() and ENDIF() constructs can be empty. The
same is true for closing constructs on ENDMACRO(), ENDFUNCTION(), and
ENDFOREACH().

If you require 2.4.x compatibility, CMake 2.4.3 or greater
recognizes the CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS option (which is
superfluous in 2.6.0)