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.31 by root, Tue May 6 22:49:18 2008 UTC vs.
Revision 1.41 by root, Tue Jun 1 02:30:06 2010 UTC

1/* 1/*
2 * Copyright (c) 2000-2007 Marc Alexander Lehmann <schmorp@schmorp.de> 2 * Copyright (c) 2000-2010 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,
… …
38 38
39#define HSIZE (1 << (HLOG)) 39#define HSIZE (1 << (HLOG))
40 40
41/* 41/*
42 * don't play with this unless you benchmark! 42 * don't play with this unless you benchmark!
43 * decompression is not dependent on the hash function 43 * the data format is not dependent on the hash function.
44 * the hashing function might seem strange, just believe me 44 * the hash function might seem strange, just believe me,
45 * it works ;) 45 * it works ;)
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])
… …
87#define expect_true(expr) expect ((expr) != 0, 1) 87#define expect_true(expr) expect ((expr) != 0, 1)
88 88
89/* 89/*
90 * compressed format 90 * compressed format
91 * 91 *
92 * 000LLLLL <L+1> ; literal 92 * 000LLLLL <L+1> ; literal, L+1=1..33 octets
93 * LLLooooo oooooooo ; backref L 93 * LLLooooo oooooooo ; backref L+1=1..7 octets, o+1=1..4096 offset
94 * 111ooooo LLLLLLLL oooooooo ; backref L+7 94 * 111ooooo LLLLLLLL oooooooo ; backref L+8 octets, o+1=1..4096 offset
95 * 95 *
96 */ 96 */
97 97
98unsigned int 98unsigned int
99lzf_compress (const void *const in_data, unsigned int in_len, 99lzf_compress (const void *const in_data, unsigned int in_len,
… …
111 u8 *op = (u8 *)out_data; 111 u8 *op = (u8 *)out_data;
112 const u8 *in_end = ip + in_len; 112 const u8 *in_end = ip + in_len;
113 u8 *out_end = op + out_len; 113 u8 *out_end = op + out_len;
114 const u8 *ref; 114 const u8 *ref;
115 115
116 /* off requires a type wide enough to hold a general pointer difference.
117 * ISO C doesn't have that (size_t might not be enough and ptrdiff_t only
118 * works for differences within a single object). We also assume that no
119 * no bit pattern traps. Since the only platform that is both non-POSIX
120 * and fails to support both assumptions is windows 64 bit, we make a
121 * special workaround for it.
122 */
123#if defined (WIN32) && defined (_M_X64)
124 unsigned _int64 off; /* workaround for missing POSIX compliance */
125#else
126 unsigned long off;
127#endif
116 unsigned int hval; 128 unsigned int hval;
117#if WIN32
118 unsigned _int64 off; /* workaround for microsoft bug (they claim to support POSIX) */
119#else
120 unsigned long off;
121#endif
122 int lit; 129 int lit;
123 130
124 if (!in_len || !out_len) 131 if (!in_len || !out_len)
125 return 0; 132 return 0;
126 133
… …
146 && ref < ip /* the next test will actually take care of this, but this is faster */ 153 && ref < ip /* the next test will actually take care of this, but this is faster */
147#endif 154#endif
148 && (off = ip - ref - 1) < MAX_OFF 155 && (off = ip - ref - 1) < MAX_OFF
149 && ip + 4 < in_end 156 && ip + 4 < in_end
150 && ref > (u8 *)in_data 157 && ref > (u8 *)in_data
158 && ref[2] == ip[2]
151#if STRICT_ALIGN 159#if STRICT_ALIGN
152 && ref[0] == ip[0] 160 && (ref[1] << 8) | ref[0] == (ip[1] << 8) | ip[0]
153 && ref[1] == ip[1]
154 && ref[2] == ip[2]
155#else 161#else
156 && *(u16 *)ref == *(u16 *)ip 162 && *(u16 *)ref == *(u16 *)ip
157 && ref[2] == ip[2]
158#endif 163#endif
159 ) 164 )
160 { 165 {
161 /* match found at *ref++ */ 166 /* match found at *ref++ */
162 unsigned int len = 2; 167 unsigned int len = 2;
163 unsigned int maxlen = in_end - ip - len; 168 unsigned int maxlen = in_end - ip - len;
164 maxlen = maxlen > MAX_REF ? MAX_REF : maxlen; 169 maxlen = maxlen > MAX_REF ? MAX_REF : maxlen;
165 170
171 if (expect_false (op + 3 + 1 >= out_end)) /* first a faster conservative test */
172 if (op - !lit + 3 + 1 >= out_end) /* second the exact but rare test */
173 return 0;
174
166 op [- lit - 1] = lit - 1; /* stop run */ 175 op [- lit - 1] = lit - 1; /* stop run */
167 op -= !lit; /* undo run if length is zero */ 176 op -= !lit; /* undo run if length is zero */
168
169 if (expect_false (op + 3 + 1 >= out_end))
170 return 0;
171 177
172 for (;;) 178 for (;;)
173 { 179 {
174 if (expect_true (maxlen > 16)) 180 if (expect_true (maxlen > 16))
175 { 181 {
… …
199 while (len < maxlen && ref[len] == ip[len]); 205 while (len < maxlen && ref[len] == ip[len]);
200 206
201 break; 207 break;
202 } 208 }
203 209
204 len -= 2; 210 len -= 2; /* len is now #octets - 1 */
205 ip++; 211 ip++;
206 212
207 if (len < 7) 213 if (len < 7)
208 { 214 {
209 *op++ = (off >> 8) + (len << 5); 215 *op++ = (off >> 8) + (len << 5);
… …
213 *op++ = (off >> 8) + ( 7 << 5); 219 *op++ = (off >> 8) + ( 7 << 5);
214 *op++ = len - 7; 220 *op++ = len - 7;
215 } 221 }
216 222
217 *op++ = off; 223 *op++ = off;
224 lit = 0; op++; /* start run */
225
226 ip += len + 1;
227
228 if (expect_false (ip >= in_end - 2))
229 break;
218 230
219#if ULTRA_FAST || VERY_FAST 231#if ULTRA_FAST || VERY_FAST
220 ip += len;
221#if VERY_FAST && !ULTRA_FAST
222 --ip; 232 --ip;
233# if VERY_FAST && !ULTRA_FAST
234 --ip;
223#endif 235# endif
224 hval = FRST (ip); 236 hval = FRST (ip);
225 237
226 hval = NEXT (hval, ip); 238 hval = NEXT (hval, ip);
227 htab[IDX (hval)] = ip; 239 htab[IDX (hval)] = ip;
228 ip++; 240 ip++;
229 241
230#if VERY_FAST && !ULTRA_FAST 242# if VERY_FAST && !ULTRA_FAST
231 hval = NEXT (hval, ip); 243 hval = NEXT (hval, ip);
232 htab[IDX (hval)] = ip; 244 htab[IDX (hval)] = ip;
233 ip++; 245 ip++;
234#endif 246# endif
235#else 247#else
248 ip -= len + 1;
249
236 do 250 do
237 { 251 {
238 hval = NEXT (hval, ip); 252 hval = NEXT (hval, ip);
239 htab[IDX (hval)] = ip; 253 htab[IDX (hval)] = ip;
240 ip++; 254 ip++;
241 } 255 }
242 while (len--); 256 while (len--);
243#endif 257#endif
244
245 lit = 0; op++; /* start run */
246 } 258 }
247 else 259 else
248 { 260 {
249 /* one more literal byte we must copy */ 261 /* one more literal byte we must copy */
250 if (expect_false (op >= out_end)) 262 if (expect_false (op >= out_end))

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines