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.8 by root, Thu Mar 3 17:06:44 2005 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))
44 * don't play with this unless you benchmark! 42 * don't play with this unless you benchmark!
45 * decompression is not dependent on the hash function 43 * decompression is not dependent on the hash function
46 * the hashing function might seem strange, just believe me 44 * the hashing function might seem strange, just believe me
47 * it works ;) 45 * it works ;)
48 */ 46 */
47#ifndef FRST
49#define FRST(p) (((p[0]) << 8) + p[1]) 48# define FRST(p) (((p[0]) << 8) | p[1])
50#define NEXT(v,p) (((v) << 8) + p[2]) 49# define NEXT(v,p) (((v) << 8) | p[2])
51#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))
51/*# define IDX(h) ((ip[0] * 121 ^ ip[1] * 33 ^ ip[2] * 1) & (HSIZE-1))*/
52#endif
52/* 53/*
53 * 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.
54 * ((h * 57321 >> (3*8 - HLOG)) & (HSIZE - 1)) 55 * ((h * 57321 >> (3*8 - HLOG)) & (HSIZE - 1))
55 * 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.
56 * 57 *
57 * the next one is also quite good, albeit slow ;) 58 * the next one is also quite good, albeit slow ;)
58 * (int)(cos(h & 0xffffff) * 1e6) 59 * (int)(cos(h & 0xffffff) * 1e6)
59 */ 60 */
60 61
65# define IDX(h) ((h) & (HSIZE - 1)) 66# define IDX(h) ((h) & (HSIZE - 1))
66#endif 67#endif
67 68
68#define MAX_LIT (1 << 5) 69#define MAX_LIT (1 << 5)
69#define MAX_OFF (1 << 13) 70#define MAX_OFF (1 << 13)
70#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
71 79
72/* 80/*
73 * compressed format 81 * compressed format
74 * 82 *
75 * 000LLLLL <L+1> ; literal 83 * 000LLLLL <L+1> ; literal
76 * LLLOOOOO oooooooo ; backref L 84 * LLLooooo oooooooo ; backref L
77 * 111OOOOO LLLLLLLL oooooooo ; backref L+7 85 * 111ooooo LLLLLLLL oooooooo ; backref L+7
78 * 86 *
79 */ 87 */
80 88
81unsigned int 89unsigned int
82lzf_compress (const void *const in_data, unsigned int in_len, 90lzf_compress (const void *const in_data, unsigned int in_len,
83 void *out_data, unsigned int out_len 91 void *out_data, unsigned int out_len
84#if LZF_STATE_ARG 92#if LZF_STATE_ARG
85 , LZF_STATE *htab 93 , LZF_STATE htab
86#endif 94#endif
87 ) 95 )
88{ 96{
89#if !LZF_STATE_ARG 97#if !LZF_STATE_ARG
90 LZF_STATE htab; 98 LZF_STATE htab;
99 unsigned int hval = FRST (ip); 107 unsigned int hval = FRST (ip);
100 unsigned long off; 108 unsigned long off;
101 int lit = 0; 109 int lit = 0;
102 110
103#if INIT_HTAB 111#if INIT_HTAB
104# if USE_MEMCPY
105 memset (htab, 0, sizeof (htab)); 112 memset (htab, 0, sizeof (htab));
106# else 113# if 0
107 for (hslot = htab; hslot < htab + HSIZE; hslot++) 114 for (hslot = htab; hslot < htab + HSIZE; hslot++)
108 *hslot++ = ip; 115 *hslot++ = ip;
109# endif 116# endif
110#endif 117#endif
111 118
112 for (;;) 119 for (;;)
113 { 120 {
137 /* match found at *ref++ */ 144 /* match found at *ref++ */
138 unsigned int len = 2; 145 unsigned int len = 2;
139 unsigned int maxlen = in_end - ip - len; 146 unsigned int maxlen = in_end - ip - len;
140 maxlen = maxlen > MAX_REF ? MAX_REF : maxlen; 147 maxlen = maxlen > MAX_REF ? MAX_REF : maxlen;
141 148
149 if (op + lit + 1 + 3 >= out_end)
150 return 0;
151
142 do 152 do
143 len++; 153 len++;
144 while (len < maxlen && ref[len] == ip[len]); 154 while (len < maxlen && ref[len] == ip[len]);
145
146 if (op + lit + 1 + 3 >= out_end)
147 return 0;
148 155
149 if (lit) 156 if (lit)
150 { 157 {
151 *op++ = lit - 1; 158 *op++ = lit - 1;
152 lit = -lit; 159 lit = -lit;
168 *op++ = len - 7; 175 *op++ = len - 7;
169 } 176 }
170 177
171 *op++ = off; 178 *op++ = off;
172 179
173#if ULTRA_FAST 180#if ULTRA_FAST || VERY_FAST
174 ip += len; 181 ip += len;
182#if VERY_FAST && !ULTRA_FAST
183 --ip;
184#endif
175 hval = FRST (ip); 185 hval = FRST (ip);
186
176 hval = NEXT (hval, ip); 187 hval = NEXT (hval, ip);
177 htab[IDX (hval)] = ip; 188 htab[IDX (hval)] = ip;
178 ip++; 189 ip++;
190
191#if VERY_FAST && !ULTRA_FAST
192 hval = NEXT (hval, ip);
193 htab[IDX (hval)] = ip;
194 ip++;
195#endif
179#else 196#else
180 do 197 do
181 { 198 {
182 hval = NEXT (hval, ip); 199 hval = NEXT (hval, ip);
183 htab[IDX (hval)] = ip; 200 htab[IDX (hval)] = ip;
199 { 216 {
200 if (op + 1 + MAX_LIT >= out_end) 217 if (op + 1 + MAX_LIT >= out_end)
201 return 0; 218 return 0;
202 219
203 *op++ = MAX_LIT - 1; 220 *op++ = MAX_LIT - 1;
204#if USE_MEMCPY 221
205 memcpy (op, ip - MAX_LIT, MAX_LIT); 222#ifdef lzf_movsb
206 op += MAX_LIT; 223 ip -= lit;
207 lit = 0; 224 lzf_movsb (op, ip, lit);
208#else 225#else
209 lit = -lit; 226 lit = -lit;
210 do 227 do
211 *op++ = ip[lit]; 228 *op++ = ip[lit];
212 while (++lit); 229 while (++lit);
218 { 235 {
219 if (op + lit + 1 >= out_end) 236 if (op + lit + 1 >= out_end)
220 return 0; 237 return 0;
221 238
222 *op++ = lit - 1; 239 *op++ = lit - 1;
240#ifdef lzf_movsb
241 ip -= lit;
242 lzf_movsb (op, ip, lit);
243#else
223 lit = -lit; 244 lit = -lit;
224 do 245 do
225 *op++ = ip[lit]; 246 *op++ = ip[lit];
226 while (++lit); 247 while (++lit);
248#endif
227 } 249 }
228 250
229 return op - (u8 *) out_data; 251 return op - (u8 *) out_data;
230} 252}
253

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines