Skip to content
This repository was archived by the owner on Mar 1, 2024. It is now read-only.

deflate: avoid use of uninitialized variable #4

Closed
wants to merge 6 commits into from
Closed

deflate: avoid use of uninitialized variable #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8157940
Adds SSE2 optimized hash shifting to fill_window.
jtkukunas Jul 2, 2013
bbd9f3a
add SSE4.2 optimized hash function
jtkukunas Jul 18, 2013
d68a5e7
add PCLMULQDQ optimized CRC folding
jtkukunas Jul 11, 2013
bc86676
deflate: add new deflate_quick strategy for level 1
jtkukunas Jul 18, 2013
695f1a4
deflate: add new deflate_medium strategy
jtkukunas Jul 18, 2013
22f5a93
deflate: avoid use of uninitialized variable
nathankidd May 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 35 additions & 4 deletions Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ TAR=tar
SHELL=/bin/sh
EXE=

FILL_WINDOW_SSE_o=
FILL_WINDOW_SSE_lo=
CRC_FOLDING_o=
CRC_FOLDING_lo=
DEFLATE_QUICK_o=
DEFLATE_QUICK_lo=

prefix = /usr/local
exec_prefix = ${prefix}
libdir = ${exec_prefix}/lib
Expand All @@ -54,11 +61,11 @@ mandir = ${prefix}/share/man
man3dir = ${mandir}/man3
pkgconfigdir = ${libdir}/pkgconfig

OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
OBJZ = adler32.o ${CRC_FOLDING_o} ${DEFLATE_QUICK_o} crc32.o ${FILL_WINDOW_SSE_o} deflate.o infback.o inffast.o inflate.o inftrees.o trees.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 ${CRC_FOLDING_lo} ${DEFLATE_QUICK_lo} crc32.lo ${FILL_WINDOW_SSE_lo} deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo
PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo
PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG)

Expand Down Expand Up @@ -113,6 +120,30 @@ test64: all64
fi; \
rm -f $$TMP64

fill_window_sse.lo: fill_window_sse.c
-@mkdir objs 2>/dev/null || test -d objs
$(CC) $(SFLAGS) -msse2 -DPIC -c -o objs/$*.o $<
-@mv objs/$*.o $@

fill_window_sse.o: fill_window_sse.c
${CC} ${CFLAGS} -msse2 -I. -c -o $@ fill_window_sse.c

crc_folding.lo: crc_folding.c
-@mkdir objs 2>/dev/null || test -d objs
$(CC) $(SFLAGS) -mpclmul -msse4 -DPIC -c -o objs/$*.o $<
-@mv objs/$*.o $@

crc_folding.o: crc_folding.c
${CC} ${CFLAGS} -mpclmul -msse4 -I. -c -o $@ crc_folding.c

deflate_quick.lo: deflate_quick.c
-@mkdir objs 2>/dev/null || test -d objs
$(CC) $(SFLAGS) -msse4 -DPIC -c -o objs/$*.o $<
-@mv objs/$*.o $@

deflate_quick.o: deflate_quick.c
${CC} ${CFLAGS} -msse4 -I. -c -o $@ $<

infcover.o: test/infcover.c zlib.h zconf.h
$(CC) $(CFLAGS) -I. -c -o $@ test/infcover.c

Expand Down Expand Up @@ -271,7 +302,7 @@ adler32.o zutil.o: zutil.h zlib.h zconf.h
gzclose.o gzlib.o gzread.o gzwrite.o: zlib.h zconf.h gzguts.h
compress.o example.o minigzip.o uncompr.o: zlib.h zconf.h
crc32.o: zutil.h zlib.h zconf.h crc32.h
deflate.o: deflate.h zutil.h zlib.h zconf.h
deflate.o: deflate.h zutil.h zlib.h zconf.h ${DEFLATE_QUICK_o}
infback.o inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h
inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
inftrees.o: zutil.h zlib.h zconf.h inftrees.h
Expand All @@ -281,7 +312,7 @@ adler32.lo zutil.lo: zutil.h zlib.h zconf.h
gzclose.lo gzlib.lo gzread.lo gzwrite.lo: zlib.h zconf.h gzguts.h
compress.lo example.lo minigzip.lo uncompr.lo: zlib.h zconf.h
crc32.lo: zutil.h zlib.h zconf.h crc32.h
deflate.lo: deflate.h zutil.h zlib.h zconf.h
deflate.lo: deflate.h zutil.h zlib.h zconf.h ${DEFLATE_QUICK_lo}
infback.lo inflate.lo: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h
inffast.lo: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
inftrees.lo: zutil.h zlib.h zconf.h inftrees.h
Expand Down
117 changes: 117 additions & 0 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,6 +760,45 @@ EOF
fi
fi

# Check for SSE2 intrinsics
cat > $test.c << EOF
#include <immintrin.h>
int main(void)
{
__m128i zero = _mm_setzero_si128();
return 0;
}
EOF
if try ${CC} ${CFLAGS} -msse2 $test.c; then
echo "Checking for SSE2 intrinsics ... Yes." | tee -a configure.log
HAVE_SSE2_INTRIN=1
else
echo "Checking for SSE2 intrinsics ... No." | tee -a configure.log
HAVE_SSE2_INTRIN=0
fi

# Check for PCLMULQDQ intrinsics
cat > $test.c << EOF
#include <immintrin.h>
int main(void)
{
__m128i a = _mm_setzero_si128();
__m128i b = _mm_setzero_si128();
__m128i c = _mm_clmulepi64_si128(a, b, 0x10);
return 0;
}
EOF
if try ${CC} ${CFLAGS} -mpclmul $test.c; then
echo "Checking for PCLMULQDQ intrinsics ... Yes." | tee -a configure.log
HAVE_PCLMULQDQ_INTRIN=1
else
echo "Checking for PCLMULQDQ intrinsics ... No." | tee -a configure.log
HAVE_PCLMULQDQ_INTRIN=0
fi

DEFLATE_QUICK_o=""
DEFLATE_QUICK_lo=""

# Set ARCH specific FLAGS
case "${ARCH}" in
x86_64)
Expand All @@ -774,6 +813,39 @@ case "${ARCH}" in

CFLAGS="${CFLAGS} -DADLER32_UNROLL_LESS -DCRC32_UNROLL_LESS"
SFLAGS="${SFLAGS} -DADLER32_UNROLL_LESS -DCRC32_UNROLL_LESS"

if test ${HAVE_SSE2_INTRIN} -eq 1; then
CFLAGS="${CFLAGS} -UCHECK_SSE2 -DHAVE_SSE2"
SFLAGS="${SFLAGS} -UCHECK_SSE2 -DHAVE_SSE2"
FILL_WINDOW_SSE_o="fill_window_sse.o"
FILL_WINDOW_SSE_lo="fill_window_sse.lo"
OBJS="${OBJS} ${FILL_WINDOW_SSE_o}"
PIC_OBJS="${PIC_OBJS} ${FILL_WINDOW_SSE_lo}"
else
FILL_WINDOW_SSE_o=""
FILL_WINDOW_SSE_lo=""
fi

CFLAGS="${CFLAGS} -DUSE_SSE4_2_CRC_HASH"
SFLAGS="${SFLAGS} -DUSE_SSE4_2_CRC_HASH"

if test ${HAVE_PCLMULQDQ_INTRIN} -eq 1; then
CFLAGS="${CFLAGS} -DHAVE_PCLMULQDQ"
SFLAGS="${SFLAGS} -DHAVE_PCLMULQDQ"
CRC_FOLDING_o="crc_folding.o"
CRC_FOLDING_lo="crc_folding.lo"
OBJS="${OBJS} ${CRC_FOLDING_o}"
PIC_OBJS="${PIC_OBJS} ${CRC_FOLDING_lo}"
else
CRC_FOLDING_o=""
CRC_FOLDING_lo=""
fi

CFLAGS="${CFLAGS} -DUSE_QUICK -DUSE_MEDIUM"
SFLAGS="${SFLAGS} -DUSE_QUICK -DUSE_MEDIUM"

DEFLATE_QUICK_o="deflate_quick.o"
DEFLATE_QUICK_lo="deflate_quick.lo"
;;
i386 | i486 | i586 | i686)
OBJC="${OBJC} x86.o"
Expand All @@ -787,6 +859,39 @@ case "${ARCH}" in

CFLAGS="${CFLAGS} -DADLER32_UNROLL_LESS -DCRC32_UNROLL_LESS"
SFLAGS="${SFLAGS} -DADLER32_UNROLL_LESS -DCRC32_UNROLL_LESS"

if test ${HAVE_SSE2_INTRIN} -eq 1; then
CFLAGS="${CFLAGS} -DCHECK_SSE2 -DHAVE_SSE2"
SFLAGS="${SFLAGS} -DCHECK_SSE2 -DHAVE_SSE2"
FILL_WINDOW_SSE_o="fill_window_sse.o"
FILL_WINDOW_SSE_lo="fill_window_sse.lo"
OBJS="${OBJS} ${FILL_WINDOW_SSE_o}"
PIC_OBJS="${PIC_OBJS} ${FILL_WINDOW_SSE_lo}"
else
FILL_WINDOW_SSE_o=""
FILL_WINDOW_SSE_lo=""
fi

