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.20 by root, Tue Nov 13 08:38:49 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
130#endif 141#endif
131 && (off = ip - ref - 1) < MAX_OFF 142 && (off = ip - ref - 1) < MAX_OFF
132 && ip + 4 < in_end 143 && ip + 4 < in_end
133 && ref > (u8 *)in_data 144 && ref > (u8 *)in_data
134#if STRICT_ALIGN 145#if STRICT_ALIGN
146 x x x
135 && ref[0] == ip[0] 147 && ref[0] == ip[0]
136 && ref[1] == ip[1] 148 && ref[1] == ip[1]
137 && ref[2] == ip[2] 149 && ref[2] == ip[2]
138#else 150#else
139 && *(u16 *)ref == *(u16 *)ip 151 && *(u16 *)ref == *(u16 *)ip
144 /* match found at *ref++ */ 156 /* match found at *ref++ */
145 unsigned int len = 2; 157 unsigned int len = 2;
146 unsigned int maxlen = in_end - ip - len; 158 unsigned int maxlen = in_end - ip - len;
147 maxlen = maxlen > MAX_REF ? MAX_REF : maxlen; 159 maxlen = maxlen > MAX_REF ? MAX_REF : maxlen;
148 160
149 if (op + lit + 1 + 3 >= out_end) 161 if (expect_false (op + lit + 1 + 3 >= out_end))
150 return 0; 162 return 0;
151 163
152 do 164 if (expect_false (lit))
153 len++;
154 while (len < maxlen && ref[len] == ip[len]);
155
156 if (lit)
157 { 165 {
158 *op++ = lit - 1; 166 *op++ = lit - 1;
159 lit = -lit; 167 lit = -lit;
160 do 168 do
161 *op++ = ip[lit]; 169 *op++ = ip[lit];
162 while (++lit); 170 while (expect_false (++lit));
171 }
172
173 for (;;)
174 {
175 if (expect_true (maxlen > 16))
176 {
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 len++; if (ref [len] != ip [len]) break;
193 }
194
195 do
196 len++;
197 while (len < maxlen && ref[len] == ip[len]);
198
199 break;
163 } 200 }
164 201
165 len -= 2; 202 len -= 2;
166 ip++; 203 ip++;
167 204
203 while (len--); 240 while (len--);
204#endif 241#endif
205 continue; 242 continue;
206 } 243 }
207 } 244 }
208 else if (ip == in_end) 245 else if (expect_false (ip == in_end))
209 break; 246 break;
210 247
211 /* one more literal byte we must copy */ 248 /* one more literal byte we must copy */
212 lit++; 249 lit++;
213 ip++; 250 ip++;
214 251
215 if (lit == MAX_LIT) 252 if (expect_false (lit == MAX_LIT))
216 { 253 {
217 if (op + 1 + MAX_LIT >= out_end) 254 if (op + 1 + MAX_LIT >= out_end)
218 return 0; 255 return 0;
219 256
220 *op++ = MAX_LIT - 1; 257 *op++ = MAX_LIT - 1;
221 258
222#ifdef lzf_movsb 259#ifdef lzf_movsb
223 ip -= lit; 260 ip -= MAX_LIT;
224 lzf_movsb (op, ip, lit); 261 lzf_movsb (op, ip, lit);
225#else 262#else
226 lit = -lit; 263 lit = -lit;
227 do 264 do
228 *op++ = ip[lit]; 265 *op++ = ip[lit];

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines