[ViewVC] Diff of: cvs/liblzf/lzf

Comparing liblzf/lzf_c.c (file contents):
Revision 1.2 by root, Thu Sep 5 03:31:00 2002 UTC vs.
Revision 1.22 by root, Tue Nov 13 10:41:52 2007 UTC

…		…
1	/*	1	/*
2	* Copyright (c) 2000 Marc Alexander Lehmann <pcg@goof.com>	2	* Copyright (c) 2000-2007 Marc Alexander Lehmann <schmorp@schmorp.de>
3	*	3	*
4	* Redistribution and use in source and binary forms, with or without modifica-	4	* Redistribution and use in source and binary forms, with or without modifica-
5	* tion, are permitted provided that the following conditions are met:	5	* tion, are permitted provided that the following conditions are met:
6	*	6	*
7	* 1. Redistributions of source code must retain the above copyright notice,	7	* 1. Redistributions of source code must retain the above copyright notice,
8	* this list of conditions and the following disclaimer.	8	* this list of conditions and the following disclaimer.
9	*	9	*
10	* 2. Redistributions in binary form must reproduce the above copyright	10	* 2. Redistributions in binary form must reproduce the above copyright
11	* notice, this list of conditions and the following disclaimer in the	11	* notice, this list of conditions and the following disclaimer in the
12	* documentation and/or other materials provided with the distribution.	12	* documentation and/or other materials provided with the distribution.
13	*
14	* 3. The name of the author may not be used to endorse or promote products
15	* derived from this software without specific prior written permission.
16	*	13	*
17	* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED	14	* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18	* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-	15	* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19	* CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO	16	* CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20	* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-	17	* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
22	* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;	19	* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23	* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,	20	* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24	* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-	21	* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25	* ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED	22	* ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26	* OF THE POSSIBILITY OF SUCH DAMAGE.	23	* OF THE POSSIBILITY OF SUCH DAMAGE.
		24	*
		25	* Alternatively, the contents of this file may be used under the terms of
		26	* the GNU General Public License ("GPL") version 2 or any later version,
		27	* in which case the provisions of the GPL are applicable instead of
		28	* the above. If you wish to allow the use of your version of this file
		29	* only under the terms of the GPL and not to allow others to use your
		30	* version of this file under the BSD license, indicate your decision
		31	* by deleting the provisions above and replace them with the notice
		32	* and other provisions required by the GPL. If you do not delete the
		33	* provisions above, a recipient may use your version of this file under
		34	* either the BSD or the GPL.
27	*/	35	*/
28		36
29	#include "lzfP.h"	37	#include "lzfP.h"
30		38
31	#define HSIZE (1 << (HLOG))	39	#define HSIZE (1 << (HLOG))
…		…
34	* don't play with this unless you benchmark!	42	* don't play with this unless you benchmark!
35	* decompression is not dependent on the hash function	43	* decompression is not dependent on the hash function
36	* the hashing function might seem strange, just believe me	44	* the hashing function might seem strange, just believe me
37	* it works ;)	45	* it works ;)
38	*/	46	*/
		47	#ifndef FRST
39	#define FRST(p) (((p[0]) << 8) + p[1])	48	# define FRST(p) (((p[0]) << 8) \| p[1])
40	#define NEXT(v,p) (((v) << 8) + p[2])	49	# define NEXT(v,p) (((v) << 8) \| p[2])
		50	# if ULTRA_FAST
		51	# define IDX(h) (((h >> (3*8 - HLOG)) - h ) & (HSIZE - 1))
		52	# elif VERY_FAST
		53	# define IDX(h) (((h >> (38 - HLOG)) - h5) & (HSIZE - 1))
		54	# else
41	#define IDX(h) ((((h ^ (h << 5)) >> (38 - HLOG)) + h3) & (HSIZE - 1))	55	# define IDX(h) ((((h ^ (h << 5)) >> (38 - HLOG)) - h5) & (HSIZE - 1))
		56	# endif
		57	/# define IDX(h) ((ip[0] 121 ^ ip[1] * 33 ^ ip[2] * 1) & (HSIZE-1))*/
		58	#endif
42	/*	59	/*
43	* IDX works because it is very similar to a multiplicative hash, e.g.	60	* IDX works because it is very similar to a multiplicative hash, e.g.
44	* (h * 57321 >> (3*8 - HLOG))	61	* ((h * 57321 >> (3*8 - HLOG)) & (HSIZE - 1))
		62	* the latter is also quite fast on newer CPUs, and compresses similarly.
		63	*
45	* the next one is also quite good, albeit slow ;)	64	* the next one is also quite good, albeit slow ;)
46	* (int)(cos(h & 0xffffff) * 1e6)	65	* (int)(cos(h & 0xffffff) * 1e6)
47	*/	66	*/
48		67
49	#if 0	68	#if 0
50	/* original lzv-like hash function */	69	/* original lzv-like hash function, much worse and thus slower */
51	# define FRST(p) (p[0] << 5) ^ p[1]	70	# define FRST(p) (p[0] << 5) ^ p[1]
52	# define NEXT(v,p) ((v) << 5) ^ p[2]	71	# define NEXT(v,p) ((v) << 5) ^ p[2]
53	# define IDX(h) ((h) & (HSIZE - 1))	72	# define IDX(h) ((h) & (HSIZE - 1))
54	#endif	73	#endif
55		74
56	#define MAX_LIT (1 << 5)	75	#define MAX_LIT (1 << 5)
57	#define MAX_OFF (1 << 13)	76	#define MAX_OFF (1 << 13)
58	#define MAX_REF ((1 << 8) + (1 << 3))	77	#define MAX_REF ((1 << 8) + (1 << 3))
		78
		79	#if __GNUC__ >= 3
		80	# define expect(expr,value) __builtin_expect ((expr),(value))
		81	# define inline inline
		82	#else
		83	# define expect(expr,value) (expr)
		84	# define inline static
		85	#endif
		86
		87	#define expect_false(expr) expect ((expr) != 0, 0)
		88	#define expect_true(expr) expect ((expr) != 0, 1)
59		89
60	/*	90	/*
61	* compressed format	91	* compressed format
62	*	92	*
63	* 000LLLLL <L+1> ; literal	93	* 000LLLLL <L+1> ; literal
64	* LLLOOOOO oooooooo ; backref L	94	* LLLooooo oooooooo ; backref L
65	* 111OOOOO LLLLLLLL oooooooo ; backref L+7	95	* 111ooooo LLLLLLLL oooooooo ; backref L+7
66	*	96	*
67	*/	97	*/
68		98
69	unsigned int	99	unsigned int
70	lzf_compress (const void *const in_data, unsigned int in_len,	100	lzf_compress (const void *const in_data, unsigned int in_len,
71	void *out_data, unsigned int out_len)	101	void *out_data, unsigned int out_len
		102	#if LZF_STATE_ARG
		103	, LZF_STATE htab
		104	#endif
		105	)
72	{	106	{
73	const u8 *htab[HSIZE];	107	#if !LZF_STATE_ARG
		108	LZF_STATE htab;
		109	#endif
74	const u8 **hslot;	110	const u8 **hslot;
75	const u8 *ip = in_data;	111	const u8 ip = (const u8 )in_data;
76	u8 *op = out_data;	112	u8 op = (u8 )out_data;
77	const u8 *in_end = ip + in_len;	113	const u8 *in_end = ip + in_len;
78	u8 *out_end = op + out_len;	114	u8 *out_end = op + out_len;
79	const u8 *ref;	115	const u8 *ref;
80		116
81	unsigned int hval = FRST (ip);	117	unsigned int hval;
82	unsigned long off;	118	unsigned long off;
83	int lit = 0;	119	int lit;
		120
		121	if (!in_len \|\| !out_len)
		122	return 0;
84		123
85	#if INIT_HTAB	124	#if INIT_HTAB
86	# if USE_MEMCPY
87	memset (htab, 0, sizeof (htab));	125	memset (htab, 0, sizeof (htab));
88	# else	126	# if 0
89	for (hslot = htab; hslot < htab + HSIZE; hslot++)	127	for (hslot = htab; hslot < htab + HSIZE; hslot++)
90	*hslot++ = ip;	128	*hslot++ = ip;
91	# endif	129	# endif
92	#endif	130	#endif
93		131
94	do	132	lit = 0; op++; /* start run */
		133
		134	hval = FRST (ip);
		135	while (ip < in_end - 2)
95	{	136	{
96	hval = NEXT (hval, ip);	137	hval = NEXT (hval, ip);
97	hslot = htab + IDX (hval);	138	hslot = htab + IDX (hval);
98	ref = hslot; hslot = ip;	139	ref = hslot; hslot = ip;
99		140
100	if (1	141	if (1
101	#if INIT_HTAB && !USE_MEMCPY	142	#if INIT_HTAB && !USE_MEMCPY
102	&& ref < ip /* the next test will actually take care of this, but it is faster */	143	&& ref < ip /* the next test will actually take care of this, but this is faster */
103	#endif	144	#endif
104	&& (off = ip - ref - 1) < MAX_OFF	145	&& (off = ip - ref - 1) < MAX_OFF
105	&& ip + 4 < in_end	146	&& ip + 4 < in_end
106	&& ref > (u8 *)in_data	147	&& ref > (u8 *)in_data
107	#if STRICT_ALIGN	148	#if STRICT_ALIGN
108	&& ref[0] == ip[0]	149	&& ref[0] == ip[0]
109	&& ref[1] == ip[1]	150	&& ref[1] == ip[1]
110	&& ref[2] == ip[2]	151	&& ref[2] == ip[2]
111	#else	152	#else
112	&& (u16 )ref == (u16 )ip	153	&& (u16 )ref == (u16 )ip
113	&& ref[2] == ip[2]	154	&& ref[2] == ip[2]
114	#endif	155	#endif
115	)	156	)
116	{	157	{
117	/* match found at ref++ /	158	/* match found at ref++ /
118	unsigned int len = 2;	159	unsigned int len = 2;
119	unsigned int maxlen = in_end - ip - len;	160	unsigned int maxlen = in_end - ip - len;
120	maxlen = maxlen > MAX_REF ? MAX_REF : maxlen;	161	maxlen = maxlen > MAX_REF ? MAX_REF : maxlen;
121		162
122	do	163	if (expect_false (op + 1 + 3 >= out_end))
123	len++;	164	return 0;
		165
		166	op [- lit - 1] = lit - 1; /* stop run */
		167	op -= !lit; /* undo run if length is zero */
		168
		169	for (;;)
		170	{
		171	if (expect_true (maxlen > 16))
		172	{
		173	len++; if (ref [len] != ip [len]) break;
		174	len++; if (ref [len] != ip [len]) break;
		175	len++; if (ref [len] != ip [len]) break;
		176	len++; if (ref [len] != ip [len]) break;
		177
		178	len++; if (ref [len] != ip [len]) break;
		179	len++; if (ref [len] != ip [len]) break;
		180	len++; if (ref [len] != ip [len]) break;
		181	len++; if (ref [len] != ip [len]) break;
		182
		183	len++; if (ref [len] != ip [len]) break;
		184	len++; if (ref [len] != ip [len]) break;
		185	len++; if (ref [len] != ip [len]) break;
		186	len++; if (ref [len] != ip [len]) break;
		187
		188	len++; if (ref [len] != ip [len]) break;
		189	len++; if (ref [len] != ip [len]) break;
		190	len++; if (ref [len] != ip [len]) break;
		191	len++; if (ref [len] != ip [len]) break;
		192	}
		193
		194	do
		195	len++;
124	while (len < maxlen && ref[len] == ip[len]);	196	while (len < maxlen && ref[len] == ip[len]);
125		197
126	if (op + lit + 1 + 3 >= out_end)	198	break;
127	return 0;	199	}
128		200
129	if (lit)	201	len -= 2;
130	{	202	ip++;
131	*op++ = lit - 1;
132	lit = -lit;
133	do
134	*op++ = ip[lit];
135	while (++lit);
136	}
137		203
138	len -= 2;
139	ip++;
140
141	if (len < 7)	204	if (len < 7)
142	{	205	{
143	*op++ = (off >> 8) + (len << 5);	206	*op++ = (off >> 8) + (len << 5);
144	}	207	}
145	else	208	else
146	{	209	{
147	*op++ = (off >> 8) + ( 7 << 5);	210	*op++ = (off >> 8) + ( 7 << 5);
148	*op++ = len - 7;	211	*op++ = len - 7;
149	}	212	}
150		213
151	*op++ = off;	214	*op++ = off;
152		215
153	#if ULTRA_FAST	216	#if ULTRA_FAST \|\| VERY_FAST
154	ip += len;	217	ip += len;
		218	#if VERY_FAST && !ULTRA_FAST
		219	--ip;
		220	#endif
155	hval = FRST (ip);	221	hval = FRST (ip);
		222
156	hval = NEXT (hval, ip);	223	hval = NEXT (hval, ip);
157	htab[IDX (hval)] = ip;	224	htab[IDX (hval)] = ip;
158	ip++;	225	ip++;
		226
		227	#if VERY_FAST && !ULTRA_FAST
		228	hval = NEXT (hval, ip);
		229	htab[IDX (hval)] = ip;
		230	ip++;
		231	#endif
159	#else	232	#else
160	do	233	do
161	{	234	{
162	hval = NEXT (hval, ip);	235	hval = NEXT (hval, ip);
163	htab[IDX (hval)] = ip;	236	htab[IDX (hval)] = ip;
164	ip++;	237	ip++;
165	}	238	}
166	while (len--);	239	while (len--);
167	#endif	240	#endif
168	}	241	lit = 0; op++; /* start run */
169	else	242	continue;
170	{	243	}
		244
171	/* one more literal byte we must copy */	245	/* one more literal byte we must copy */
		246
		247	if (expect_false (op >= out_end))
		248	return 0;
		249
172	lit++;	250	lit++;
173	ip++;	251	op++ = ip++;
174		252
175	if (lit == MAX_LIT)	253	if (expect_false (lit == MAX_LIT))
176	{	254	{
177	if (op + 1 + MAX_LIT >= out_end)	255	op [- lit - 1] = lit - 1; /* stop run */
178	return 0;	256	lit = 0; op++; /* start run */
179		257	}
180	*op++ = MAX_LIT - 1;
181	#if USE_MEMCPY
182	memcpy (op, ip - MAX_LIT, MAX_LIT);
183	op += MAX_LIT;
184	lit = 0;
185	#else
186	lit = -lit;
187	do
188	*op++ = ip[lit];
189	while (++lit);
190	#endif
191	}
192	}
193	}	258	}
		259
		260	if (op + lit + 2 >= out_end)
		261	return 0;
		262
194	while (ip < in_end);	263	while (ip < in_end)
195
196	if (lit)
197	{	264	{
198	if (op + lit + 1 >= out_end)	265	lit++;
199	return 0;
200
201	*op++ = lit - 1;	266	op++ = ip++;
202	lit = -lit;
203	do
204	*op++ = ip[lit];
205	while (++lit);
206	}	267	}
207		268
		269	op [- lit - 1] = lit - 1;
		270
208	return op - (u8 *) out_data;	271	return op - (u8 *)out_data;
209	}	272	}
		273

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing liblzf/lzf_c.c (file contents): Revision 1.2 by root, Thu Sep 5 03:31:00 2002 UTC vs. Revision 1.22 by root, Tue Nov 13 10:41:52 2007 UTC

Diff Legend

Comparing liblzf/lzf_c.c (file contents):
Revision 1.2 by root, Thu Sep 5 03:31:00 2002 UTC vs.
Revision 1.22 by root, Tue Nov 13 10:41:52 2007 UTC