CFLAGS="${CFLAGS} -DUSE_SSE4_2_CRC_HASH"
SFLAGS="${SFLAGS} -DUSE_SSE4_2_CRC_HASH"

if test ${HAVE_PCLMULQDQ_INTRIN} -eq 1; then
CFLAGS="${CFLAGS} -DHAVE_PCLMULQDQ"
SFLAGS="${SFLAGS} -DHAVE_PCLMULQDQ"
CRC_FOLDING_o="crc_folding.o"
CRC_FOLDING_lo="crc_folding.lo"
OBJS="${OBJS} ${CRC_FOLDING_o}"
PIC_OBJS="${PIC_OBJS} ${CRC_FOLDING_lo}"
else
CRC_FOLDING_o=""
CRC_FOLDING_lo=""
fi

CFLAGS="${CFLAGS} -DUSE_QUICK -DUSE_MEDIUM"
SFLAGS="${SFLAGS} -DUSE_QUICK -DUSE_MEDIUM"

DEFLATE_QUICK_o="deflate_quick.o"
DEFLATE_QUICK_lo="deflate_quick.lo"
;;
esac

Expand Down Expand Up @@ -821,6 +926,12 @@ echo mandir = $mandir >> configure.log
echo prefix = $prefix >> configure.log
echo sharedlibdir = $sharedlibdir >> configure.log
echo uname = $uname >> configure.log
echo FILL_WINDOW_SSE_o = ${FILL_WINDOW_SSE_o} >> configure.log
echo FILL_WINDOW_SSE_lo= ${FILL_WINDOW_SSE_lo} >> configure.log
echo CRC_FOLDING_o = ${CRC_FOLDING_o} >> configure.log
echo CRC_FOLDING_lo= ${CRC_FOLDING_lo} >> configure.log
echo DEFLATE_QUICK_o=${DEFLATE_QUICK_o} >> configure.log
echo DEFLATE_QUICK_lo=${DEFLATE_QUICK_lo} >> configure.log

# udpate Makefile with the configure results
sed < Makefile.in "
Expand Down Expand Up @@ -850,6 +961,12 @@ sed < Makefile.in "
/^PIC_OBJC *=/s#=.*#= $PIC_OBJC#
/^all: */s#:.*#: $ALL#
/^test: */s#:.*#: $TEST#
/^FILL_WINDOW_SSE_o *=/s#=.*#=$FILL_WINDOW_SSE_o#
/^FILL_WINDOW_SSE_lo *=/s#=.*#=$FILL_WINDOW_SSE_lo#
/^CRC_FOLDING_o *=/s#=.*#=$CRC_FOLDING_o#
/^CRC_FOLDING_lo *=/s#=.*#=$CRC_FOLDING_lo#
/^DEFLATE_QUICK_o *=/s#=.*#=$DEFLATE_QUICK_o#
/^DEFLATE_QUICK_lo *=/s#=.*#=$DEFLATE_QUICK_lo#
" > Makefile

# create zlib.pc with the configure results
Expand Down
42 changes: 42 additions & 0 deletions crc32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,3 +437,45 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
{
return crc32_combine_(crc1, crc2, len2);
}

#include "deflate.h"

#ifdef HAVE_PCLMULQDQ
#include "x86.h"
extern void ZLIB_INTERNAL crc_fold_init(deflate_state *z_const s);
extern void ZLIB_INTERNAL crc_fold_copy(deflate_state *z_const s,
unsigned char *dst, z_const unsigned char *src, long len);
extern unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state *z_const s);
#endif

ZLIB_INTERNAL void crc_reset(deflate_state *const s)
{
#ifdef HAVE_PCLMULQDQ
if (x86_cpu_has_pclmulqdq) {
crc_fold_init(s);
return;
}
#endif
s->strm->adler = crc32(0L, Z_NULL, 0);
}

ZLIB_INTERNAL void crc_finalize(deflate_state *const s)
{
#ifdef HAVE_PCLMULQDQ
if (x86_cpu_has_pclmulqdq)
s->strm->adler = crc_fold_512to32(s);
#endif
}

ZLIB_INTERNAL void copy_with_crc(z_streamp strm, Bytef *dst, long size)
{
#ifdef HAVE_PCLMULQDQ
if (x86_cpu_has_pclmulqdq) {
crc_fold_copy(strm->state, dst, strm->next_in, size);
return;
}
#endif
zmemcpy(dst, strm->next_in, size);
strm->adler = crc32(strm->adler, dst, size);
}

Loading