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.16 by root, Mon Nov 5 23:28:40 2007 UTC vs.
Revision 1.29 by root, Fri Nov 30 10:35:02 2007 UTC

… …
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])
50# if ULTRA_FAST
51# define IDX(h) ((( h >> (3*8 - HLOG)) - h ) & (HSIZE - 1))
52# elif VERY_FAST
53# define IDX(h) ((( h >> (3*8 - HLOG)) - h*5) & (HSIZE - 1))
54# else
50# 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))
51/*# define IDX(h) ((ip[0] * 121 ^ ip[1] * 33 ^ ip[2] * 1) & (HSIZE-1))*/ 56# endif
52#endif 57#endif
53/* 58/*
54 * 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.
55 * ((h * 57321 >> (3*8 - HLOG)) & (HSIZE - 1)) 60 * ((h * 57321 >> (3*8 - HLOG)) & (HSIZE - 1))
56 * 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.
… …
68 73
69#define MAX_LIT (1 << 5) 74#define MAX_LIT (1 << 5)
70#define MAX_OFF (1 << 13) 75#define MAX_OFF (1 << 13)
71#define MAX_REF ((1 << 8) + (1 << 3)) 76#define MAX_REF ((1 << 8) + (1 << 3))
72 77
73#if (__i386 || __amd64) && __GNUC__ >= 3 78#if __GNUC__ >= 3
74# define lzf_movsb(dst, src, len) \ 79# define expect(expr,value) __builtin_expect ((expr),(value))
75 asm ("rep movsb" \ 80# define inline inline
76 : "=D" (dst), "=S" (src), "=c" (len) \ 81#else
77 : "0" (dst), "1" (src), "2" (len)); 82# define expect(expr,value) (expr)
83# define inline static
78#endif 84#endif
85
86#define expect_false(expr) expect ((expr) != 0, 0)
87#define expect_true(expr) expect ((expr) != 0, 1)
79 88
80/* 89/*
81 * compressed format 90 * compressed format
82 * 91 *
83 * 000LLLLL <L+1> ; literal 92 * 000LLLLL <L+1> ; literal
… …
102 u8 *op = (u8 *)out_data; 111 u8 *op = (u8 *)out_data;
103 const u8 *in_end = ip + in_len; 112 const u8 *in_end = ip + in_len;
104 u8 *out_end = op + out_len; 113 u8 *out_end = op + out_len;
105 const u8 *ref; 114 const u8 *ref;
106 115
107 unsigned int hval = FRST (ip); 116 unsigned int hval;
108 unsigned long off; 117 unsigned long off;
109 int lit = 0; 118 int lit;
119
120 if (!in_len || !out_len)
121 return 0;
110 122
111#if INIT_HTAB 123#if INIT_HTAB
112 memset (htab, 0, sizeof (htab)); 124 memset (htab, 0, sizeof (htab));
113# if 0 125# if 0
114 for (hslot = htab; hslot < htab + HSIZE; hslot++) 126 for (hslot = htab; hslot < htab + HSIZE; hslot++)
115 *hslot++ = ip; 127 *hslot++ = ip;
116# endif 128# endif
117#endif 129#endif
118 130
119 for (;;) 131 lit = 0; op++; /* start run */
132
133 hval = FRST (ip);
134 while (ip < in_end - 2)
120 { 135 {
121 if (ip < in_end - 2) 136 hval = NEXT (hval, ip);
137 hslot = htab + IDX (hval);
138 ref = *hslot; *hslot = ip;
139
140 if (1
141#if INIT_HTAB
142 && ref < ip /* the next test will actually take care of this, but this is faster */
143#endif
144 && (off = ip - ref - 1) < MAX_OFF
145 && ip + 4 < in_end
146 && ref > (u8 *)in_data
147#if STRICT_ALIGN
148 && ref[0] == ip[0]
149 && ref[1] == ip[1]
150 && ref[2] == ip[2]
151#else
152 && *(u16 *)ref == *(u16 *)ip
153 && ref[2] == ip[2]
154#endif
155 )
122 { 156 {
123 hval = NEXT (hval, ip);
124 hslot = htab + IDX (hval);
125 ref = *hslot; *hslot = ip;
126
127 if (1
128#if INIT_HTAB && !USE_MEMCPY
129 && ref < ip /* the next test will actually take care of this, but this is faster */
130#endif
131 && (off = ip - ref - 1) < MAX_OFF
132 && ip + 4 < in_end
133 && ref > (u8 *)in_data
134#if STRICT_ALIGN
135 && ref[0] == ip[0]
136 && ref[1] == ip[1]
137 && ref[2] == ip[2]
138#else
139 && *(u16 *)ref == *(u16 *)ip
140 && ref[2] == ip[2]
141#endif
142 )
143 {
144 /* match found at *ref++ */ 157 /* match found at *ref++ */
145 unsigned int len = 2; 158 unsigned int len = 2;
146 unsigned int maxlen = in_end - ip - len; 159 unsigned int maxlen = in_end - ip - len;
147 maxlen = maxlen > MAX_REF ? MAX_REF : maxlen; 160 maxlen = maxlen > MAX_REF ? MAX_REF : maxlen;
148 161
149 if (op + lit + 1 + 3 >= out_end) 162 if (maxlen > 8) maxlen = 8;//D
163
164 op [- lit - 1] = lit - 1; /* stop run */
165 op -= !lit; /* undo run if length is zero */
166
167 if (expect_false (op + 3 + 1 >= out_end))
150 return 0; 168 return 0;
169
170 for (;;)
171 {
172 if (expect_true (maxlen > 16))
173 {
174 len++; if (ref [len] != ip [len]) break;
175 len++; if (ref [len] != ip [len]) break;
176 len++; if (ref [len] != ip [len]) break;
177 len++; if (ref [len] != ip [len]) break;
178
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
184 len++; if (ref [len] != ip [len]) break;
185 len++; if (ref [len] != ip [len]) break;
186 len++; if (ref [len] != ip [len]) break;
187 len++; if (ref [len] != ip [len]) break;
188
189 len++; if (ref [len] != ip [len]) break;
190 len++; if (ref [len] != ip [len]) break;
191 len++; if (ref [len] != ip [len]) break;
192 len++; if (ref [len] != ip [len]) break;
193 }
151 194
152 do 195 do
153 len++; 196 len++;
154 while (len < maxlen && ref[len] == ip[len]); 197 while (len < maxlen && ref[len] == ip[len]);
155 198
156 if (lit)
157 { 199 break;
158 *op++ = lit - 1;
159 lit = -lit;
160 do
161 *op++ = ip[lit];
162 while (++lit);
163 } 200 }
164 201
165 len -= 2; 202 len -= 2;
166 ip++; 203 ip++;
167 204
168 if (len < 7) 205 if (len < 7)
169 { 206 {
170 *op++ = (off >> 8) + (len << 5); 207 *op++ = (off >> 8) + (len << 5);
171 } 208 }
172 else 209 else
173 { 210 {
174 *op++ = (off >> 8) + ( 7 << 5); 211 *op++ = (off >> 8) + ( 7 << 5);
175 *op++ = len - 7; 212 *op++ = len - 7;
176 } 213 }
177 214
178 *op++ = off; 215 *op++ = off;
179 216
180#if ULTRA_FAST || VERY_FAST 217#if ULTRA_FAST || VERY_FAST
181 ip += len; 218 ip += len;
182#if VERY_FAST && !ULTRA_FAST 219#if VERY_FAST && !ULTRA_FAST
183 --ip; 220 --ip;
184#endif 221#endif
185 hval = FRST (ip); 222 hval = FRST (ip);
186 223
224 hval = NEXT (hval, ip);
225 htab[IDX (hval)] = ip;
226 ip++;
227
228#if VERY_FAST && !ULTRA_FAST
229 hval = NEXT (hval, ip);
230 htab[IDX (hval)] = ip;
231 ip++;
232#endif
233#else
234 do
235 {
187 hval = NEXT (hval, ip); 236 hval = NEXT (hval, ip);
188 htab[IDX (hval)] = ip; 237 htab[IDX (hval)] = ip;
189 ip++; 238 ip++;
190
191#if VERY_FAST && !ULTRA_FAST
192 hval = NEXT (hval, ip);
193 htab[IDX (hval)] = ip;
194 ip++;
195#endif
196#else
197 do
198 {
199 hval = NEXT (hval, ip);
200 htab[IDX (hval)] = ip;
201 ip++;
202 } 239 }
203 while (len--); 240 while (len--);
204#endif 241#endif
205 continue; 242
206 } 243 lit = 0; op++; /* start run */
207 } 244 }
208 else if (ip == in_end) 245 else
209 break;
210
211 /* one more literal byte we must copy */
212 lit++;
213 ip++;
214
215 if (lit == MAX_LIT)
216 { 246 {
217 if (op + 1 + MAX_LIT >= out_end) 247 /* one more literal byte we must copy */
248 if (expect_false (op >= out_end))
218 return 0; 249 return 0;
219 250
220 *op++ = MAX_LIT - 1; 251 lit++; *op++ = *ip++;
221 252
222#ifdef lzf_movsb 253 if (expect_false (lit == MAX_LIT))
223 ip -= lit;
224 lzf_movsb (op, ip, lit);
225#else
226 lit = -lit;
227 do 254 {
228 *op++ = ip[lit]; 255 op [- lit - 1] = lit - 1; /* stop run */
229 while (++lit); 256 lit = 0; op++; /* start run */
230#endif 257 }
231 } 258 }
232 } 259 }
233 260
234 if (lit) 261 if (op + 3 > out_end) /* at most 3 bytes can be missing here */
262 return 0;
263
264 while (ip < in_end)
235 { 265 {
236 if (op + lit + 1 >= out_end) 266 lit++; *op++ = *ip++;
237 return 0;
238 267
239 *op++ = lit - 1; 268 if (expect_false (lit == MAX_LIT))
240#ifdef lzf_movsb 269 {
241 ip -= lit; 270 op [- lit - 1] = lit - 1; /* stop run */
242 lzf_movsb (op, ip, lit); 271 lit = 0; op++; /* start run */
243#else 272 }
244 lit = -lit;
245 do
246 *op++ = ip[lit];
247 while (++lit);
248#endif
249 } 273 }
250 274
275 op [- lit - 1] = lit - 1; /* end run */
276 op -= !lit; /* undo run if length is zero */
277
251 return op - (u8 *) out_data; 278 return op - (u8 *)out_data;
252} 279}
253 280

Diff Legend

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