Remove mixed-source.patch from zlib.

third_party/zlib/simd.patch

 diff --git a/third_party/zlib/crc32.c b/third_party/zlib/crc32.c
-index 979a719..09228ed 100644
+index 979a7190a3ca..09228ed9c76f 100644
 --- a/third_party/zlib/crc32.c
 +++ b/third_party/zlib/crc32.c
 @@ -28,6 +28,8 @@
  #  endif /* !DYNAMIC_CRC_TABLE */
  #endif /* MAKECRCH */
  
 +#include "deflate.h"
 +#include "x86.h"
  #include "zutil.h"      /* for STDC and FAR definitions */
  
@@ skipping 21 matching lines @@
 +ZLIB_INTERNAL void copy_with_crc(z_streamp strm, Bytef *dst, long size)
 +{
 +    if (x86_cpu_enable_simd) {
 +        crc_fold_copy(strm->state, dst, strm->next_in, size);
 +        return;
 +    }
 +    zmemcpy(dst, strm->next_in, size);
 +    strm->adler = crc32(strm->adler, dst, size);
 +}
 diff --git a/third_party/zlib/crc_folding.c b/third_party/zlib/crc_folding.c
-new file mode 100644
-index 0000000..48d7774
---- /dev/null
+index e69de29bb2d1..48d77744aaf4 100644
+--- a/third_party/zlib/crc_folding.c
 +++ b/third_party/zlib/crc_folding.c
 @@ -0,0 +1,493 @@
 +/*
 + * Compute the CRC32 using a parallelized folding approach with the PCLMULQDQ
 + * instruction.
 + *
 + * A white paper describing this algorithm can be found at:
 + * http://www.intel.com/content/dam/www/public/us/en/documents/white-papers/fast-crc-computation-generic-polynomials-pclmulqdq-paper.pdf
 + *
 + * Copyright (C) 2013 Intel Corporation. All rights reserved.
@@ skipping 476 matching lines @@
 +    xmm_crc2 = xmm_crc3;
 +    xmm_crc3 = _mm_clmulepi64_si128(xmm_crc3, crc_fold, 0x10);
 +    xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_crc2);
 +    xmm_crc3 = _mm_xor_si128(xmm_crc3, xmm_crc1);
 +
 +    crc = _mm_extract_epi32(xmm_crc3, 2);
 +    return ~crc;
 +    CRC_SAVE(s)
 +}
 diff --git a/third_party/zlib/deflate.c b/third_party/zlib/deflate.c
-index 7c95b30..59645eb 100644
+index 696957705b75..02fa2f64f83e 100644
 --- a/third_party/zlib/deflate.c
 +++ b/third_party/zlib/deflate.c
 @@ -48,8 +48,9 @@
   */
  
  /* @(#) $Id$ */
 -
 +#include <assert.h>
  #include "deflate.h"
 +#include "x86.h"
  
  const char deflate_copyright[] =
     " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler ";
-@@ -85,7 +86,7 @@ local block_state deflate_huff   OF((deflate_state *s, int flush));
+@@ -84,7 +85,7 @@ local block_state deflate_huff   OF((deflate_state *s, int flush));
  local void lm_init        OF((deflate_state *s));
  local void putShortMSB    OF((deflate_state *s, uInt b));
  local void flush_pending  OF((z_streamp strm));
 -local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));
 +
  #ifdef ASMV
        void match_init OF((void)); /* asm code initialization */
-       uInt longest_match  OF((deflate_state *s, IPos cur_match, int clas));
-@@ -98,6 +99,23 @@ local  void check_match OF((deflate_state *s, IPos start, IPos match,
+       uInt longest_match  OF((deflate_state *s, IPos cur_match));
+@@ -97,6 +98,23 @@ local  void check_match OF((deflate_state *s, IPos start, IPos match,
                              int length));
  #endif
  
 +/* For fill_window_sse.c to use */
 +ZLIB_INTERNAL int read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
 +
 +/* From crc32.c */
 +extern void ZLIB_INTERNAL crc_reset(deflate_state *const s);
 +extern void ZLIB_INTERNAL crc_finalize(deflate_state *const s);
 +extern void ZLIB_INTERNAL copy_with_crc(z_streamp strm, Bytef *dst, long size);
 +
 +#ifdef _MSC_VER
 +#define INLINE __inline
 +#else
 +#define INLINE inline
 +#endif
 +
 +/* Inline optimisation */
 +local INLINE Pos insert_string_sse(deflate_state *const s, const Pos str);
 +
  /* ===========================================================================
   * Local data
   */
-@@ -167,7 +185,6 @@ struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
+@@ -166,7 +184,6 @@ struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
   */
  #define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
  
 -
  /* ===========================================================================
   * Insert string str in the dictionary and set match_head to the previous head
   * of the hash chain (the most recent string with same hash key). Return
-@@ -178,17 +195,28 @@ struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
+@@ -177,17 +194,28 @@ struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
   *    input characters and the first MIN_MATCH bytes of str are valid
   *    (except for the last MIN_MATCH-1 bytes of the input file).
   */
 +local INLINE Pos insert_string_c(deflate_state *const s, const Pos str)
 +{
 +    Pos ret;
 +
 +    UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]);
  #ifdef FASTEST
 -#define INSERT_STRING(s, str, match_head) \
@@ skipping 16 matching lines @@
 +local INLINE Pos insert_string(deflate_state *const s, const Pos str)
 +{
 +    if (x86_cpu_enable_simd)
 +        return insert_string_sse(s, str);
 +    return insert_string_c(s, str);
 +}
 +
  
  /* ===========================================================================
   * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
-@@ -222,6 +250,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+@@ -221,6 +249,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
      const char *version;
      int stream_size;
  {
 +    unsigned window_padding = 8;
      deflate_state *s;
      int wrap = 1;
      static const char my_version[] = ZLIB_VERSION;
-@@ -231,6 +260,8 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+@@ -230,6 +259,8 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
       * output size for (length,distance) codes is <= 24 bits.
       */
  
 +    x86_check_features();
 +
      if (version == Z_NULL || version[0] != my_version[0] ||
          stream_size != sizeof(z_stream)) {
          return Z_VERSION_ERROR;
-@@ -286,12 +317,17 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+@@ -285,12 +316,17 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
      s->w_size = 1 << s->w_bits;
      s->w_mask = s->w_size - 1;
  
 -    s->hash_bits = memLevel + 7;
 +    if (x86_cpu_enable_simd) {
 +        s->hash_bits = 15;
 +    } else {
 +        s->hash_bits = memLevel + 7;
 +    }
 +
      s->hash_size = 1 << s->hash_bits;
      s->hash_mask = s->hash_size - 1;
      s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
  
 -    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
 +    s->window = (Bytef *) ZALLOC(strm, s->w_size + window_padding, 2*sizeof(Byte));
      s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
      s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
-     s->class_bitmap = NULL;
-@@ -369,11 +405,7 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
+ 
+@@ -365,11 +401,7 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
          str = s->strstart;
          n = s->lookahead - (MIN_MATCH-1);
          do {
 -            UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
 -#ifndef FASTEST
 -            s->prev[str & s->w_mask] = s->head[s->ins_h];
 -#endif
 -            s->head[s->ins_h] = (Pos)str;
 +            insert_string(s, str);
              str++;
          } while (--n);
          s->strstart = str;
-@@ -696,7 +728,7 @@ int ZEXPORT deflate (strm, flush)
+@@ -690,7 +722,7 @@ int ZEXPORT deflate (strm, flush)
      if (s->status == INIT_STATE) {
  #ifdef GZIP
          if (s->wrap == 2) {
 -            strm->adler = crc32(0L, Z_NULL, 0);
 +            crc_reset(s);
              put_byte(s, 31);
              put_byte(s, 139);
              put_byte(s, 8);
-@@ -975,6 +1007,7 @@ int ZEXPORT deflate (strm, flush)
+@@ -952,6 +984,7 @@ int ZEXPORT deflate (strm, flush)
      /* Write the trailer */
  #ifdef GZIP
      if (s->wrap == 2) {
 +        crc_finalize(s);
          put_byte(s, (Byte)(strm->adler & 0xff));
          put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
          put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
-@@ -1097,7 +1130,7 @@ int ZEXPORT deflateCopy (dest, source)
+@@ -1073,7 +1106,7 @@ int ZEXPORT deflateCopy (dest, source)
   * allocating a large strm->next_in buffer and copying from it.
   * (See also flush_pending()).
   */
 -local int read_buf(strm, buf, size)
 +ZLIB_INTERNAL int read_buf(strm, buf, size)
      z_streamp strm;
      Bytef *buf;
      unsigned size;
-@@ -1109,15 +1142,16 @@ local int read_buf(strm, buf, size)
+@@ -1085,15 +1118,16 @@ local int read_buf(strm, buf, size)
  
      strm->avail_in  -= len;
  
 -    zmemcpy(buf, strm->next_in, len);
 -    if (strm->state->wrap == 1) {
 -        strm->adler = adler32(strm->adler, buf, len);
 -    }
  #ifdef GZIP
 -    else if (strm->state->wrap == 2) {
 -        strm->adler = crc32(strm->adler, buf, len);
 -    }
 +    if (strm->state->wrap == 2)
 +        copy_with_crc(strm, buf, len);
 +    else 
  #endif
 +    {
 +        zmemcpy(buf, strm->next_in, len);
 +        if (strm->state->wrap == 1)
 +            strm->adler = adler32(strm->adler, buf, len);
 +    }
      strm->next_in  += len;
      strm->total_in += len;
  
-@@ -1530,7 +1564,19 @@ local void check_match(s, start, match, length)
+@@ -1387,7 +1421,19 @@ local void check_match(s, start, match, length)
   *    performed for at least two bytes (required for the zip translate_eol
   *    option -- not supported here).
   */
 -local void fill_window(s)
 +local void fill_window_c(deflate_state *s);
 +
 +local void fill_window(deflate_state *s)
 +{
 +    if (x86_cpu_enable_simd) {
 +        fill_window_sse(s);
 +        return;
 +    }
 +
 +    fill_window_c(s);
 +}
 +
 +local void fill_window_c(s)
      deflate_state *s;
  {
      register unsigned n, m;
-@@ -1818,7 +1864,7 @@ local block_state deflate_fast(s, flush, clas)
+@@ -1651,7 +1697,7 @@ local block_state deflate_fast(s, flush)
           */
          hash_head = NIL;
          if (s->lookahead >= MIN_MATCH) {
 -            INSERT_STRING(s, s->strstart, hash_head);
 +            hash_head = insert_string(s, s->strstart);
          }
  
          /* Find the longest match, discarding those <= prev_length.
-@@ -1849,7 +1895,7 @@ local block_state deflate_fast(s, flush, clas)
+@@ -1682,7 +1728,7 @@ local block_state deflate_fast(s, flush)
                  s->match_length--; /* string at strstart already in table */
                  do {
                      s->strstart++;
 -                    INSERT_STRING(s, s->strstart, hash_head);
 +                    hash_head = insert_string(s, s->strstart);
                      /* strstart never exceeds WSIZE-MAX_MATCH, so there are
                       * always MIN_MATCH bytes ahead.
                       */
-@@ -1934,7 +1980,7 @@ local block_state deflate_slow(s, flush, clas)
+@@ -1754,7 +1800,7 @@ local block_state deflate_slow(s, flush)
           */
          hash_head = NIL;
          if (s->lookahead >= MIN_MATCH) {
 -            INSERT_STRING(s, s->strstart, hash_head);
 +            hash_head = insert_string(s, s->strstart);
          }
  
          /* Find the longest match, discarding those <= prev_length.
-@@ -2003,7 +2049,7 @@ local block_state deflate_slow(s, flush, clas)
+@@ -1805,7 +1851,7 @@ local block_state deflate_slow(s, flush)
              s->prev_length -= 2;
              do {
                  if (++s->strstart <= max_insert) {
 -                    INSERT_STRING(s, s->strstart, hash_head);
 +                    hash_head = insert_string(s, s->strstart);
                  }
              } while (--s->prev_length != 0);
              s->match_available = 0;
-@@ -2163,3 +2209,37 @@ local block_state deflate_huff(s, flush)
+@@ -1965,3 +2011,37 @@ local block_state deflate_huff(s, flush)
          FLUSH_BLOCK(s, 0);
      return block_done;
  }
 +
 +/* Safe to inline this as GCC/clang will use inline asm and Visual Studio will
 + * use intrinsic without extra params
 + */
 +local INLINE Pos insert_string_sse(deflate_state *const s, const Pos str)
 +{
 +    Pos ret;
@@ skipping 18 matching lines @@
 +    /* This should never happen */
 +    assert(0);
 +#endif
 +
 +    ret = s->head[h & s->hash_mask];
 +    s->head[h & s->hash_mask] = str;
 +    s->prev[str & s->w_mask] = ret;
 +    return ret;
 +}
 diff --git a/third_party/zlib/deflate.h b/third_party/zlib/deflate.h
-index c795034..c61e4ab 100644
+index ce0299edd191..022d9c326ecc 100644
 --- a/third_party/zlib/deflate.h
 +++ b/third_party/zlib/deflate.h
-@@ -109,7 +109,7 @@ typedef struct internal_state {
+@@ -106,7 +106,7 @@ typedef struct internal_state {
      uInt   gzindex;      /* where in extra, name, or comment */
      Byte  method;        /* can only be DEFLATED */
      int   last_flush;    /* value of flush param for previous deflate call */
 -
 +    unsigned zalign(16) crc0[4 * 5];
                  /* used by deflate.c: */
  
      uInt  w_size;        /* LZ77 window size (32K by default) */
-@@ -348,4 +348,14 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
+@@ -343,4 +343,14 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
                flush = _tr_tally(s, distance, length)
  #endif
  
 +/* Functions that are SIMD optimised on x86 */
 +void ZLIB_INTERNAL crc_fold_init(deflate_state* const s);
 +void ZLIB_INTERNAL crc_fold_copy(deflate_state* const s,
 +                                 unsigned char* dst,
 +                                 const unsigned char* src,
 +                                 long len);
 +unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state* const s);
 +
 +void ZLIB_INTERNAL fill_window_sse(deflate_state* s);
 +
  #endif /* DEFLATE_H */
 diff --git a/third_party/zlib/fill_window_sse.c b/third_party/zlib/fill_window_sse.c
-new file mode 100644
-index 0000000..949ccce
---- /dev/null
+index e69de29bb2d1..949ccce1ba9c 100644
+--- a/third_party/zlib/fill_window_sse.c
 +++ b/third_party/zlib/fill_window_sse.c
 @@ -0,0 +1,175 @@
 +/*
 + * Fill Window with SSE2-optimized hash shifting
 + *
 + * Copyright (C) 2013 Intel Corporation
 + * Authors:
 + *  Arjan van de Ven    <arjan@linux.intel.com>
 + *  Jim Kukunas         <james.t.kukunas@linux.intel.com>
 + *
@@ skipping 157 matching lines @@
 +            if (init > s->window_size - s->high_water)
 +                init = s->window_size - s->high_water;
 +            zmemzero(s->window + s->high_water, (unsigned)init);
 +            s->high_water += init;
 +        }
 +    }
 +
 +    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
 +           "not enough room for search");
 +}
+diff --git a/third_party/zlib/mozzconf.h b/third_party/zlib/mozzconf.h
+index d7e9f91c5a12..10aca44b29a4 100644
+--- a/third_party/zlib/mozzconf.h
++++ b/third_party/zlib/mozzconf.h
+@@ -169,6 +169,14 @@
+ #define inflateResetKeep MOZ_Z_inflateResetKeep
+ #define gzopen_w MOZ_Z_gzopen_w
+ 
++/* Chromium-specific modifications */
++#define copy_with_crc MOZ_Z__copy_with_crc
++#define crc_finalize MOZ_Z__crc_finalize
++#define crc_reset MOZ_Z__crc_reset
++// read_buf used to be local, but this was changed in simd.patch.
++#define read_buf MOZ_Z__read_buf
++#define x86_check_features MOZ_Z__x86_check_features
++
+ /* Mangle Byte types except on Mac. */
+ #if !defined(__MACTYPES__)
+ #define Byte MOZ_Z_Byte
 diff --git a/third_party/zlib/simd_stub.c b/third_party/zlib/simd_stub.c
-new file mode 100644
-index 0000000..796f1f6
---- /dev/null
+index e69de29bb2d1..796f1f63f690 100644
+--- a/third_party/zlib/simd_stub.c
 +++ b/third_party/zlib/simd_stub.c
 @@ -0,0 +1,35 @@
 +/* simd_stub.c -- stub implementations
 +* Copyright (C) 2014 Intel Corporation
 +* For conditions of distribution and use, see copyright notice in zlib.h
 +*/
 +#include <assert.h>
 +
 +#include "deflate.h"
 +#include "x86.h"
@@ skipping 18 matching lines @@
 +
 +void ZLIB_INTERNAL fill_window_sse(deflate_state *s)
 +{
 +    assert(0);
 +}
 +
 +void x86_check_features(void)
 +{
 +}
 diff --git a/third_party/zlib/x86.c b/third_party/zlib/x86.c
-new file mode 100644
-index 0000000..e6532fd
---- /dev/null
+index e69de29bb2d1..e6532fd10ddb 100644
+--- a/third_party/zlib/x86.c
 +++ b/third_party/zlib/x86.c
 @@ -0,0 +1,91 @@
 +/*
 + * x86 feature check
 + *
 + * Copyright (C) 2013 Intel Corporation. All rights reserved.
 + * Author:
 + *  Jim Kukunas
 + * 
 + * For conditions of distribution and use, see copyright notice in zlib.h
@@ skipping 74 matching lines @@
 +    x86_cpu_has_sse42= regs[2] & 0x100000;
 +    x86_cpu_has_pclmulqdq = regs[2] & 0x2;
 +
 +    x86_cpu_enable_simd = x86_cpu_has_sse2 &&
 +                          x86_cpu_has_sse42 &&
 +                          x86_cpu_has_pclmulqdq;
 +    return TRUE;
 +}
 +#endif  /* _MSC_VER */
 diff --git a/third_party/zlib/x86.h b/third_party/zlib/x86.h
-new file mode 100644
-index 0000000..ac3d180
---- /dev/null
+index e69de29bb2d1..ebcf10ab09d2 100644
+--- a/third_party/zlib/x86.h
 +++ b/third_party/zlib/x86.h
 @@ -0,0 +1,15 @@
 +/* x86.h -- check for x86 CPU features
 +* Copyright (C) 2013 Intel Corporation Jim Kukunas
 +* For conditions of distribution and use, see copyright notice in zlib.h
 +*/
 +
 +#ifndef X86_H
 +#define X86_H
 +
 +#include "zlib.h"
 +
 +extern int x86_cpu_enable_simd;
 +
 +void x86_check_features(void);
 +
 +#endif  /* X86_H */
-diff --git a/third_party/zlib/mozzconf.h b/third_party/zlib/mozzconf.h
-index 06918bc..10aca44 100644
---- a/third_party/zlib/mozzconf.h
-+++ b/third_party/zlib/mozzconf.h
-@@ -169,6 +169,14 @@
- #define inflateResetKeep MOZ_Z_inflateResetKeep
- #define gzopen_w MOZ_Z_gzopen_w
-
-+/* Chromium-specific modifications */
-+#define copy_with_crc MOZ_Z__copy_with_crc
-+#define crc_finalize MOZ_Z__crc_finalize
-+#define crc_reset MOZ_Z__crc_reset
-+// read_buf used to be local, but this was changed in simd.patch.
-+#define read_buf MOZ_Z__read_buf
-+#define x86_check_features MOZ_Z__x86_check_features
-+
- /* Mangle Byte types except on Mac. */
- #if !defined(__MACTYPES__)
- #define Byte MOZ_Z_Byte
---
-2.7.4
-