[ViewVC] Diff of: cvs/liblzf/lzf

Comparing liblzf/lzf_c.c (file contents):
Revision 1.10 by root, Thu Apr 14 20:38:50 2005 UTC vs.
Revision 1.20 by root, Tue Nov 13 08:38:49 2007 UTC

…		…
1	/*	1	/*
2	* Copyright (c) 2000-2005 Marc Alexander Lehmann <schmorp@schmorp.de>	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-
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.
27	*	24	*
28	* Alternatively, the contents of this file may be used under the terms of	25	* Alternatively, the contents of this file may be used under the terms of
29	* the GNU General Public License version 2 (the "GPL"), in which case the	26	* the GNU General Public License ("GPL") version 2 or any later version,
30	* provisions of the GPL are applicable instead of the above. If you wish to	27	* in which case the provisions of the GPL are applicable instead of
31	* allow the use of your version of this file only under the terms of the	28	* the above. If you wish to allow the use of your version of this file
32	* GPL and not to allow others to use your version of this file under the	29	* only under the terms of the GPL and not to allow others to use your
33	* BSD license, indicate your decision by deleting the provisions above and	30	* version of this file under the BSD license, indicate your decision
34	* replace them with the notice and other provisions required by the GPL. If	31	* by deleting the provisions above and replace them with the notice
35	* you do not delete the provisions above, a recipient may use your version	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
36	* of this file under either the BSD or the GPL.	34	* either the BSD or the GPL.
37	*/	35	*/
38		36
39	#include "lzfP.h"	37	#include "lzfP.h"
40		38
41	#define HSIZE (1 << (HLOG))	39	#define HSIZE (1 << (HLOG))
…		…
48	*/	46	*/
49	#ifndef FRST	47	#ifndef FRST
50	# define FRST(p) (((p[0]) << 8) \| p[1])	48	# define FRST(p) (((p[0]) << 8) \| p[1])
51	# define NEXT(v,p) (((v) << 8) \| p[2])	49	# define NEXT(v,p) (((v) << 8) \| p[2])
52	# define IDX(h) ((((h ^ (h << 5)) >> (38 - HLOG)) - h5) & (HSIZE - 1))	50	# define IDX(h) ((((h ^ (h << 5)) >> (38 - HLOG)) - h5) & (HSIZE - 1))
		51	/# define IDX(h) ((ip[0] 121 ^ ip[1] * 33 ^ ip[2] * 1) & (HSIZE-1))*/
53	#endif	52	#endif
54	/*	53	/*
55	* IDX works because it is very similar to a multiplicative hash, e.g.	54	* IDX works because it is very similar to a multiplicative hash, e.g.
56	* ((h * 57321 >> (3*8 - HLOG)) & (HSIZE - 1))	55	* ((h * 57321 >> (3*8 - HLOG)) & (HSIZE - 1))
57	* the latter is also quite fast on newer CPUs, and sligthly better	56	* the latter is also quite fast on newer CPUs, and compresses similarly.
58	*	57	*
59	* the next one is also quite good, albeit slow ;)	58	* the next one is also quite good, albeit slow ;)
60	* (int)(cos(h & 0xffffff) * 1e6)	59	* (int)(cos(h & 0xffffff) * 1e6)
61	*/	60	*/
62		61
…		…
67	# define IDX(h) ((h) & (HSIZE - 1))	66	# define IDX(h) ((h) & (HSIZE - 1))
68	#endif	67	#endif
69		68
70	#define MAX_LIT (1 << 5)	69	#define MAX_LIT (1 << 5)
71	#define MAX_OFF (1 << 13)	70	#define MAX_OFF (1 << 13)
72	#define MAX_REF ((1 << 8) + (1 << 3))	71	#define MAX_REF ((1 << 8) + (1 << 3))
		72
		73	#if (__i386 \|\| __amd64) && __GNUC__ >= 3
		74	# define lzf_movsb(dst, src, len) \
		75	asm ("rep movsb" \
		76	: "=D" (dst), "=S" (src), "=c" (len) \
		77	: "0" (dst), "1" (src), "2" (len));
		78	#endif
		79
		80	#if __GNUC__ >= 3
		81	# define expect(expr,value) __builtin_expect ((expr),(value))
		82	# define inline inline
		83	#else
		84	# define expect(expr,value) (expr)
		85	# define inline static
		86	#endif
		87
		88	#define expect_false(expr) expect ((expr) != 0, 0)
		89	#define expect_true(expr) expect ((expr) != 0, 1)
73		90
74	/*	91	/*
75	* compressed format	92	* compressed format
76	*	93	*
77	* 000LLLLL <L+1> ; literal	94	* 000LLLLL <L+1> ; literal
…		…
82		99
83	unsigned int	100	unsigned int
84	lzf_compress (const void *const in_data, unsigned int in_len,	101	lzf_compress (const void *const in_data, unsigned int in_len,
85	void *out_data, unsigned int out_len	102	void *out_data, unsigned int out_len
86	#if LZF_STATE_ARG	103	#if LZF_STATE_ARG
87	, LZF_STATE *htab	104	, LZF_STATE htab
88	#endif	105	#endif
89	)	106	)
90	{	107	{
91	#if !LZF_STATE_ARG	108	#if !LZF_STATE_ARG
92	LZF_STATE htab;	109	LZF_STATE htab;
…		…
101	unsigned int hval = FRST (ip);	118	unsigned int hval = FRST (ip);
102	unsigned long off;	119	unsigned long off;
103	int lit = 0;	120	int lit = 0;
104		121
105	#if INIT_HTAB	122	#if INIT_HTAB
106	# if USE_MEMCPY
107	memset (htab, 0, sizeof (htab));	123	memset (htab, 0, sizeof (htab));
108	# else	124	# if 0
109	for (hslot = htab; hslot < htab + HSIZE; hslot++)	125	for (hslot = htab; hslot < htab + HSIZE; hslot++)
110	*hslot++ = ip;	126	*hslot++ = ip;
111	# endif	127	# endif
112	#endif	128	#endif
113		129
114	for (;;)	130	for (;;)
115	{	131	{
116	if (ip < in_end - 2)	132	if (expect_true (ip < in_end - 2))
117	{	133	{
118	hval = NEXT (hval, ip);	134	hval = NEXT (hval, ip);
119	hslot = htab + IDX (hval);	135	hslot = htab + IDX (hval);
120	ref = hslot; hslot = ip;	136	ref = hslot; hslot = ip;
121		137
…		…
125	#endif	141	#endif
126	&& (off = ip - ref - 1) < MAX_OFF	142	&& (off = ip - ref - 1) < MAX_OFF
127	&& ip + 4 < in_end	143	&& ip + 4 < in_end
128	&& ref > (u8 *)in_data	144	&& ref > (u8 *)in_data
129	#if STRICT_ALIGN	145	#if STRICT_ALIGN
		146	x x x
130	&& ref[0] == ip[0]	147	&& ref[0] == ip[0]
131	&& ref[1] == ip[1]	148	&& ref[1] == ip[1]
132	&& ref[2] == ip[2]	149	&& ref[2] == ip[2]
133	#else	150	#else
134	&& (u16 )ref == (u16 )ip	151	&& (u16 )ref == (u16 )ip
…		…
139	/* match found at ref++ /	156	/* match found at ref++ /
140	unsigned int len = 2;	157	unsigned int len = 2;
141	unsigned int maxlen = in_end - ip - len;	158	unsigned int maxlen = in_end - ip - len;
142	maxlen = maxlen > MAX_REF ? MAX_REF : maxlen;	159	maxlen = maxlen > MAX_REF ? MAX_REF : maxlen;
143		160
144	if (op + lit + 1 + 3 >= out_end)	161	if (expect_false (op + lit + 1 + 3 >= out_end))
145	return 0;	162	return 0;
146		163
147	do	164	if (expect_false (lit))
148	len++;
149	while (len < maxlen && ref[len] == ip[len]);
150
151	if (lit)
152	{	165	{
153	*op++ = lit - 1;	166	*op++ = lit - 1;
154	lit = -lit;	167	lit = -lit;
155	do	168	do
156	*op++ = ip[lit];	169	*op++ = ip[lit];
157	while (++lit);	170	while (expect_false (++lit));
		171	}
		172
		173	for (;;)
		174	{
		175	if (expect_true (maxlen > 16))
		176	{
		177	len++; if (ref [len] != ip [len]) break;
		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	len++; if (ref [len] != ip [len]) break;
		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	len++; if (ref [len] != ip [len]) break;
		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	len++; if (ref [len] != ip [len]) break;
		193	}
		194
		195	do
		196	len++;
		197	while (len < maxlen && ref[len] == ip[len]);
		198
		199	break;
158	}	200	}
159		201
160	len -= 2;	202	len -= 2;
161	ip++;	203	ip++;
162		204
…		…
198	while (len--);	240	while (len--);
199	#endif	241	#endif
200	continue;	242	continue;
201	}	243	}
202	}	244	}
203	else if (ip == in_end)	245	else if (expect_false (ip == in_end))
204	break;	246	break;
205		247
206	/* one more literal byte we must copy */	248	/* one more literal byte we must copy */
207	lit++;	249	lit++;
208	ip++;	250	ip++;
209		251
210	if (lit == MAX_LIT)	252	if (expect_false (lit == MAX_LIT))
211	{	253	{
212	if (op + 1 + MAX_LIT >= out_end)	254	if (op + 1 + MAX_LIT >= out_end)
213	return 0;	255	return 0;
214		256
215	*op++ = MAX_LIT - 1;	257	*op++ = MAX_LIT - 1;
216	#if USE_MEMCPY	258
217	memcpy (op, ip - MAX_LIT, MAX_LIT);	259	#ifdef lzf_movsb
218	op += MAX_LIT;	260	ip -= MAX_LIT;
219	lit = 0;	261	lzf_movsb (op, ip, lit);
220	#else	262	#else
221	lit = -lit;	263	lit = -lit;
222	do	264	do
223	*op++ = ip[lit];	265	*op++ = ip[lit];
224	while (++lit);	266	while (++lit);
…		…
230	{	272	{
231	if (op + lit + 1 >= out_end)	273	if (op + lit + 1 >= out_end)
232	return 0;	274	return 0;
233		275
234	*op++ = lit - 1;	276	*op++ = lit - 1;
		277	#ifdef lzf_movsb
		278	ip -= lit;
		279	lzf_movsb (op, ip, lit);
		280	#else
235	lit = -lit;	281	lit = -lit;
236	do	282	do
237	*op++ = ip[lit];	283	*op++ = ip[lit];
238	while (++lit);	284	while (++lit);
		285	#endif
239	}	286	}
240		287
241	return op - (u8 *) out_data;	288	return op - (u8 *) out_data;
242	}	289	}
		290

Diff Legend

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

Comparing liblzf/lzf_c.c (file contents): Revision 1.10 by root, Thu Apr 14 20:38:50 2005 UTC vs. Revision 1.20 by root, Tue Nov 13 08:38:49 2007 UTC

Diff Legend

Comparing liblzf/lzf_c.c (file contents):
Revision 1.10 by root, Thu Apr 14 20:38:50 2005 UTC vs.
Revision 1.20 by root, Tue Nov 13 08:38:49 2007 UTC