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.22 by root, Tue Nov 13 10:41:52 2007 UTC vs.
Revision 1.25 by root, Tue Nov 13 11:02:28 2007 UTC

46 */ 46 */
47#ifndef FRST 47#ifndef FRST
48# define FRST(p) (((p[0]) << 8) | p[1]) 48# define FRST(p) (((p[0]) << 8) | p[1])
49# define NEXT(v,p) (((v) << 8) | p[2]) 49# define NEXT(v,p) (((v) << 8) | p[2])
50# if ULTRA_FAST 50# if ULTRA_FAST
51# define IDX(h) (((h >> (3*8 - HLOG)) - h ) & (HSIZE - 1)) 51# define IDX(h) ((( h >> (3*8 - HLOG)) - h ) & (HSIZE - 1))
52# elif VERY_FAST 52# elif VERY_FAST
53# define IDX(h) (((h >> (3*8 - HLOG)) - h*5) & (HSIZE - 1)) 53# define IDX(h) ((( h >> (3*8 - HLOG)) - h*5) & (HSIZE - 1))
54# else 54# else
55# define IDX(h) ((((h ^ (h << 5)) >> (3*8 - HLOG)) - h*5) & (HSIZE - 1)) 55# define IDX(h) ((((h ^ (h << 5)) >> (3*8 - HLOG)) - h*5) & (HSIZE - 1))
56# endif 56# endif
57/*# define IDX(h) ((ip[0] * 121 ^ ip[1] * 33 ^ ip[2] * 1) & (HSIZE-1))*/
58#endif 57#endif
59/* 58/*
60 * IDX works because it is very similar to a multiplicative hash, e.g. 59 * IDX works because it is very similar to a multiplicative hash, e.g.
61 * ((h * 57321 >> (3*8 - HLOG)) & (HSIZE - 1)) 60 * ((h * 57321 >> (3*8 - HLOG)) & (HSIZE - 1))
62 * the latter is also quite fast on newer CPUs, and compresses similarly. 61 * the latter is also quite fast on newer CPUs, and compresses similarly.
158 /* match found at *ref++ */ 157 /* match found at *ref++ */
159 unsigned int len = 2; 158 unsigned int len = 2;
160 unsigned int maxlen = in_end - ip - len; 159 unsigned int maxlen = in_end - ip - len;
161 maxlen = maxlen > MAX_REF ? MAX_REF : maxlen; 160 maxlen = maxlen > MAX_REF ? MAX_REF : maxlen;
162 161
163 if (expect_false (op + 1 + 3 >= out_end))
164 return 0;
165
166 op [- lit - 1] = lit - 1; /* stop run */ 162 op [- lit - 1] = lit - 1; /* stop run */
167 op -= !lit; /* undo run if length is zero */ 163 op -= !lit; /* undo run if length is zero */
164
165 if (expect_false (op + 3 + 1 >= out_end))
166 return 0;
168 167
169 for (;;) 168 for (;;)
170 { 169 {
171 if (expect_true (maxlen > 16)) 170 if (expect_true (maxlen > 16))
172 { 171 {
255 op [- lit - 1] = lit - 1; /* stop run */ 254 op [- lit - 1] = lit - 1; /* stop run */
256 lit = 0; op++; /* start run */ 255 lit = 0; op++; /* start run */
257 } 256 }
258 } 257 }
259 258
260 if (op + lit + 2 >= out_end) 259 if (op + 2 >= out_end)
261 return 0; 260 return 0;
262 261
263 while (ip < in_end) 262 while (ip < in_end)
264 { 263 {
265 lit++; 264 lit++;
266 *op++ = *ip++; 265 *op++ = *ip++;
267 } 266 }
268 267
269 op [- lit - 1] = lit - 1; 268 op [- lit - 1] = lit - 1; /* end run */
269 op -= !lit; /* undo run if length is zero */
270 270
271 return op - (u8 *)out_data; 271 return op - (u8 *)out_data;
272} 272}
273 273

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines