ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/liblzf/lzf_d.c
(Generate patch)

Comparing liblzf/lzf_d.c (file contents):
Revision 1.9 by root, Mon Nov 5 23:28:40 2007 UTC vs.
Revision 1.13 by root, Mon Mar 28 00:10:31 2011 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,
… …
41#else 41#else
42# include <errno.h> 42# include <errno.h>
43# define SET_ERRNO(n) errno = (n) 43# define SET_ERRNO(n) errno = (n)
44#endif 44#endif
45 45
46#define USE_REP_MOVSB 1
47#if USE_REP_MOVSB /* small win on amd, big loss on intel */
46#if (__i386 || __amd64) && __GNUC__ >= 3 48#if (__i386 || __amd64) && __GNUC__ >= 3
47# define lzf_movsb(dst, src, len) \ 49# define lzf_movsb(dst, src, len) \
48 asm ("rep movsb" \ 50 asm ("rep movsb" \
49 : "=D" (dst), "=S" (src), "=c" (len) \ 51 : "=D" (dst), "=S" (src), "=c" (len) \
50 : "0" (dst), "1" (src), "2" (len)); 52 : "0" (dst), "1" (src), "2" (len));
53#endif
51#endif 54#endif
52 55
53unsigned int 56unsigned int
54lzf_decompress (const void *const in_data, unsigned int in_len, 57lzf_decompress (const void *const in_data, unsigned int in_len,
55 void *out_data, unsigned int out_len) 58 void *out_data, unsigned int out_len)
… …
82#endif 85#endif
83 86
84#ifdef lzf_movsb 87#ifdef lzf_movsb
85 lzf_movsb (op, ip, ctrl); 88 lzf_movsb (op, ip, ctrl);
86#else 89#else
90 switch (ctrl)
87 do 91 {
88 *op++ = *ip++; 92 case 32: *op++ = *ip++; case 31: *op++ = *ip++; case 30: *op++ = *ip++; case 29: *op++ = *ip++;
89 while (--ctrl); 93 case 28: *op++ = *ip++; case 27: *op++ = *ip++; case 26: *op++ = *ip++; case 25: *op++ = *ip++;
94 case 24: *op++ = *ip++; case 23: *op++ = *ip++; case 22: *op++ = *ip++; case 21: *op++ = *ip++;
95 case 20: *op++ = *ip++; case 19: *op++ = *ip++; case 18: *op++ = *ip++; case 17: *op++ = *ip++;
96 case 16: *op++ = *ip++; case 15: *op++ = *ip++; case 14: *op++ = *ip++; case 13: *op++ = *ip++;
97 case 12: *op++ = *ip++; case 11: *op++ = *ip++; case 10: *op++ = *ip++; case 9: *op++ = *ip++;
98 case 8: *op++ = *ip++; case 7: *op++ = *ip++; case 6: *op++ = *ip++; case 5: *op++ = *ip++;
99 case 4: *op++ = *ip++; case 3: *op++ = *ip++; case 2: *op++ = *ip++; case 1: *op++ = *ip++;
100 }
90#endif 101#endif
91 } 102 }
92 else /* back reference */ 103 else /* back reference */
93 { 104 {
94 unsigned int len = ctrl >> 5; 105 unsigned int len = ctrl >> 5;
… …
130 141
131#ifdef lzf_movsb 142#ifdef lzf_movsb
132 len += 2; 143 len += 2;
133 lzf_movsb (op, ref, len); 144 lzf_movsb (op, ref, len);
134#else 145#else
135 *op++ = *ref++; 146 switch (len)
136 *op++ = *ref++; 147 {
148 default:
149 len += 2;
137 150
138 do 151 if (op >= ref + len)
152 {
153 /* disjunct areas */
154 memcpy (op, ref, len);
155 op += len;
156 }
157 else
158 {
159 /* overlapping, use octte by octte copying */
160 do
139 *op++ = *ref++; 161 *op++ = *ref++;
140 while (--len); 162 while (--len);
163 }
164
165 break;
166
167 case 9: *op++ = *ref++;
168 case 8: *op++ = *ref++;
169 case 7: *op++ = *ref++;
170 case 6: *op++ = *ref++;
171 case 5: *op++ = *ref++;
172 case 4: *op++ = *ref++;
173 case 3: *op++ = *ref++;
174 case 2: *op++ = *ref++;
175 case 1: *op++ = *ref++;
176 case 0: *op++ = *ref++; /* two octets more */
177 *op++ = *ref++;
178 }
141#endif 179#endif
142 } 180 }
143 } 181 }
144 while (ip < in_end); 182 while (ip < in_end);
145 183

Diff Legend

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