Sun May 3 22:25:25 2009 UTC ()
Pull up following revision(s) (requested by tls in ticket #611):
	sys/lib/libkern/crc32.c: revision 1.4
Make the function declaration the same for the big-endian case as
for the little-endian case, and consistent with the libkern.h
declaration.  Fixes build problem for at least hp700 and evbbarm-eb.


(snj)
diff -r1.4.4.4 -r1.4.4.5 src/sys/lib/libkern/crc32.c
cvs diff -r1.4.4.4 -r1.4.4.5 src/sys/lib/libkern/crc32.c (switch to unified diff)

--- src/sys/lib/libkern/crc32.c 2009/05/03 17:33:17 1.4.4.4
+++ src/sys/lib/libkern/crc32.c 2009/05/03 22:25:25 1.4.4.5
@@ -1,119 +1,116 @@ @@ -1,119 +1,116 @@
1/* $NetBSD: crc32.c,v 1.4.4.4 2009/05/03 17:33:17 snj Exp $ */ 1/* $NetBSD: crc32.c,v 1.4.4.5 2009/05/03 22:25:25 snj Exp $ */
2 2
3/* crc32.c -- compute the CRC-32 of a data stream 3/* crc32.c -- compute the CRC-32 of a data stream
4 * 4 *
5 * Adapted from zlib's crc code. 5 * Adapted from zlib's crc code.
6 * 6 *
7 * Copyright (C) 1995-2005 Mark Adler 7 * Copyright (C) 1995-2005 Mark Adler
8 * For conditions of distribution and use, see copyright notice in zlib.h 8 * For conditions of distribution and use, see copyright notice in zlib.h
9 * 9 *
10 * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster 10 * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
11 * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing 11 * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
12 * tables for updating the shift register in one step with three exclusive-ors 12 * tables for updating the shift register in one step with three exclusive-ors
13 * instead of four steps with four exclusive-ors. This results in about a 13 * instead of four steps with four exclusive-ors. This results in about a
14 * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3. 14 * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
15 */ 15 */
16 16
17/* @(#) Id */ 17/* @(#) Id */
18 18
19#include <sys/param.h> 19#include <sys/param.h>
20#include <machine/endian.h> 20#include <machine/endian.h>
21 21
22typedef uint32_t u4; 22typedef uint32_t u4;
23 23
24/* Definitions for doing the crc four data bytes at a time. */ 24/* Definitions for doing the crc four data bytes at a time. */
25#define REV(w) (((w)>>24)+(((w)>>8)&0xff00)+ \ 25#define REV(w) (((w)>>24)+(((w)>>8)&0xff00)+ \
26 (((w)&0xff00)<<8)+(((w)&0xff)<<24)) 26 (((w)&0xff00)<<8)+(((w)&0xff)<<24))
27 27
28/* ======================================================================== 28/* ========================================================================
29 * Tables of CRC-32s of all single-byte values, made by make_crc_table(). 29 * Tables of CRC-32s of all single-byte values, made by make_crc_table().
30 */ 30 */
31#include <lib/libkern/libkern.h> 31#include <lib/libkern/libkern.h>
32#include "crc32.h" 32#include "crc32.h"
33 33
34#if BYTE_ORDER == LITTLE_ENDIAN 34#if BYTE_ORDER == LITTLE_ENDIAN
35/* ========================================================================= */ 35/* ========================================================================= */
36#define DOLIT4 c ^= *buf4++; \ 36#define DOLIT4 c ^= *buf4++; \
37 c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \ 37 c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
38 crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24] 38 crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
39#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4 39#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
40 40
41/* ========================================================================= */ 41/* ========================================================================= */
42uint32_t crc32(uint32_t crc, const uint8_t *buf, size_t len) 42uint32_t crc32(uint32_t crc, const uint8_t *buf, size_t len)
43{ 43{
44 register u4 c; 44 register u4 c;
45 register const u4 *buf4; 45 register const u4 *buf4;
46 46
47 if (buf == NULL) return 0UL; 47 if (buf == NULL) return 0UL;
48 48
49 c = (u4)crc; 49 c = (u4)crc;
50 c = ~c; 50 c = ~c;
51 while (len && ((uintptr_t)buf & 3)) { 51 while (len && ((uintptr_t)buf & 3)) {
52 c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8); 52 c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
53 len--; 53 len--;
54 } 54 }
55 55
56 buf4 = (const u4 *)(const void *)buf; 56 buf4 = (const u4 *)(const void *)buf;
57 while (len >= 32) { 57 while (len >= 32) {
58 DOLIT32; 58 DOLIT32;
59 len -= 32; 59 len -= 32;
60 } 60 }
61 while (len >= 4) { 61 while (len >= 4) {
62 DOLIT4; 62 DOLIT4;
63 len -= 4; 63 len -= 4;
64 } 64 }
65 buf = (const unsigned char *)buf4; 65 buf = (const unsigned char *)buf4;
66 66
67 if (len) do { 67 if (len) do {
68 c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8); 68 c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
69 } while (--len); 69 } while (--len);
70 c = ~c; 70 c = ~c;
71 return (uint32_t)c; 71 return (uint32_t)c;
72} 72}
73 73
74#else /* BIG_ENDIAN */ 74#else /* BIG_ENDIAN */
75 75
76/* ========================================================================= */ 76/* ========================================================================= */
77#define DOBIG4 c ^= *++buf4; \ 77#define DOBIG4 c ^= *++buf4; \
78 c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \ 78 c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
79 crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24] 79 crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
80#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4 80#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
81 81
82/* ========================================================================= */ 82/* ========================================================================= */
83uint32_t crc32( 83uint32_t crc32(uint32_t crc, const uint8_t *buf, size_t len)
84 uint32_t crc, 
85 const unsigned char *buf, 
86 unsigned len) 
87{ 84{
88 register u4 c; 85 register u4 c;
89 register const u4 *buf4; 86 register const u4 *buf4;
90 87
91 if (buf == NULL) return 0UL; 88 if (buf == NULL) return 0UL;
92 89
93 c = REV((u4)crc); 90 c = REV((u4)crc);
94 c = ~c; 91 c = ~c;
95 while (len && ((uintptr_t)buf & 3)) { 92 while (len && ((uintptr_t)buf & 3)) {
96 c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8); 93 c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
97 len--; 94 len--;
98 } 95 }
99 96
100 buf4 = (const u4 *)(const void *)buf; 97 buf4 = (const u4 *)(const void *)buf;
101 buf4--; 98 buf4--;
102 while (len >= 32) { 99 while (len >= 32) {
103 DOBIG32; 100 DOBIG32;
104 len -= 32; 101 len -= 32;
105 } 102 }
106 while (len >= 4) { 103 while (len >= 4) {
107 DOBIG4; 104 DOBIG4;
108 len -= 4; 105 len -= 4;
109 } 106 }
110 buf4++; 107 buf4++;
111 buf = (const unsigned char *)buf4; 108 buf = (const unsigned char *)buf4;
112 109
113 if (len) do { 110 if (len) do {
114 c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8); 111 c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
115 } while (--len); 112 } while (--len);
116 c = ~c; 113 c = ~c;
117 return (uint32_t)(REV(c)); 114 return (uint32_t)(REV(c));
118} 115}
119#endif 116#endif