embedaddon/sudo/zlib/crc32.c - diff

Return to crc32.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / sudo / zlib

Diff for /embedaddon/sudo/zlib/crc32.c between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 16:23:02	version 1.1.1.2, 2013/07/22 10:46:14
Line 1	Line 1
/* crc32.c -- compute the CRC-32 of a data stream	/* crc32.c -- compute the CRC-32 of a data stream
* Copyright (C) 1995-2006, 2010 Mark Adler	* Copyright (C) 1995-2006, 2010, 2011 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h	* For conditions of distribution and use, see copyright notice in zlib.h
*	*
* Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster	* Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
Line 17	Line 17
of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should	of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should
first call get_crc_table() to initialize the tables before allowing more than	first call get_crc_table() to initialize the tables before allowing more than
one thread to use crc32().	one thread to use crc32().

	DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
*/	*/

#ifdef MAKECRCH	#ifdef MAKECRCH
Line 53	Line 55

/* Definitions for doing the crc four data bytes at a time. */	/* Definitions for doing the crc four data bytes at a time. */
#ifdef BYFOUR	#ifdef BYFOUR
	typedef u4 crc_table_t;
# define REV(w) ((((w)>>24)&0xff)+(((w)>>8)&0xff00)+ \	# define REV(w) ((((w)>>24)&0xff)+(((w)>>8)&0xff00)+ \
(((w)&0xff00)<<8)+(((w)&0xff)<<24))	(((w)&0xff00)<<8)+(((w)&0xff)<<24))
local unsigned long crc32_little OF((unsigned long,	local unsigned long crc32_little OF((unsigned long,
Line 61	Line 64
const unsigned char FAR *, unsigned));	const unsigned char FAR *, unsigned));
# define TBLS 8	# define TBLS 8
#else	#else
	typedef unsigned long crc_table_t;
# define TBLS 1	# define TBLS 1
#endif /* BYFOUR */	#endif /* BYFOUR */

Line 68	Line 72
local unsigned long gf2_matrix_times OF((unsigned long *mat,	local unsigned long gf2_matrix_times OF((unsigned long *mat,
unsigned long vec));	unsigned long vec));
local void gf2_matrix_square OF((unsigned long square, unsigned long mat));	local void gf2_matrix_square OF((unsigned long square, unsigned long mat));
local uLong crc32_combine_(uLong crc1, uLong crc2, z_off64_t len2);	local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));


#ifdef DYNAMIC_CRC_TABLE	#ifdef DYNAMIC_CRC_TABLE

local volatile int crc_table_empty = 1;	local volatile int crc_table_empty = 1;
local unsigned long FAR crc_table[TBLS][256];	local crc_table_t FAR crc_table[TBLS][256];
local void make_crc_table OF((void));	local void make_crc_table OF((void));
#ifdef MAKECRCH	#ifdef MAKECRCH
local void write_table OF((FILE , const unsigned long FAR ));	local void write_table OF((FILE , const crc_table_t FAR ));
#endif /* MAKECRCH */	#endif /* MAKECRCH */
/*	/*
Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:	Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
Line 107 local void make_crc_table OF((void));	Line 111 local void make_crc_table OF((void));
*/	*/
local void make_crc_table()	local void make_crc_table()
{	{
unsigned long c;	crc_table_t c;
int n, k;	int n, k;
unsigned long poly; /* polynomial exclusive-or pattern */	crc_table_t poly; /* polynomial exclusive-or pattern */
/* terms of polynomial defining this crc (except x^32): */	/* terms of polynomial defining this crc (except x^32): */
static volatile int first = 1; /* flag to limit concurrent making */	static volatile int first = 1; /* flag to limit concurrent making */
static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};	static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
Line 121 local void make_crc_table()	Line 125 local void make_crc_table()
first = 0;	first = 0;

/* make exclusive-or pattern from polynomial (0xedb88320UL) */	/* make exclusive-or pattern from polynomial (0xedb88320UL) */
poly = 0UL;	poly = 0;
for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++)	for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
poly \|= 1UL << (31 - p[n]);	poly \|= (crc_table_t)1 << (31 - p[n]);

/* generate a crc for every 8-bit value */	/* generate a crc for every 8-bit value */
for (n = 0; n < 256; n++) {	for (n = 0; n < 256; n++) {
c = (unsigned long)n;	c = (crc_table_t)n;
for (k = 0; k < 8; k++)	for (k = 0; k < 8; k++)
c = c & 1 ? poly ^ (c >> 1) : c >> 1;	c = c & 1 ? poly ^ (c >> 1) : c >> 1;
crc_table[0][n] = c;	crc_table[0][n] = c;
Line 164 local void make_crc_table()	Line 168 local void make_crc_table()
if (out == NULL) return;	if (out == NULL) return;
fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");	fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
fprintf(out, " * Generated automatically by crc32.c\n */\n\n");	fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
fprintf(out, "local const unsigned long FAR ");	fprintf(out, "local const crc_table_t FAR ");
fprintf(out, "crc_table[TBLS][256] =\n{\n {\n");	fprintf(out, "crc_table[TBLS][256] =\n{\n {\n");
write_table(out, crc_table[0]);	write_table(out, crc_table[0]);
# ifdef BYFOUR	# ifdef BYFOUR
Line 184 local void make_crc_table()	Line 188 local void make_crc_table()
#ifdef MAKECRCH	#ifdef MAKECRCH
local void write_table(out, table)	local void write_table(out, table)
FILE *out;	FILE *out;
const unsigned long FAR *table;	const crc_table_t FAR *table;
{	{
int n;	int n;

for (n = 0; n < 256; n++)	for (n = 0; n < 256; n++)
fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : " ", table[n],	fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : " ",
	(unsigned long)(table[n]),
n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));	n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
}	}
#endif /* MAKECRCH */	#endif /* MAKECRCH */
Line 210 const unsigned long FAR * ZEXPORT get_crc_table()	Line 215 const unsigned long FAR * ZEXPORT get_crc_table()
if (crc_table_empty)	if (crc_table_empty)
make_crc_table();	make_crc_table();
#endif /* DYNAMIC_CRC_TABLE */	#endif /* DYNAMIC_CRC_TABLE */
return (const unsigned long FAR *)crc_table;	return (const unsigned long FAR )(void FAR )crc_table;
}	}

/* ========================================================================= */	/* ========================================================================= */

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.1
changed lines
	Added in v.1.1.1.2