ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/liblzf/lzf_c.c
(Generate patch)

Comparing liblzf/lzf_c.c (file contents):
Revision 1.12 by root, Tue Jun 19 21:25:01 2007 UTC vs.
Revision 1.16 by root, Mon Nov 5 23:28:40 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)) >> (3*8 - HLOG)) - h*5) & (HSIZE - 1)) 50# define IDX(h) ((((h ^ (h << 5)) >> (3*8 - HLOG)) - h*5) & (HSIZE - 1))
53//# define IDX(h) ((ip[0] * 121 ^ ip[1] * 33 ^ ip[2] * 1) & (HSIZE-1)) 51/*# define IDX(h) ((ip[0] * 121 ^ ip[1] * 33 ^ ip[2] * 1) & (HSIZE-1))*/
54#endif 52#endif
55/* 53/*
56 * 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.
57 * ((h * 57321 >> (3*8 - HLOG)) & (HSIZE - 1)) 55 * ((h * 57321 >> (3*8 - HLOG)) & (HSIZE - 1))
58 * the latter is also quite fast on newer CPUs, and compresses similarly. 56 * the latter is also quite fast on newer CPUs, and compresses similarly.
69#endif 67#endif
70 68
71#define MAX_LIT (1 << 5) 69#define MAX_LIT (1 << 5)
72#define MAX_OFF (1 << 13) 70#define MAX_OFF (1 << 13)
73#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
74 79
75/* 80/*
76 * compressed format 81 * compressed format
77 * 82 *
78 * 000LLLLL <L+1> ; literal 83 * 000LLLLL <L+1> ; literal
102 unsigned int hval = FRST (ip); 107 unsigned int hval = FRST (ip);
103 unsigned long off; 108 unsigned long off;
104 int lit = 0; 109 int lit = 0;
105 110
106#if INIT_HTAB 111#if INIT_HTAB
107# if USE_MEMCPY
108 memset (htab, 0, sizeof (htab)); 112 memset (htab, 0, sizeof (htab));
109# else 113# if 0
110 for (hslot = htab; hslot < htab + HSIZE; hslot++) 114 for (hslot = htab; hslot < htab + HSIZE; hslot++)
111 *hslot++ = ip; 115 *hslot++ = ip;
112# endif 116# endif
113#endif 117#endif
114 118
115 for (;;) 119 for (;;)
116 { 120 {
212 { 216 {
213 if (op + 1 + MAX_LIT >= out_end) 217 if (op + 1 + MAX_LIT >= out_end)
214 return 0; 218 return 0;
215 219
216 *op++ = MAX_LIT - 1; 220 *op++ = MAX_LIT - 1;
217#if USE_MEMCPY 221
218 memcpy (op, ip - MAX_LIT, MAX_LIT); 222#ifdef lzf_movsb
219 op += MAX_LIT; 223 ip -= lit;
220 lit = 0; 224 lzf_movsb (op, ip, lit);
221#else 225#else
222 lit = -lit; 226 lit = -lit;
223 do 227 do
224 *op++ = ip[lit]; 228 *op++ = ip[lit];
225 while (++lit); 229 while (++lit);
231 { 235 {
232 if (op + lit + 1 >= out_end) 236 if (op + lit + 1 >= out_end)
233 return 0; 237 return 0;
234 238
235 *op++ = lit - 1; 239 *op++ = lit - 1;
240#ifdef lzf_movsb
241 ip -= lit;
242 lzf_movsb (op, ip, lit);
243#else
236 lit = -lit; 244 lit = -lit;
237 do 245 do
238 *op++ = ip[lit]; 246 *op++ = ip[lit];
239 while (++lit); 247 while (++lit);
248#endif
240 } 249 }
241 250
242 return op - (u8 *) out_data; 251 return op - (u8 *) out_data;
243} 252}
253

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines