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.19 by root, Tue Nov 13 08:38:35 2007 UTC

… …
75 asm ("rep movsb" \ 75 asm ("rep movsb" \
76 : "=D" (dst), "=S" (src), "=c" (len) \ 76 : "=D" (dst), "=S" (src), "=c" (len) \
77 : "0" (dst), "1" (src), "2" (len)); 77 : "0" (dst), "1" (src), "2" (len));
78#endif 78#endif
79 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)
90
80/* 91/*
81 * compressed format 92 * compressed format
82 * 93 *
83 * 000LLLLL <L+1> ; literal 94 * 000LLLLL <L+1> ; literal
84 * LLLooooo oooooooo ; backref L 95 * LLLooooo oooooooo ; backref L
… …
116# endif 127# endif
117#endif 128#endif
118 129
119 for (;;) 130 for (;;)
120 { 131 {
121 if (ip < in_end - 2) 132 if (expect_true (ip < in_end - 2))
122 { 133 {
123 hval = NEXT (hval, ip); 134 hval = NEXT (hval, ip);
124 hslot = htab + IDX (hval); 135 hslot = htab + IDX (hval);
125 ref = *hslot; *hslot = ip; 136 ref = *hslot; *hslot = ip;
126 137
… …
144 /* match found at *ref++ */ 155 /* match found at *ref++ */
145 unsigned int len = 2; 156 unsigned int len = 2;
146 unsigned int maxlen = in_end - ip - len; 157 unsigned int maxlen = in_end - ip - len;
147 maxlen = maxlen > MAX_REF ? MAX_REF : maxlen; 158 maxlen = maxlen > MAX_REF ? MAX_REF : maxlen;
148 159
149 if (op + lit + 1 + 3 >= out_end) 160 if (expect_false (op + lit + 1 + 3 >= out_end))
150 return 0; 161 return 0;
151 162
152 do 163 if (expect_false (lit))
153 len++;
154 while (len < maxlen && ref[len] == ip[len]);
155
156 if (lit)
157 { 164 {
158 *op++ = lit - 1; 165 *op++ = lit - 1;
159 lit = -lit; 166 lit = -lit;
160 do 167 do
161 *op++ = ip[lit]; 168 *op++ = ip[lit];
162 while (++lit); 169 while (expect_false (++lit));
170 }
171
172 for (;;)
173 {
174 if (expect_true (maxlen > 16))
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 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 len++; if (ref [len] != ip [len]) break;
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 }
193
194 do
195 len++;
196 while (len < maxlen && ref[len] == ip[len]);
197
198 break;
163 } 199 }
164 200
165 len -= 2; 201 len -= 2;
166 ip++; 202 ip++;
167 203
… …
203 while (len--); 239 while (len--);
204#endif 240#endif
205 continue; 241 continue;
206 } 242 }
207 } 243 }
208 else if (ip == in_end) 244 else if (expect_false (ip == in_end))
209 break; 245 break;
210 246
211 /* one more literal byte we must copy */ 247 /* one more literal byte we must copy */
212 lit++; 248 lit++;
213 ip++; 249 ip++;
214 250
215 if (lit == MAX_LIT) 251 if (expect_false (lit == MAX_LIT))
216 { 252 {
217 if (op + 1 + MAX_LIT >= out_end) 253 if (op + 1 + MAX_LIT >= out_end)
218 return 0; 254 return 0;
219 255
220 *op++ = MAX_LIT - 1; 256 *op++ = MAX_LIT - 1;
221 257
222#ifdef lzf_movsb 258#ifdef lzf_movsb
223 ip -= lit; 259 ip -= MAX_LIT;
224 lzf_movsb (op, ip, lit); 260 lzf_movsb (op, ip, lit);
225#else 261#else
226 lit = -lit; 262 lit = -lit;
227 do 263 do
228 *op++ = ip[lit]; 264 *op++ = ip[lit];

Diff Legend

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