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.5 by pcg, Mon Dec 29 12:48:16 2003 UTC vs.
Revision 1.18 by root, Tue Nov 13 08:17:38 2007 UTC

1/* 1/*
2 * Copyright (c) 2000-2003 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])
41#define IDX(h) ((((h ^ (h << 5)) >> (3*8 - HLOG)) + h*3) & (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
42/* 53/*
43 * 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.
44 * (h * 57321 >> (3*8 - HLOG)) 55 * ((h * 57321 >> (3*8 - HLOG)) & (HSIZE - 1))
56 * the latter is also quite fast on newer CPUs, and compresses similarly.
57 *
45 * the next one is also quite good, albeit slow ;) 58 * the next one is also quite good, albeit slow ;)
46 * (int)(cos(h & 0xffffff) * 1e6) 59 * (int)(cos(h & 0xffffff) * 1e6)
47 */ 60 */
48 61
49#if 0 62#if 0
50/* original lzv-like hash function */ 63/* original lzv-like hash function, much worse and thus slower */
51# define FRST(p) (p[0] << 5) ^ p[1] 64# define FRST(p) (p[0] << 5) ^ p[1]
52# define NEXT(v,p) ((v) << 5) ^ p[2] 65# define NEXT(v,p) ((v) << 5) ^ p[2]
53# define IDX(h) ((h) & (HSIZE - 1)) 66# define IDX(h) ((h) & (HSIZE - 1))
54#endif 67#endif
55 68
56#define MAX_LIT (1 << 5) 69#define MAX_LIT (1 << 5)
57#define MAX_OFF (1 << 13) 70#define MAX_OFF (1 << 13)
58#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)
59 90
60/* 91/*
61 * compressed format 92 * compressed format
62 * 93 *
63 * 000LLLLL <L+1> ; literal 94 * 000LLLLL <L+1> ; literal
64 * LLLOOOOO oooooooo ; backref L 95 * LLLooooo oooooooo ; backref L
65 * 111OOOOO LLLLLLLL oooooooo ; backref L+7 96 * 111ooooo LLLLLLLL oooooooo ; backref L+7
66 * 97 *
67 */ 98 */
68 99
69unsigned int 100unsigned int
70lzf_compress (const void *const in_data, unsigned int in_len, 101lzf_compress (const void *const in_data, unsigned int in_len,
71 void *out_data, unsigned int out_len 102 void *out_data, unsigned int out_len
72#if LZF_STATE_ARG 103#if LZF_STATE_ARG
73 , LZF_STATE *htab 104 , LZF_STATE htab
74#endif 105#endif
75 ) 106 )
76{ 107{
77#if !LZF_STATE_ARG 108#if !LZF_STATE_ARG
78 LZF_STATE htab; 109 LZF_STATE htab;
87 unsigned int hval = FRST (ip); 118 unsigned int hval = FRST (ip);
88 unsigned long off; 119 unsigned long off;
89 int lit = 0; 120 int lit = 0;
90 121
91#if INIT_HTAB 122#if INIT_HTAB
92# if USE_MEMCPY
93 memset (htab, 0, sizeof (htab)); 123 memset (htab, 0, sizeof (htab));
94# else 124# if 0
95 for (hslot = htab; hslot < htab + HSIZE; hslot++) 125 for (hslot = htab; hslot < htab + HSIZE; hslot++)
96 *hslot++ = ip; 126 *hslot++ = ip;
97# endif 127# endif
98#endif 128#endif
99 129
100 for (;;) 130 for (;;)
101 { 131 {
102 if (ip < in_end - 2) 132 if (expect_true (ip < in_end - 2))
103 { 133 {
104 hval = NEXT (hval, ip); 134 hval = NEXT (hval, ip);
105 hslot = htab + IDX (hval); 135 hslot = htab + IDX (hval);
106 ref = *hslot; *hslot = ip; 136 ref = *hslot; *hslot = ip;
107 137
125 /* match found at *ref++ */ 155 /* match found at *ref++ */
126 unsigned int len = 2; 156 unsigned int len = 2;
127 unsigned int maxlen = in_end - ip - len; 157 unsigned int maxlen = in_end - ip - len;
128 maxlen = maxlen > MAX_REF ? MAX_REF : maxlen; 158 maxlen = maxlen > MAX_REF ? MAX_REF : maxlen;
129 159
130 do
131 len++;
132 while (len < maxlen && ref[len] == ip[len]);
133
134 if (op + lit + 1 + 3 >= out_end) 160 if (expect_false (op + lit + 1 + 3 >= out_end))
135 return 0; 161 return 0;
136 162
137 if (lit) 163 if (lit)
138 { 164 {
139 *op++ = lit - 1; 165 *op++ = lit - 1;
141 do 167 do
142 *op++ = ip[lit]; 168 *op++ = ip[lit];
143 while (++lit); 169 while (++lit);
144 } 170 }
145 171
172 for (;;)
173 {
174 if (expect_true (ip < in_end - 2 - 8 && maxlen > 8))
175 {
176 len++; if (ref [len] != ip [len]) break;
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 }
185
186 do
187 len++;
188 while (len < maxlen && ref[len] == ip[len]);
189
190 break;
191 }
192
146 len -= 2; 193 len -= 2;
147 ip++; 194 ip++;
148 195
149 if (len < 7) 196 if (len < 7)
150 { 197 {
156 *op++ = len - 7; 203 *op++ = len - 7;
157 } 204 }
158 205
159 *op++ = off; 206 *op++ = off;
160 207
161#if ULTRA_FAST 208#if ULTRA_FAST || VERY_FAST
162 ip += len; 209 ip += len;
210#if VERY_FAST && !ULTRA_FAST
211 --ip;
212#endif
163 hval = FRST (ip); 213 hval = FRST (ip);
214
164 hval = NEXT (hval, ip); 215 hval = NEXT (hval, ip);
165 htab[IDX (hval)] = ip; 216 htab[IDX (hval)] = ip;
166 ip++; 217 ip++;
218
219#if VERY_FAST && !ULTRA_FAST
220 hval = NEXT (hval, ip);
221 htab[IDX (hval)] = ip;
222 ip++;
223#endif
167#else 224#else
168 do 225 do
169 { 226 {
170 hval = NEXT (hval, ip); 227 hval = NEXT (hval, ip);
171 htab[IDX (hval)] = ip; 228 htab[IDX (hval)] = ip;
174 while (len--); 231 while (len--);
175#endif 232#endif
176 continue; 233 continue;
177 } 234 }
178 } 235 }
179 else if (ip == in_end) 236 else if (expect_false (ip == in_end))
180 break; 237 break;
181 238
182 /* one more literal byte we must copy */ 239 /* one more literal byte we must copy */
183 lit++; 240 lit++;
184 ip++; 241 ip++;
185 242
186 if (lit == MAX_LIT) 243 if (expect_false (lit == MAX_LIT))
187 { 244 {
188 if (op + 1 + MAX_LIT >= out_end) 245 if (op + 1 + MAX_LIT >= out_end)
189 return 0; 246 return 0;
190 247
191 *op++ = MAX_LIT - 1; 248 *op++ = MAX_LIT - 1;
192#if USE_MEMCPY 249
193 memcpy (op, ip - MAX_LIT, MAX_LIT); 250#ifdef lzf_movsb
194 op += MAX_LIT; 251 ip -= lit;
195 lit = 0; 252 lzf_movsb (op, ip, lit);
196#else 253#else
197 lit = -lit; 254 lit = -lit;
198 do 255 do
199 *op++ = ip[lit]; 256 *op++ = ip[lit];
200 while (++lit); 257 while (++lit);
206 { 263 {
207 if (op + lit + 1 >= out_end) 264 if (op + lit + 1 >= out_end)
208 return 0; 265 return 0;
209 266
210 *op++ = lit - 1; 267 *op++ = lit - 1;
268#ifdef lzf_movsb
269 ip -= lit;
270 lzf_movsb (op, ip, lit);
271#else
211 lit = -lit; 272 lit = -lit;
212 do 273 do
213 *op++ = ip[lit]; 274 *op++ = ip[lit];
214 while (++lit); 275 while (++lit);
276#endif
215 } 277 }
216 278
217 return op - (u8 *) out_data; 279 return op - (u8 *) out_data;
218} 280}
281

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines