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.15 by root, Fri Nov 2 12:39:20 2007 UTC vs.
Revision 1.17 by root, Tue Nov 13 07:54:18 2007 UTC

21 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- 21 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
22 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 22 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
23 * OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THE POSSIBILITY OF SUCH DAMAGE.
24 * 24 *
25 * Alternatively, the contents of this file may be used under the terms of 25 * Alternatively, the contents of this file may be used under the terms of
26 * the GNU General Public License version 2 (the "GPL"), in which case the 26 * the GNU General Public License ("GPL") version 2 or any later version,
27 * provisions of the GPL are applicable instead of the above. If you wish to 27 * in which case the provisions of the GPL are applicable instead of
28 * allow the use of your version of this file only under the terms of the 28 * the above. If you wish to allow the use of your version of this file
29 * GPL and not to allow others to use your version of this file under the 29 * only under the terms of the GPL and not to allow others to use your
30 * BSD license, indicate your decision by deleting the provisions above and 30 * version of this file under the BSD license, indicate your decision
31 * replace them with the notice and other provisions required by the GPL. If 31 * by deleting the provisions above and replace them with the notice
32 * you do not delete the provisions above, a recipient may use your version 32 * and other provisions required by the GPL. If you do not delete the
33 * provisions above, a recipient may use your version of this file under
33 * of this file under either the BSD or the GPL. 34 * either the BSD or the GPL.
34 */ 35 */
35 36
36#include "lzfP.h" 37#include "lzfP.h"
37 38
38#define HSIZE (1 << (HLOG)) 39#define HSIZE (1 << (HLOG))
73# define lzf_movsb(dst, src, len) \ 74# define lzf_movsb(dst, src, len) \
74 asm ("rep movsb" \ 75 asm ("rep movsb" \
75 : "=D" (dst), "=S" (src), "=c" (len) \ 76 : "=D" (dst), "=S" (src), "=c" (len) \
76 : "0" (dst), "1" (src), "2" (len)); 77 : "0" (dst), "1" (src), "2" (len));
77#endif 78#endif
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)
78 90
79/* 91/*
80 * compressed format 92 * compressed format
81 * 93 *
82 * 000LLLLL <L+1> ; literal 94 * 000LLLLL <L+1> ; literal
115# endif 127# endif
116#endif 128#endif
117 129
118 for (;;) 130 for (;;)
119 { 131 {
120 if (ip < in_end - 2) 132 if (expect_true (ip < in_end - 2))
121 { 133 {
122 hval = NEXT (hval, ip); 134 hval = NEXT (hval, ip);
123 hslot = htab + IDX (hval); 135 hslot = htab + IDX (hval);
124 ref = *hslot; *hslot = ip; 136 ref = *hslot; *hslot = ip;
125 137
143 /* match found at *ref++ */ 155 /* match found at *ref++ */
144 unsigned int len = 2; 156 unsigned int len = 2;
145 unsigned int maxlen = in_end - ip - len; 157 unsigned int maxlen = in_end - ip - len;
146 maxlen = maxlen > MAX_REF ? MAX_REF : maxlen; 158 maxlen = maxlen > MAX_REF ? MAX_REF : maxlen;
147 159
148 if (op + lit + 1 + 3 >= out_end) 160 if (expect_false (op + lit + 1 + 3 >= out_end))
149 return 0; 161 return 0;
150 162
151 do 163 do
152 len++; 164 len++;
153 while (len < maxlen && ref[len] == ip[len]); 165 while (len < maxlen && ref[len] == ip[len]);
202 while (len--); 214 while (len--);
203#endif 215#endif
204 continue; 216 continue;
205 } 217 }
206 } 218 }
207 else if (ip == in_end) 219 else if (expect_false (ip == in_end))
208 break; 220 break;
209 221
210 /* one more literal byte we must copy */ 222 /* one more literal byte we must copy */
211 lit++; 223 lit++;
212 ip++; 224 ip++;
213 225
214 if (lit == MAX_LIT) 226 if (expect_false (lit == MAX_LIT))
215 { 227 {
216 if (op + 1 + MAX_LIT >= out_end) 228 if (op + 1 + MAX_LIT >= out_end)
217 return 0; 229 return 0;
218 230
219 *op++ = MAX_LIT - 1; 231 *op++ = MAX_LIT - 1;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines