Bug fix: add missing source files in CMakeLists.txt

.gitignore

@@ -23,4 +23,14 @@
 /zlib.pc
 /configure.log
 
+*.obj
+*.lib
+*.pdb
+*.exp
+*.dll
+*.exe
+*.res
+
+*.swp
+
 .DS_Store

CMakeLists.txt

@@ -103,6 +103,7 @@ set(ZLIB_PRIVATE_HDRS
  inflate.h
  inftrees.h
  trees.h
+ x86.h
  zutil.h
 )
 set(ZLIB_SRCS
@@ -120,7 +121,12 @@ set(ZLIB_SRCS
  inffast.c
  trees.c
  uncompr.c
+ x86.c
  zutil.c
+ match.c
+ crc_folding.c
+ slide_sse.c
+ deflate_medium.c
 )
 
 if(NOT MINGW)

Makefile.in

@@ -57,11 +57,11 @@ SRCDIR=
 ZINC=
 ZINCOUT=-I.
 
-OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
+OBJZ = adler32.o crc32.o crc_folding.o deflate_quick.o deflate_medium.o deflate.o infback.o inffast.o inflate.o inftrees.o match.o slide_sse.o trees.o x86.o  zutil.o
 OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
 OBJC = $(OBJZ) $(OBJG)
 
-PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo
+PIC_OBJZ = adler32.lo crc32.lo crc_folding.lo deflate_quick.lo deflate_medium.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo match.lo slide_sse.lo trees.lo x86.lo zutil.lo
 PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo
 PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG)
 
@@ -131,18 +131,6 @@ libz.a: $(OBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS)
 	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
 
-match.o: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c _match.s
-	mv _match.o match.o
-	rm -f _match.s
-
-match.lo: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c -fPIC _match.s
-	mv _match.o match.lo
-	rm -f _match.s
-
 example.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h
 	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/example.c
 
@@ -201,6 +189,23 @@ gzread.o: $(SRCDIR)gzread.c
 gzwrite.o: $(SRCDIR)gzwrite.c
 	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzwrite.c
 
+x86.o: $(SRCDIR)x86.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)x86.c
+
+slide_sse.o: $(SRCDIR)slide_sse.c
+	$(CC) $(CFLAGS) $(ZINC) -msse2 -c -o $@ $(SRCDIR)slide_sse.c
+
+crc_folding.o: $(SRCDIR)crc_folding.c
+	$(CC) $(CFLAGS) $(ZINC) -mpclmul -msse4 -c -o $@ $(SRCDIR)crc_folding.c
+
+deflate_quick.o: $(SRCDIR)deflate_quick.c
+	$(CC) $(CFLAGS) $(ZINC) -msse4 -c -o $@ $(SRCDIR)deflate_quick.c
+
+deflate_medium.o: $(SRCDIR)deflate_medium.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)deflate_medium.c
+
+match.o: $(SRCDIR)match.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)match.c
 
 adler32.lo: $(SRCDIR)adler32.c
 	-@mkdir objs 2>/dev/null || test -d objs
@@ -277,6 +282,35 @@ gzwrite.lo: $(SRCDIR)gzwrite.c
 	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c
 	-@mv objs/gzwrite.o $@
 
+x86.lo: $(SRCDIR)x86.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/x86.o $(SRCDIR)x86.c
+	-@mv objs/x86.o $@
+
+slide_sse.lo: $(SRCDIR)slide_sse.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -msse2 -DPIC -c -o objs/slide_sse.o $(SRCDIR)slide_sse.c
+	-@mv objs/slide_sse.o $@
+
+crc_folding.lo: $(SRCDIR)crc_folding.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -mpclmul -msse4 -DPIC -c -o objs/crc_folding.o $(SRCDIR)crc_folding.c
+	-@mv objs/crc_folding.o $@
+
+deflate_quick.lo: $(SRCDIR)deflate_quick.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -msse4 -DPIC -c -o objs/deflate_quick.o $(SRCDIR)deflate_quick.c
+	-@mv objs/deflate_quick.o $@
+
+deflate_medium.lo: $(SRCDIR)deflate_medium.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/deflate_medium.o $(SRCDIR)deflate_medium.c
+	-@mv objs/deflate_medium.o $@
+
+match.lo: $(SRCDIR)match.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/match.o $(SRCDIR)match.c
+	-@mv objs/match.o $@
 
 placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
 	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
@@ -398,6 +432,7 @@ infback.o inflate.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.
 inffast.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
 inftrees.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
 trees.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
+x86.o: $(SRCDIR)x86.h
 
 adler32.lo zutil.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
 gzclose.lo gzlib.lo gzread.lo gzwrite.lo: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h
@@ -408,3 +443,4 @@ infback.lo inflate.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftree
 inffast.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
 inftrees.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
 trees.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
+x86.lo: $(SRCDIR)x86.h

adler32.c

@@ -102,21 +102,37 @@ uLong ZEXPORT adler32_z(adler, buf, len)
  /* do length NMAX blocks -- requires just one modulo operation */
  while (len >= NMAX) {
  len -= NMAX;
+#ifndef ADLER32_UNROLL_LESS
  n = NMAX / 16; /* NMAX is divisible by 16 */
+#else
+ n = NMAX / 8; /* NMAX is divisible by 8 */
+#endif
  do {
+#ifndef ADLER32_UNROLL_LESS
  DO16(buf); /* 16 sums unrolled */
  buf += 16;
+#else
+ DO8(buf,0); /* 8 sums unrolled */
+ buf += 8;
+#endif
  } while (--n);
  MOD(adler);
  MOD(sum2);
  }
 
  /* do remaining bytes (less than NMAX, still just one modulo) */
  if (len) { /* avoid modulos if none remaining */
+#ifndef ADLER32_UNROLL_LESS
  while (len >= 16) {
  len -= 16;
  DO16(buf);
  buf += 16;
+#else
+ while (len >= 8) {
+ len -= 8;
+ DO8(buf, 0);
+ buf += 8;
+#endif
  }
  while (len--) {
  adler += *buf++;

crc32.c

@@ -197,6 +197,7 @@ const z_crc_t FAR * ZEXPORT get_crc_table()
 /* ========================================================================= */
 #define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
 #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
+#define DO4 DO1; DO1; DO1; DO1
 
 /* ========================================================================= */
 unsigned long ZEXPORT crc32_z(crc, buf, len)
@@ -223,10 +224,19 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
  }
 #endif /* BYFOUR */
  crc = crc ^ 0xffffffffUL;
+
+#ifdef CRC32_UNROLL_LESS
+ while (len >= 4) {
+ DO4;
+ len -= 4;
+ }
+#else
  while (len >= 8) {
  DO8;
  len -= 8;
  }
+#endif
+
  if (len) do {
  DO1;
  } while (--len);
@@ -279,10 +289,14 @@ local unsigned long crc32_little(crc, buf, len)
  }
 
  buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
+
+#ifndef CRC32_UNROLL_LESS
  while (len >= 32) {
  DOLIT32;
  len -= 32;
  }
+#endif
+
  while (len >= 4) {
  DOLIT4;
  len -= 4;
@@ -440,3 +454,4 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
 {
  return crc32_combine_(crc1, crc2, len2);
 }
+

.gitignore

@@ -23,4 +23,14 @@
 /zlib.pc
 /configure.log
 
+*.obj
+*.lib
+*.pdb
+*.exp
+*.dll
+*.exe
+*.res
+
+*.swp
+
 .DS_Store

CMakeLists.txt

@@ -103,6 +103,7 @@ set(ZLIB_PRIVATE_HDRS
  inflate.h
  inftrees.h
  trees.h
+ x86.h
  zutil.h
 )
 set(ZLIB_SRCS
@@ -120,7 +121,12 @@ set(ZLIB_SRCS
  inffast.c
  trees.c
  uncompr.c
+ x86.c
  zutil.c
+ match.c
+ crc_folding.c
+ slide_sse.c
+ deflate_medium.c
 )
 
 if(NOT MINGW)

Makefile.in

@@ -57,11 +57,11 @@ SRCDIR=
 ZINC=
 ZINCOUT=-I.
 
-OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
+OBJZ = adler32.o crc32.o crc_folding.o deflate_quick.o deflate_medium.o deflate.o infback.o inffast.o inflate.o inftrees.o match.o slide_sse.o trees.o x86.o  zutil.o
 OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
 OBJC = $(OBJZ) $(OBJG)
 
-PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo
+PIC_OBJZ = adler32.lo crc32.lo crc_folding.lo deflate_quick.lo deflate_medium.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo match.lo slide_sse.lo trees.lo x86.lo zutil.lo
 PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo
 PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG)
 
@@ -131,18 +131,6 @@ libz.a: $(OBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS)
 	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
 
-match.o: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c _match.s
-	mv _match.o match.o
-	rm -f _match.s
-
-match.lo: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c -fPIC _match.s
-	mv _match.o match.lo
-	rm -f _match.s
-
 example.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h
 	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/example.c
 
@@ -201,6 +189,23 @@ gzread.o: $(SRCDIR)gzread.c
 gzwrite.o: $(SRCDIR)gzwrite.c
 	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzwrite.c
 
+x86.o: $(SRCDIR)x86.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)x86.c
+
+slide_sse.o: $(SRCDIR)slide_sse.c
+	$(CC) $(CFLAGS) $(ZINC) -msse2 -c -o $@ $(SRCDIR)slide_sse.c
+
+crc_folding.o: $(SRCDIR)crc_folding.c
+	$(CC) $(CFLAGS) $(ZINC) -mpclmul -msse4 -c -o $@ $(SRCDIR)crc_folding.c
+
+deflate_quick.o: $(SRCDIR)deflate_quick.c
+	$(CC) $(CFLAGS) $(ZINC) -msse4 -c -o $@ $(SRCDIR)deflate_quick.c
+
+deflate_medium.o: $(SRCDIR)deflate_medium.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)deflate_medium.c
+
+match.o: $(SRCDIR)match.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)match.c
 
 adler32.lo: $(SRCDIR)adler32.c
 	-@mkdir objs 2>/dev/null || test -d objs
@@ -277,6 +282,35 @@ gzwrite.lo: $(SRCDIR)gzwrite.c
 	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c
 	-@mv objs/gzwrite.o $@
 
+x86.lo: $(SRCDIR)x86.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/x86.o $(SRCDIR)x86.c
+	-@mv objs/x86.o $@
+
+slide_sse.lo: $(SRCDIR)slide_sse.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -msse2 -DPIC -c -o objs/slide_sse.o $(SRCDIR)slide_sse.c
+	-@mv objs/slide_sse.o $@
+
+crc_folding.lo: $(SRCDIR)crc_folding.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -mpclmul -msse4 -DPIC -c -o objs/crc_folding.o $(SRCDIR)crc_folding.c
+	-@mv objs/crc_folding.o $@
+
+deflate_quick.lo: $(SRCDIR)deflate_quick.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -msse4 -DPIC -c -o objs/deflate_quick.o $(SRCDIR)deflate_quick.c
+	-@mv objs/deflate_quick.o $@
+
+deflate_medium.lo: $(SRCDIR)deflate_medium.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/deflate_medium.o $(SRCDIR)deflate_medium.c
+	-@mv objs/deflate_medium.o $@
+
+match.lo: $(SRCDIR)match.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/match.o $(SRCDIR)match.c
+	-@mv objs/match.o $@
 
 placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
 	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
@@ -398,6 +432,7 @@ infback.o inflate.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.
 inffast.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
 inftrees.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
 trees.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
+x86.o: $(SRCDIR)x86.h
 
 adler32.lo zutil.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
 gzclose.lo gzlib.lo gzread.lo gzwrite.lo: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h
@@ -408,3 +443,4 @@ infback.lo inflate.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftree
 inffast.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
 inftrees.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
 trees.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
+x86.lo: $(SRCDIR)x86.h

adler32.c

@@ -102,21 +102,37 @@ uLong ZEXPORT adler32_z(adler, buf, len)
  /* do length NMAX blocks -- requires just one modulo operation */
  while (len >= NMAX) {
  len -= NMAX;
+#ifndef ADLER32_UNROLL_LESS
  n = NMAX / 16; /* NMAX is divisible by 16 */
+#else
+ n = NMAX / 8; /* NMAX is divisible by 8 */
+#endif
  do {
+#ifndef ADLER32_UNROLL_LESS
  DO16(buf); /* 16 sums unrolled */
  buf += 16;
+#else
+ DO8(buf,0); /* 8 sums unrolled */
+ buf += 8;
+#endif
  } while (--n);
  MOD(adler);
  MOD(sum2);
  }
 
  /* do remaining bytes (less than NMAX, still just one modulo) */
  if (len) { /* avoid modulos if none remaining */
+#ifndef ADLER32_UNROLL_LESS
  while (len >= 16) {
  len -= 16;
  DO16(buf);
  buf += 16;
+#else
+ while (len >= 8) {
+ len -= 8;
+ DO8(buf, 0);
+ buf += 8;
+#endif
  }
  while (len--) {
  adler += *buf++;

crc32.c

@@ -197,6 +197,7 @@ const z_crc_t FAR * ZEXPORT get_crc_table()
 /* ========================================================================= */
 #define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
 #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
+#define DO4 DO1; DO1; DO1; DO1
 
 /* ========================================================================= */
 unsigned long ZEXPORT crc32_z(crc, buf, len)
@@ -223,10 +224,19 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
  }
 #endif /* BYFOUR */
  crc = crc ^ 0xffffffffUL;
+
+#ifdef CRC32_UNROLL_LESS
+ while (len >= 4) {
+ DO4;
+ len -= 4;
+ }
+#else
  while (len >= 8) {
  DO8;
  len -= 8;
  }
+#endif
+
  if (len) do {
  DO1;
  } while (--len);
@@ -279,10 +289,14 @@ local unsigned long crc32_little(crc, buf, len)
  }
 
  buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
+
+#ifndef CRC32_UNROLL_LESS
  while (len >= 32) {
  DOLIT32;
  len -= 32;
  }
+#endif
+
  while (len >= 4) {
  DOLIT4;
  len -= 4;
@@ -440,3 +454,4 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
 {
  return crc32_combine_(crc1, crc2, len2);
 }
+

.gitignore

@@ -23,4 +23,14 @@
 /zlib.pc
 /configure.log
 
+*.obj
+*.lib
+*.pdb
+*.exp
+*.dll
+*.exe
+*.res
+
+*.swp
+
 .DS_Store

CMakeLists.txt

@@ -103,6 +103,7 @@ set(ZLIB_PRIVATE_HDRS
  inflate.h
  inftrees.h
  trees.h
+ x86.h
  zutil.h
 )
 set(ZLIB_SRCS
@@ -120,7 +121,12 @@ set(ZLIB_SRCS
  inffast.c
  trees.c
  uncompr.c
+ x86.c
  zutil.c
+ match.c
+ crc_folding.c
+ slide_sse.c
+ deflate_medium.c
 )
 
 if(NOT MINGW)

Makefile.in

@@ -57,11 +57,11 @@ SRCDIR=
 ZINC=
 ZINCOUT=-I.
 
-OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
+OBJZ = adler32.o crc32.o crc_folding.o deflate_quick.o deflate_medium.o deflate.o infback.o inffast.o inflate.o inftrees.o match.o slide_sse.o trees.o x86.o  zutil.o
 OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
 OBJC = $(OBJZ) $(OBJG)
 
-PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo
+PIC_OBJZ = adler32.lo crc32.lo crc_folding.lo deflate_quick.lo deflate_medium.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo match.lo slide_sse.lo trees.lo x86.lo zutil.lo
 PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo
 PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG)
 
@@ -131,18 +131,6 @@ libz.a: $(OBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS)
 	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
 
-match.o: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c _match.s
-	mv _match.o match.o
-	rm -f _match.s
-
-match.lo: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c -fPIC _match.s
-	mv _match.o match.lo
-	rm -f _match.s
-
 example.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h
 	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/example.c
 
@@ -201,6 +189,23 @@ gzread.o: $(SRCDIR)gzread.c
 gzwrite.o: $(SRCDIR)gzwrite.c
 	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzwrite.c
 
+x86.o: $(SRCDIR)x86.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)x86.c
+
+slide_sse.o: $(SRCDIR)slide_sse.c
+	$(CC) $(CFLAGS) $(ZINC) -msse2 -c -o $@ $(SRCDIR)slide_sse.c
+
+crc_folding.o: $(SRCDIR)crc_folding.c
+	$(CC) $(CFLAGS) $(ZINC) -mpclmul -msse4 -c -o $@ $(SRCDIR)crc_folding.c
+
+deflate_quick.o: $(SRCDIR)deflate_quick.c
+	$(CC) $(CFLAGS) $(ZINC) -msse4 -c -o $@ $(SRCDIR)deflate_quick.c
+
+deflate_medium.o: $(SRCDIR)deflate_medium.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)deflate_medium.c
+
+match.o: $(SRCDIR)match.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)match.c
 
 adler32.lo: $(SRCDIR)adler32.c
 	-@mkdir objs 2>/dev/null || test -d objs
@@ -277,6 +282,35 @@ gzwrite.lo: $(SRCDIR)gzwrite.c
 	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c
 	-@mv objs/gzwrite.o $@
 
+x86.lo: $(SRCDIR)x86.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/x86.o $(SRCDIR)x86.c
+	-@mv objs/x86.o $@
+
+slide_sse.lo: $(SRCDIR)slide_sse.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -msse2 -DPIC -c -o objs/slide_sse.o $(SRCDIR)slide_sse.c
+	-@mv objs/slide_sse.o $@
+
+crc_folding.lo: $(SRCDIR)crc_folding.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -mpclmul -msse4 -DPIC -c -o objs/crc_folding.o $(SRCDIR)crc_folding.c
+	-@mv objs/crc_folding.o $@
+
+deflate_quick.lo: $(SRCDIR)deflate_quick.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -msse4 -DPIC -c -o objs/deflate_quick.o $(SRCDIR)deflate_quick.c
+	-@mv objs/deflate_quick.o $@
+
+deflate_medium.lo: $(SRCDIR)deflate_medium.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/deflate_medium.o $(SRCDIR)deflate_medium.c
+	-@mv objs/deflate_medium.o $@
+
+match.lo: $(SRCDIR)match.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/match.o $(SRCDIR)match.c
+	-@mv objs/match.o $@
 
 placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
 	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
@@ -398,6 +432,7 @@ infback.o inflate.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.
 inffast.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
 inftrees.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
 trees.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
+x86.o: $(SRCDIR)x86.h
 
 adler32.lo zutil.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
 gzclose.lo gzlib.lo gzread.lo gzwrite.lo: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h
@@ -408,3 +443,4 @@ infback.lo inflate.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftree
 inffast.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
 inftrees.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
 trees.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
+x86.lo: $(SRCDIR)x86.h

adler32.c

@@ -102,21 +102,37 @@ uLong ZEXPORT adler32_z(adler, buf, len)
  /* do length NMAX blocks -- requires just one modulo operation */
  while (len >= NMAX) {
  len -= NMAX;
+#ifndef ADLER32_UNROLL_LESS
  n = NMAX / 16; /* NMAX is divisible by 16 */
+#else
+ n = NMAX / 8; /* NMAX is divisible by 8 */
+#endif
  do {
+#ifndef ADLER32_UNROLL_LESS
  DO16(buf); /* 16 sums unrolled */
  buf += 16;
+#else
+ DO8(buf,0); /* 8 sums unrolled */
+ buf += 8;
+#endif
  } while (--n);
  MOD(adler);
  MOD(sum2);
  }
 
  /* do remaining bytes (less than NMAX, still just one modulo) */
  if (len) { /* avoid modulos if none remaining */
+#ifndef ADLER32_UNROLL_LESS
  while (len >= 16) {
  len -= 16;
  DO16(buf);
  buf += 16;
+#else
+ while (len >= 8) {
+ len -= 8;
+ DO8(buf, 0);
+ buf += 8;
+#endif
  }
  while (len--) {
  adler += *buf++;

crc32.c

@@ -197,6 +197,7 @@ const z_crc_t FAR * ZEXPORT get_crc_table()
 /* ========================================================================= */
 #define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
 #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
+#define DO4 DO1; DO1; DO1; DO1
 
 /* ========================================================================= */
 unsigned long ZEXPORT crc32_z(crc, buf, len)
@@ -223,10 +224,19 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
  }
 #endif /* BYFOUR */
  crc = crc ^ 0xffffffffUL;
+
+#ifdef CRC32_UNROLL_LESS
+ while (len >= 4) {
+ DO4;
+ len -= 4;
+ }
+#else
  while (len >= 8) {
  DO8;
  len -= 8;
  }
+#endif
+
  if (len) do {
  DO1;
  } while (--len);
@@ -279,10 +289,14 @@ local unsigned long crc32_little(crc, buf, len)
  }
 
  buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
+
+#ifndef CRC32_UNROLL_LESS
  while (len >= 32) {
  DOLIT32;
  len -= 32;
  }
+#endif
+
  while (len >= 4) {
  DOLIT4;
  len -= 4;
@@ -440,3 +454,4 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
 {
  return crc32_combine_(crc1, crc2, len2);
 }
+

.gitignore

@@ -23,4 +23,14 @@
 /zlib.pc
 /configure.log
 
+*.obj
+*.lib
+*.pdb
+*.exp
+*.dll
+*.exe
+*.res
+
+*.swp
+
 .DS_Store

CMakeLists.txt

@@ -103,6 +103,7 @@ set(ZLIB_PRIVATE_HDRS
  inflate.h
  inftrees.h
  trees.h
+ x86.h
  zutil.h
 )
 set(ZLIB_SRCS
@@ -120,7 +121,12 @@ set(ZLIB_SRCS
  inffast.c
  trees.c
  uncompr.c
+ x86.c
  zutil.c
+ match.c
+ crc_folding.c
+ slide_sse.c
+ deflate_medium.c
 )
 
 if(NOT MINGW)

Makefile.in

@@ -57,11 +57,11 @@ SRCDIR=
 ZINC=
 ZINCOUT=-I.
 
-OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
+OBJZ = adler32.o crc32.o crc_folding.o deflate_quick.o deflate_medium.o deflate.o infback.o inffast.o inflate.o inftrees.o match.o slide_sse.o trees.o x86.o  zutil.o
 OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
 OBJC = $(OBJZ) $(OBJG)
 
-PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo
+PIC_OBJZ = adler32.lo crc32.lo crc_folding.lo deflate_quick.lo deflate_medium.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo match.lo slide_sse.lo trees.lo x86.lo zutil.lo
 PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo
 PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG)
 
@@ -131,18 +131,6 @@ libz.a: $(OBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS)
 	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
 
-match.o: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c _match.s
-	mv _match.o match.o
-	rm -f _match.s
-
-match.lo: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c -fPIC _match.s
-	mv _match.o match.lo
-	rm -f _match.s
-
 example.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h
 	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/example.c
 
@@ -201,6 +189,23 @@ gzread.o: $(SRCDIR)gzread.c
 gzwrite.o: $(SRCDIR)gzwrite.c
 	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzwrite.c
 
+x86.o: $(SRCDIR)x86.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)x86.c
+
+slide_sse.o: $(SRCDIR)slide_sse.c
+	$(CC) $(CFLAGS) $(ZINC) -msse2 -c -o $@ $(SRCDIR)slide_sse.c
+
+crc_folding.o: $(SRCDIR)crc_folding.c
+	$(CC) $(CFLAGS) $(ZINC) -mpclmul -msse4 -c -o $@ $(SRCDIR)crc_folding.c
+
+deflate_quick.o: $(SRCDIR)deflate_quick.c
+	$(CC) $(CFLAGS) $(ZINC) -msse4 -c -o $@ $(SRCDIR)deflate_quick.c
+
+deflate_medium.o: $(SRCDIR)deflate_medium.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)deflate_medium.c
+
+match.o: $(SRCDIR)match.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)match.c
 
 adler32.lo: $(SRCDIR)adler32.c
 	-@mkdir objs 2>/dev/null || test -d objs
@@ -277,6 +282,35 @@ gzwrite.lo: $(SRCDIR)gzwrite.c
 	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c
 	-@mv objs/gzwrite.o $@
 
+x86.lo: $(SRCDIR)x86.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/x86.o $(SRCDIR)x86.c
+	-@mv objs/x86.o $@
+
+slide_sse.lo: $(SRCDIR)slide_sse.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -msse2 -DPIC -c -o objs/slide_sse.o $(SRCDIR)slide_sse.c
+	-@mv objs/slide_sse.o $@
+
+crc_folding.lo: $(SRCDIR)crc_folding.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -mpclmul -msse4 -DPIC -c -o objs/crc_folding.o $(SRCDIR)crc_folding.c
+	-@mv objs/crc_folding.o $@
+
+deflate_quick.lo: $(SRCDIR)deflate_quick.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -msse4 -DPIC -c -o objs/deflate_quick.o $(SRCDIR)deflate_quick.c
+	-@mv objs/deflate_quick.o $@
+
+deflate_medium.lo: $(SRCDIR)deflate_medium.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/deflate_medium.o $(SRCDIR)deflate_medium.c
+	-@mv objs/deflate_medium.o $@
+
+match.lo: $(SRCDIR)match.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/match.o $(SRCDIR)match.c
+	-@mv objs/match.o $@
 
 placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
 	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
@@ -398,6 +432,7 @@ infback.o inflate.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.
 inffast.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
 inftrees.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
 trees.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
+x86.o: $(SRCDIR)x86.h
 
 adler32.lo zutil.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
 gzclose.lo gzlib.lo gzread.lo gzwrite.lo: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h
@@ -408,3 +443,4 @@ infback.lo inflate.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftree
 inffast.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
 inftrees.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
 trees.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
+x86.lo: $(SRCDIR)x86.h

adler32.c

@@ -102,21 +102,37 @@ uLong ZEXPORT adler32_z(adler, buf, len)
  /* do length NMAX blocks -- requires just one modulo operation */
  while (len >= NMAX) {
  len -= NMAX;
+#ifndef ADLER32_UNROLL_LESS
  n = NMAX / 16; /* NMAX is divisible by 16 */
+#else
+ n = NMAX / 8; /* NMAX is divisible by 8 */
+#endif
  do {
+#ifndef ADLER32_UNROLL_LESS
  DO16(buf); /* 16 sums unrolled */
  buf += 16;
+#else
+ DO8(buf,0); /* 8 sums unrolled */
+ buf += 8;
+#endif
  } while (--n);
  MOD(adler);
  MOD(sum2);
  }
 
  /* do remaining bytes (less than NMAX, still just one modulo) */
  if (len) { /* avoid modulos if none remaining */
+#ifndef ADLER32_UNROLL_LESS
  while (len >= 16) {
  len -= 16;
  DO16(buf);
  buf += 16;
+#else
+ while (len >= 8) {
+ len -= 8;
+ DO8(buf, 0);
+ buf += 8;
+#endif
  }
  while (len--) {
  adler += *buf++;

crc32.c

@@ -197,6 +197,7 @@ const z_crc_t FAR * ZEXPORT get_crc_table()
 /* ========================================================================= */
 #define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
 #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
+#define DO4 DO1; DO1; DO1; DO1
 
 /* ========================================================================= */
 unsigned long ZEXPORT crc32_z(crc, buf, len)
@@ -223,10 +224,19 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
  }
 #endif /* BYFOUR */
  crc = crc ^ 0xffffffffUL;
+
+#ifdef CRC32_UNROLL_LESS
+ while (len >= 4) {
+ DO4;
+ len -= 4;
+ }
+#else
  while (len >= 8) {
  DO8;
  len -= 8;
  }
+#endif
+
  if (len) do {
  DO1;
  } while (--len);
@@ -279,10 +289,14 @@ local unsigned long crc32_little(crc, buf, len)
  }
 
  buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
+
+#ifndef CRC32_UNROLL_LESS
  while (len >= 32) {
  DOLIT32;
  len -= 32;
  }
+#endif
+
  while (len >= 4) {
  DOLIT4;
  len -= 4;
@@ -440,3 +454,4 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
 {
  return crc32_combine_(crc1, crc2, len2);
 }
+

.gitignore

@@ -23,4 +23,14 @@
 /zlib.pc
 /configure.log
 
+*.obj
+*.lib
+*.pdb
+*.exp
+*.dll
+*.exe
+*.res
+
+*.swp
+
 .DS_Store

CMakeLists.txt

@@ -103,6 +103,7 @@ set(ZLIB_PRIVATE_HDRS
  inflate.h
  inftrees.h
  trees.h
+ x86.h
  zutil.h
 )
 set(ZLIB_SRCS
@@ -120,7 +121,12 @@ set(ZLIB_SRCS
  inffast.c
  trees.c
  uncompr.c
+ x86.c
  zutil.c
+ match.c
+ crc_folding.c
+ slide_sse.c
+ deflate_medium.c
 )
 
 if(NOT MINGW)

Makefile.in

@@ -57,11 +57,11 @@ SRCDIR=
 ZINC=
 ZINCOUT=-I.
 
-OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
+OBJZ = adler32.o crc32.o crc_folding.o deflate_quick.o deflate_medium.o deflate.o infback.o inffast.o inflate.o inftrees.o match.o slide_sse.o trees.o x86.o  zutil.o
 OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
 OBJC = $(OBJZ) $(OBJG)
 
-PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo
+PIC_OBJZ = adler32.lo crc32.lo crc_folding.lo deflate_quick.lo deflate_medium.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo match.lo slide_sse.lo trees.lo x86.lo zutil.lo
 PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo
 PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG)
 
@@ -131,18 +131,6 @@ libz.a: $(OBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS)
 	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
 
-match.o: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c _match.s
-	mv _match.o match.o
-	rm -f _match.s
-
-match.lo: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c -fPIC _match.s
-	mv _match.o match.lo
-	rm -f _match.s
-
 example.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h
 	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/example.c
 
@@ -201,6 +189,23 @@ gzread.o: $(SRCDIR)gzread.c
 gzwrite.o: $(SRCDIR)gzwrite.c
 	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzwrite.c
 
+x86.o: $(SRCDIR)x86.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)x86.c
+
+slide_sse.o: $(SRCDIR)slide_sse.c
+	$(CC) $(CFLAGS) $(ZINC) -msse2 -c -o $@ $(SRCDIR)slide_sse.c
+
+crc_folding.o: $(SRCDIR)crc_folding.c
+	$(CC) $(CFLAGS) $(ZINC) -mpclmul -msse4 -c -o $@ $(SRCDIR)crc_folding.c
+
+deflate_quick.o: $(SRCDIR)deflate_quick.c
+	$(CC) $(CFLAGS) $(ZINC) -msse4 -c -o $@ $(SRCDIR)deflate_quick.c
+
+deflate_medium.o: $(SRCDIR)deflate_medium.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)deflate_medium.c
+
+match.o: $(SRCDIR)match.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)match.c
 
 adler32.lo: $(SRCDIR)adler32.c
 	-@mkdir objs 2>/dev/null || test -d objs
@@ -277,6 +282,35 @@ gzwrite.lo: $(SRCDIR)gzwrite.c
 	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c
 	-@mv objs/gzwrite.o $@
 
+x86.lo: $(SRCDIR)x86.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/x86.o $(SRCDIR)x86.c
+	-@mv objs/x86.o $@
+
+slide_sse.lo: $(SRCDIR)slide_sse.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -msse2 -DPIC -c -o objs/slide_sse.o $(SRCDIR)slide_sse.c
+	-@mv objs/slide_sse.o $@
+
+crc_folding.lo: $(SRCDIR)crc_folding.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -mpclmul -msse4 -DPIC -c -o objs/crc_folding.o $(SRCDIR)crc_folding.c
+	-@mv objs/crc_folding.o $@
+
+deflate_quick.lo: $(SRCDIR)deflate_quick.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -msse4 -DPIC -c -o objs/deflate_quick.o $(SRCDIR)deflate_quick.c
+	-@mv objs/deflate_quick.o $@
+
+deflate_medium.lo: $(SRCDIR)deflate_medium.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/deflate_medium.o $(SRCDIR)deflate_medium.c
+	-@mv objs/deflate_medium.o $@
+
+match.lo: $(SRCDIR)match.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/match.o $(SRCDIR)match.c
+	-@mv objs/match.o $@
 
 placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
 	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
@@ -398,6 +432,7 @@ infback.o inflate.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.
 inffast.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
 inftrees.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
 trees.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
+x86.o: $(SRCDIR)x86.h
 
 adler32.lo zutil.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
 gzclose.lo gzlib.lo gzread.lo gzwrite.lo: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h
@@ -408,3 +443,4 @@ infback.lo inflate.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftree
 inffast.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
 inftrees.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
 trees.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
+x86.lo: $(SRCDIR)x86.h

adler32.c

@@ -102,21 +102,37 @@ uLong ZEXPORT adler32_z(adler, buf, len)
  /* do length NMAX blocks -- requires just one modulo operation */
  while (len >= NMAX) {
  len -= NMAX;
+#ifndef ADLER32_UNROLL_LESS
  n = NMAX / 16; /* NMAX is divisible by 16 */
+#else
+ n = NMAX / 8; /* NMAX is divisible by 8 */
+#endif
  do {
+#ifndef ADLER32_UNROLL_LESS
  DO16(buf); /* 16 sums unrolled */
  buf += 16;
+#else
+ DO8(buf,0); /* 8 sums unrolled */
+ buf += 8;
+#endif
  } while (--n);
  MOD(adler);
  MOD(sum2);
  }
 
  /* do remaining bytes (less than NMAX, still just one modulo) */
  if (len) { /* avoid modulos if none remaining */
+#ifndef ADLER32_UNROLL_LESS
  while (len >= 16) {
  len -= 16;
  DO16(buf);
  buf += 16;
+#else
+ while (len >= 8) {
+ len -= 8;
+ DO8(buf, 0);
+ buf += 8;
+#endif
  }
  while (len--) {
  adler += *buf++;

crc32.c

@@ -197,6 +197,7 @@ const z_crc_t FAR * ZEXPORT get_crc_table()
 /* ========================================================================= */
 #define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
 #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
+#define DO4 DO1; DO1; DO1; DO1
 
 /* ========================================================================= */
 unsigned long ZEXPORT crc32_z(crc, buf, len)
@@ -223,10 +224,19 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
  }
 #endif /* BYFOUR */
  crc = crc ^ 0xffffffffUL;
+
+#ifdef CRC32_UNROLL_LESS
+ while (len >= 4) {
+ DO4;
+ len -= 4;
+ }
+#else
  while (len >= 8) {
  DO8;
  len -= 8;
  }
+#endif
+
  if (len) do {
  DO1;
  } while (--len);
@@ -279,10 +289,14 @@ local unsigned long crc32_little(crc, buf, len)
  }
 
  buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
+
+#ifndef CRC32_UNROLL_LESS
  while (len >= 32) {
  DOLIT32;
  len -= 32;
  }
+#endif
+
  while (len >= 4) {
  DOLIT4;
  len -= 4;
@@ -440,3 +454,4 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
 {
  return crc32_combine_(crc1, crc2, len2);
 }
+

.gitignore

@@ -23,4 +23,14 @@
 /zlib.pc
 /configure.log
 
+*.obj
+*.lib
+*.pdb
+*.exp
+*.dll
+*.exe
+*.res
+
+*.swp
+
 .DS_Store

CMakeLists.txt

@@ -103,6 +103,7 @@ set(ZLIB_PRIVATE_HDRS
  inflate.h
  inftrees.h
  trees.h
+ x86.h
  zutil.h
 )
 set(ZLIB_SRCS
@@ -120,7 +121,12 @@ set(ZLIB_SRCS
  inffast.c
  trees.c
  uncompr.c
+ x86.c
  zutil.c
+ match.c
+ crc_folding.c
+ slide_sse.c
+ deflate_medium.c
 )
 
 if(NOT MINGW)

Makefile.in

@@ -57,11 +57,11 @@ SRCDIR=
 ZINC=
 ZINCOUT=-I.
 
-OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
+OBJZ = adler32.o crc32.o crc_folding.o deflate_quick.o deflate_medium.o deflate.o infback.o inffast.o inflate.o inftrees.o match.o slide_sse.o trees.o x86.o  zutil.o
 OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
 OBJC = $(OBJZ) $(OBJG)
 
-PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo
+PIC_OBJZ = adler32.lo crc32.lo crc_folding.lo deflate_quick.lo deflate_medium.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo match.lo slide_sse.lo trees.lo x86.lo zutil.lo
 PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo
 PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG)
 
@@ -131,18 +131,6 @@ libz.a: $(OBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS)
 	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
 
-match.o: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c _match.s
-	mv _match.o match.o
-	rm -f _match.s
-
-match.lo: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c -fPIC _match.s
-	mv _match.o match.lo
-	rm -f _match.s
-
 example.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h
 	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/example.c
 
@@ -201,6 +189,23 @@ gzread.o: $(SRCDIR)gzread.c
 gzwrite.o: $(SRCDIR)gzwrite.c
 	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzwrite.c
 
+x86.o: $(SRCDIR)x86.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)x86.c
+
+slide_sse.o: $(SRCDIR)slide_sse.c
+	$(CC) $(CFLAGS) $(ZINC) -msse2 -c -o $@ $(SRCDIR)slide_sse.c
+
+crc_folding.o: $(SRCDIR)crc_folding.c
+	$(CC) $(CFLAGS) $(ZINC) -mpclmul -msse4 -c -o $@ $(SRCDIR)crc_folding.c
+
+deflate_quick.o: $(SRCDIR)deflate_quick.c
+	$(CC) $(CFLAGS) $(ZINC) -msse4 -c -o $@ $(SRCDIR)deflate_quick.c
+
+deflate_medium.o: $(SRCDIR)deflate_medium.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)deflate_medium.c
+
+match.o: $(SRCDIR)match.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)match.c
 
 adler32.lo: $(SRCDIR)adler32.c
 	-@mkdir objs 2>/dev/null || test -d objs
@@ -277,6 +282,35 @@ gzwrite.lo: $(SRCDIR)gzwrite.c
 	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c
 	-@mv objs/gzwrite.o $@
 
+x86.lo: $(SRCDIR)x86.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/x86.o $(SRCDIR)x86.c
+	-@mv objs/x86.o $@
+
+slide_sse.lo: $(SRCDIR)slide_sse.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -msse2 -DPIC -c -o objs/slide_sse.o $(SRCDIR)slide_sse.c
+	-@mv objs/slide_sse.o $@
+
+crc_folding.lo: $(SRCDIR)crc_folding.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -mpclmul -msse4 -DPIC -c -o objs/crc_folding.o $(SRCDIR)crc_folding.c
+	-@mv objs/crc_folding.o $@
+
+deflate_quick.lo: $(SRCDIR)deflate_quick.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -msse4 -DPIC -c -o objs/deflate_quick.o $(SRCDIR)deflate_quick.c
+	-@mv objs/deflate_quick.o $@
+
+deflate_medium.lo: $(SRCDIR)deflate_medium.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/deflate_medium.o $(SRCDIR)deflate_medium.c
+	-@mv objs/deflate_medium.o $@
+
+match.lo: $(SRCDIR)match.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/match.o $(SRCDIR)match.c
+	-@mv objs/match.o $@
 
 placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
 	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
@@ -398,6 +432,7 @@ infback.o inflate.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.
 inffast.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
 inftrees.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
 trees.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
+x86.o: $(SRCDIR)x86.h
 
 adler32.lo zutil.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
 gzclose.lo gzlib.lo gzread.lo gzwrite.lo: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h
@@ -408,3 +443,4 @@ infback.lo inflate.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftree
 inffast.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
 inftrees.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
 trees.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
+x86.lo: $(SRCDIR)x86.h

adler32.c

@@ -102,21 +102,37 @@ uLong ZEXPORT adler32_z(adler, buf, len)
  /* do length NMAX blocks -- requires just one modulo operation */
  while (len >= NMAX) {
  len -= NMAX;
+#ifndef ADLER32_UNROLL_LESS
  n = NMAX / 16; /* NMAX is divisible by 16 */
+#else
+ n = NMAX / 8; /* NMAX is divisible by 8 */
+#endif
  do {
+#ifndef ADLER32_UNROLL_LESS
  DO16(buf); /* 16 sums unrolled */
  buf += 16;
+#else
+ DO8(buf,0); /* 8 sums unrolled */
+ buf += 8;
+#endif
  } while (--n);
  MOD(adler);
  MOD(sum2);
  }
 
  /* do remaining bytes (less than NMAX, still just one modulo) */
  if (len) { /* avoid modulos if none remaining */
+#ifndef ADLER32_UNROLL_LESS
  while (len >= 16) {
  len -= 16;
  DO16(buf);
  buf += 16;
+#else
+ while (len >= 8) {
+ len -= 8;
+ DO8(buf, 0);
+ buf += 8;
+#endif
  }
  while (len--) {
  adler += *buf++;

crc32.c

@@ -197,6 +197,7 @@ const z_crc_t FAR * ZEXPORT get_crc_table()
 /* ========================================================================= */
 #define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
 #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
+#define DO4 DO1; DO1; DO1; DO1
 
 /* ========================================================================= */
 unsigned long ZEXPORT crc32_z(crc, buf, len)
@@ -223,10 +224,19 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
  }
 #endif /* BYFOUR */
  crc = crc ^ 0xffffffffUL;
+
+#ifdef CRC32_UNROLL_LESS
+ while (len >= 4) {
+ DO4;
+ len -= 4;
+ }
+#else
  while (len >= 8) {
  DO8;
  len -= 8;
  }
+#endif
+
  if (len) do {
  DO1;
  } while (--len);
@@ -279,10 +289,14 @@ local unsigned long crc32_little(crc, buf, len)
  }
 
  buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
+
+#ifndef CRC32_UNROLL_LESS
  while (len >= 32) {
  DOLIT32;
  len -= 32;
  }
+#endif
+
  while (len >= 4) {
  DOLIT4;
  len -= 4;
@@ -440,3 +454,4 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
 {
  return crc32_combine_(crc1, crc2, len2);
 }
+

.gitignore

@@ -23,4 +23,14 @@
 /zlib.pc
 /configure.log
 
+*.obj
+*.lib
+*.pdb
+*.exp
+*.dll
+*.exe
+*.res
+
+*.swp
+
 .DS_Store

CMakeLists.txt

@@ -103,6 +103,7 @@ set(ZLIB_PRIVATE_HDRS
  inflate.h
  inftrees.h
  trees.h
+ x86.h
  zutil.h
 )
 set(ZLIB_SRCS
@@ -120,7 +121,12 @@ set(ZLIB_SRCS
  inffast.c
  trees.c
  uncompr.c
+ x86.c
  zutil.c
+ match.c
+ crc_folding.c
+ slide_sse.c
+ deflate_medium.c
 )
 
 if(NOT MINGW)

Makefile.in

@@ -57,11 +57,11 @@ SRCDIR=
 ZINC=
 ZINCOUT=-I.
 
-OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
+OBJZ = adler32.o crc32.o crc_folding.o deflate_quick.o deflate_medium.o deflate.o infback.o inffast.o inflate.o inftrees.o match.o slide_sse.o trees.o x86.o  zutil.o
 OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
 OBJC = $(OBJZ) $(OBJG)
 
-PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo
+PIC_OBJZ = adler32.lo crc32.lo crc_folding.lo deflate_quick.lo deflate_medium.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo match.lo slide_sse.lo trees.lo x86.lo zutil.lo
 PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo
 PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG)
 
@@ -131,18 +131,6 @@ libz.a: $(OBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS)
 	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
 
-match.o: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c _match.s
-	mv _match.o match.o
-	rm -f _match.s
-
-match.lo: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c -fPIC _match.s
-	mv _match.o match.lo
-	rm -f _match.s
-
 example.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h
 	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/example.c
 
@@ -201,6 +189,23 @@ gzread.o: $(SRCDIR)gzread.c
 gzwrite.o: $(SRCDIR)gzwrite.c
 	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzwrite.c
 
+x86.o: $(SRCDIR)x86.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)x86.c
+
+slide_sse.o: $(SRCDIR)slide_sse.c
+	$(CC) $(CFLAGS) $(ZINC) -msse2 -c -o $@ $(SRCDIR)slide_sse.c
+
+crc_folding.o: $(SRCDIR)crc_folding.c
+	$(CC) $(CFLAGS) $(ZINC) -mpclmul -msse4 -c -o $@ $(SRCDIR)crc_folding.c
+
+deflate_quick.o: $(SRCDIR)deflate_quick.c
+	$(CC) $(CFLAGS) $(ZINC) -msse4 -c -o $@ $(SRCDIR)deflate_quick.c
+
+deflate_medium.o: $(SRCDIR)deflate_medium.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)deflate_medium.c
+
+match.o: $(SRCDIR)match.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)match.c
 
 adler32.lo: $(SRCDIR)adler32.c
 	-@mkdir objs 2>/dev/null || test -d objs
@@ -277,6 +282,35 @@ gzwrite.lo: $(SRCDIR)gzwrite.c
 	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c
 	-@mv objs/gzwrite.o $@
 
+x86.lo: $(SRCDIR)x86.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/x86.o $(SRCDIR)x86.c
+	-@mv objs/x86.o $@
+
+slide_sse.lo: $(SRCDIR)slide_sse.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -msse2 -DPIC -c -o objs/slide_sse.o $(SRCDIR)slide_sse.c
+	-@mv objs/slide_sse.o $@
+
+crc_folding.lo: $(SRCDIR)crc_folding.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -mpclmul -msse4 -DPIC -c -o objs/crc_folding.o $(SRCDIR)crc_folding.c
+	-@mv objs/crc_folding.o $@
+
+deflate_quick.lo: $(SRCDIR)deflate_quick.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -msse4 -DPIC -c -o objs/deflate_quick.o $(SRCDIR)deflate_quick.c
+	-@mv objs/deflate_quick.o $@
+
+deflate_medium.lo: $(SRCDIR)deflate_medium.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/deflate_medium.o $(SRCDIR)deflate_medium.c
+	-@mv objs/deflate_medium.o $@
+
+match.lo: $(SRCDIR)match.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/match.o $(SRCDIR)match.c
+	-@mv objs/match.o $@
 
 placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
 	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
@@ -398,6 +432,7 @@ infback.o inflate.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.
 inffast.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
 inftrees.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
 trees.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
+x86.o: $(SRCDIR)x86.h
 
 adler32.lo zutil.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
 gzclose.lo gzlib.lo gzread.lo gzwrite.lo: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h
@@ -408,3 +443,4 @@ infback.lo inflate.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftree
 inffast.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
 inftrees.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
 trees.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
+x86.lo: $(SRCDIR)x86.h

adler32.c

@@ -102,21 +102,37 @@ uLong ZEXPORT adler32_z(adler, buf, len)
  /* do length NMAX blocks -- requires just one modulo operation */
  while (len >= NMAX) {
  len -= NMAX;
+#ifndef ADLER32_UNROLL_LESS
  n = NMAX / 16; /* NMAX is divisible by 16 */
+#else
+ n = NMAX / 8; /* NMAX is divisible by 8 */
+#endif
  do {
+#ifndef ADLER32_UNROLL_LESS
  DO16(buf); /* 16 sums unrolled */
  buf += 16;
+#else
+ DO8(buf,0); /* 8 sums unrolled */
+ buf += 8;
+#endif
  } while (--n);
  MOD(adler);
  MOD(sum2);
  }
 
  /* do remaining bytes (less than NMAX, still just one modulo) */
  if (len) { /* avoid modulos if none remaining */
+#ifndef ADLER32_UNROLL_LESS
  while (len >= 16) {
  len -= 16;
  DO16(buf);
  buf += 16;
+#else
+ while (len >= 8) {
+ len -= 8;
+ DO8(buf, 0);
+ buf += 8;
+#endif
  }
  while (len--) {
  adler += *buf++;

crc32.c

@@ -197,6 +197,7 @@ const z_crc_t FAR * ZEXPORT get_crc_table()
 /* ========================================================================= */
 #define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
 #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
+#define DO4 DO1; DO1; DO1; DO1
 
 /* ========================================================================= */
 unsigned long ZEXPORT crc32_z(crc, buf, len)
@@ -223,10 +224,19 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
  }
 #endif /* BYFOUR */
  crc = crc ^ 0xffffffffUL;
+
+#ifdef CRC32_UNROLL_LESS
+ while (len >= 4) {
+ DO4;
+ len -= 4;
+ }
+#else
  while (len >= 8) {
  DO8;
  len -= 8;
  }
+#endif
+
  if (len) do {
  DO1;
  } while (--len);
@@ -279,10 +289,14 @@ local unsigned long crc32_little(crc, buf, len)
  }
 
  buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
+
+#ifndef CRC32_UNROLL_LESS
  while (len >= 32) {
  DOLIT32;
  len -= 32;
  }
+#endif
+
  while (len >= 4) {
  DOLIT4;
  len -= 4;
@@ -440,3 +454,4 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
 {
  return crc32_combine_(crc1, crc2, len2);
 }
+

.gitignore

@@ -23,4 +23,14 @@
 /zlib.pc
 /configure.log
 
+*.obj
+*.lib
+*.pdb
+*.exp
+*.dll
+*.exe
+*.res
+
+*.swp
+
 .DS_Store

CMakeLists.txt

@@ -103,6 +103,7 @@ set(ZLIB_PRIVATE_HDRS
  inflate.h
  inftrees.h
  trees.h
+ x86.h
  zutil.h
 )
 set(ZLIB_SRCS
@@ -120,7 +121,12 @@ set(ZLIB_SRCS
  inffast.c
  trees.c
  uncompr.c
+ x86.c
  zutil.c
+ match.c
+ crc_folding.c
+ slide_sse.c
+ deflate_medium.c
 )
 
 if(NOT MINGW)

Makefile.in

@@ -57,11 +57,11 @@ SRCDIR=
 ZINC=
 ZINCOUT=-I.
 
-OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
+OBJZ = adler32.o crc32.o crc_folding.o deflate_quick.o deflate_medium.o deflate.o infback.o inffast.o inflate.o inftrees.o match.o slide_sse.o trees.o x86.o  zutil.o
 OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
 OBJC = $(OBJZ) $(OBJG)
 
-PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo
+PIC_OBJZ = adler32.lo crc32.lo crc_folding.lo deflate_quick.lo deflate_medium.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo match.lo slide_sse.lo trees.lo x86.lo zutil.lo
 PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo
 PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG)
 
@@ -131,18 +131,6 @@ libz.a: $(OBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS)
 	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
 
-match.o: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c _match.s
-	mv _match.o match.o
-	rm -f _match.s
-
-match.lo: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c -fPIC _match.s
-	mv _match.o match.lo
-	rm -f _match.s
-
 example.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h
 	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/example.c
 
@@ -201,6 +189,23 @@ gzread.o: $(SRCDIR)gzread.c
 gzwrite.o: $(SRCDIR)gzwrite.c
 	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzwrite.c
 
+x86.o: $(SRCDIR)x86.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)x86.c
+
+slide_sse.o: $(SRCDIR)slide_sse.c
+	$(CC) $(CFLAGS) $(ZINC) -msse2 -c -o $@ $(SRCDIR)slide_sse.c
+
+crc_folding.o: $(SRCDIR)crc_folding.c
+	$(CC) $(CFLAGS) $(ZINC) -mpclmul -msse4 -c -o $@ $(SRCDIR)crc_folding.c
+
+deflate_quick.o: $(SRCDIR)deflate_quick.c
+	$(CC) $(CFLAGS) $(ZINC) -msse4 -c -o $@ $(SRCDIR)deflate_quick.c
+
+deflate_medium.o: $(SRCDIR)deflate_medium.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)deflate_medium.c
+
+match.o: $(SRCDIR)match.c
+	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)match.c
 
 adler32.lo: $(SRCDIR)adler32.c
 	-@mkdir objs 2>/dev/null || test -d objs
@@ -277,6 +282,35 @@ gzwrite.lo: $(SRCDIR)gzwrite.c
 	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c
 	-@mv objs/gzwrite.o $@
 
+x86.lo: $(SRCDIR)x86.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/x86.o $(SRCDIR)x86.c
+	-@mv objs/x86.o $@
+
+slide_sse.lo: $(SRCDIR)slide_sse.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -msse2 -DPIC -c -o objs/slide_sse.o $(SRCDIR)slide_sse.c
+	-@mv objs/slide_sse.o $@
+
+crc_folding.lo: $(SRCDIR)crc_folding.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -mpclmul -msse4 -DPIC -c -o objs/crc_folding.o $(SRCDIR)crc_folding.c
+	-@mv objs/crc_folding.o $@
+
+deflate_quick.lo: $(SRCDIR)deflate_quick.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -msse4 -DPIC -c -o objs/deflate_quick.o $(SRCDIR)deflate_quick.c
+	-@mv objs/deflate_quick.o $@
+
+deflate_medium.lo: $(SRCDIR)deflate_medium.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/deflate_medium.o $(SRCDIR)deflate_medium.c
+	-@mv objs/deflate_medium.o $@
+
+match.lo: $(SRCDIR)match.c
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/match.o $(SRCDIR)match.c
+	-@mv objs/match.o $@
 
 placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
 	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
@@ -398,6 +432,7 @@ infback.o inflate.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.
 inffast.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
 inftrees.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
 trees.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
+x86.o: $(SRCDIR)x86.h
 
 adler32.lo zutil.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
 gzclose.lo gzlib.lo gzread.lo gzwrite.lo: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h
@@ -408,3 +443,4 @@ infback.lo inflate.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftree
 inffast.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
 inftrees.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
 trees.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
+x86.lo: $(SRCDIR)x86.h

adler32.c

@@ -102,21 +102,37 @@ uLong ZEXPORT adler32_z(adler, buf, len)
  /* do length NMAX blocks -- requires just one modulo operation */
  while (len >= NMAX) {
  len -= NMAX;
+#ifndef ADLER32_UNROLL_LESS
  n = NMAX / 16; /* NMAX is divisible by 16 */
+#else
+ n = NMAX / 8; /* NMAX is divisible by 8 */
+#endif
  do {
+#ifndef ADLER32_UNROLL_LESS
  DO16(buf); /* 16 sums unrolled */
  buf += 16;
+#else
+ DO8(buf,0); /* 8 sums unrolled */
+ buf += 8;
+#endif
  } while (--n);
  MOD(adler);
  MOD(sum2);
  }
 
  /* do remaining bytes (less than NMAX, still just one modulo) */
  if (len) { /* avoid modulos if none remaining */
+#ifndef ADLER32_UNROLL_LESS
  while (len >= 16) {
  len -= 16;
  DO16(buf);
  buf += 16;
+#else
+ while (len >= 8) {
+ len -= 8;
+ DO8(buf, 0);
+ buf += 8;
+#endif
  }
  while (len--) {
  adler += *buf++;

crc32.c

@@ -197,6 +197,7 @@ const z_crc_t FAR * ZEXPORT get_crc_table()
 /* ========================================================================= */
 #define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
 #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
+#define DO4 DO1; DO1; DO1; DO1
 
 /* ========================================================================= */
 unsigned long ZEXPORT crc32_z(crc, buf, len)
@@ -223,10 +224,19 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
  }
 #endif /* BYFOUR */
  crc = crc ^ 0xffffffffUL;
+
+#ifdef CRC32_UNROLL_LESS
+ while (len >= 4) {
+ DO4;
+ len -= 4;
+ }
+#else
  while (len >= 8) {
  DO8;
  len -= 8;
  }
+#endif
+
  if (len) do {
  DO1;
  } while (--len);
@@ -279,10 +289,14 @@ local unsigned long crc32_little(crc, buf, len)
  }
 
  buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
+
+#ifndef CRC32_UNROLL_LESS
  while (len >= 32) {
  DOLIT32;
  len -= 32;
  }
+#endif
+
  while (len >= 4) {
  DOLIT4;
  len -= 4;
@@ -440,3 +454,4 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
 {
  return crc32_combine_(crc1, crc2, len2);
 }
+