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

Diff Legend

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