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.28 by root, Fri Nov 30 10:34:26 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.
137 hval = NEXT (hval, ip); 136 hval = NEXT (hval, ip);
138 hslot = htab + IDX (hval); 137 hslot = htab + IDX (hval);
139 ref = *hslot; *hslot = ip; 138 ref = *hslot; *hslot = ip;
140 139
141 if (1 140 if (1
142#if INIT_HTAB && !USE_MEMCPY 141#if INIT_HTAB
143 && ref < ip /* the next test will actually take care of this, but this is faster */ 142 && ref < ip /* the next test will actually take care of this, but this is faster */
144#endif 143#endif
145 && (off = ip - ref - 1) < MAX_OFF 144 && (off = ip - ref - 1) < MAX_OFF
146 && ip + 4 < in_end 145 && ip + 4 < in_end
147 && ref > (u8 *)in_data 146 && ref > (u8 *)in_data
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)) 162 if (maxlen > 8) maxlen = 8;//D
164 return 0;
165 163
166 op [- lit - 1] = lit - 1; /* stop run */ 164 op [- lit - 1] = lit - 1; /* stop run */
167 op -= !lit; /* undo run if length is zero */ 165 op -= !lit; /* undo run if length is zero */
166
167 if (expect_false (op + 3 + 1 >= out_end))
168 return 0;
168 169
169 for (;;) 170 for (;;)
170 { 171 {
171 if (expect_true (maxlen > 16)) 172 if (expect_true (maxlen > 16))
172 { 173 {
236 htab[IDX (hval)] = ip; 237 htab[IDX (hval)] = ip;
237 ip++; 238 ip++;
238 } 239 }
239 while (len--); 240 while (len--);
240#endif 241#endif
242
241 lit = 0; op++; /* start run */ 243 lit = 0; op++; /* start run */
242 continue;
243 } 244 }
244 245 else
246 {
245 /* one more literal byte we must copy */ 247 /* one more literal byte we must copy */
246
247 if (expect_false (op >= out_end)) 248 if (expect_false (op >= out_end))
248 return 0; 249 return 0;
249 250
250 lit++; 251 lit++; *op++ = *ip++;
252
253 if (expect_false (lit == MAX_LIT))
254 {
255 op [- lit - 1] = lit - 1; /* stop run */
256 lit = 0; op++; /* start run */
257 }
258 }
259 }
260
261 if (op + 2 > out_end) /* at most 2 bytes can be missing here */
262 return 0;
263
264 while (ip < in_end)
265 {
251 *op++ = *ip++; 266 lit++; *op++ = *ip++;
252 267
253 if (expect_false (lit == MAX_LIT)) 268 if (expect_false (lit == MAX_LIT))
254 { 269 {
255 op [- lit - 1] = lit - 1; /* stop run */ 270 op [- lit - 1] = lit - 1; /* stop run */
256 lit = 0; op++; /* start run */ 271 lit = 0; op++; /* start run */
257 } 272 }
258 } 273 }
259 274
260 if (op + lit + 2 >= out_end)
261 return 0;
262
263 while (ip < in_end)
264 {
265 lit++;
266 *op++ = *ip++;
267 }
268
269 op [- lit - 1] = lit - 1; 275 op [- lit - 1] = lit - 1; /* end run */
276 op -= !lit; /* undo run if length is zero */
270 277
271 return op - (u8 *)out_data; 278 return op - (u8 *)out_data;
272} 279}
273 280

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines