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.10 by root, Sun May 30 05:46:56 2010 UTC

… …
34 * either the BSD or the GPL. 34 * either the BSD or the GPL.
35 */ 35 */
36 36
37#include "lzfP.h" 37#include "lzfP.h"
38 38
39#include <string.h> /* for memcpy/memset */
40
39#if AVOID_ERRNO 41#if AVOID_ERRNO
40# define SET_ERRNO(n) 42# define SET_ERRNO(n)
41#else 43#else
42# include <errno.h> 44# include <errno.h>
43# define SET_ERRNO(n) errno = (n) 45# define SET_ERRNO(n) errno = (n)
44#endif 46#endif
45 47
48#if USE_REP_MOVSB /* small win on amd, big loss on intel */
46#if (__i386 || __amd64) && __GNUC__ >= 3 49#if (__i386 || __amd64) && __GNUC__ >= 3
47# define lzf_movsb(dst, src, len) \ 50# define lzf_movsb(dst, src, len) \
48 asm ("rep movsb" \ 51 asm ("rep movsb" \
49 : "=D" (dst), "=S" (src), "=c" (len) \ 52 : "=D" (dst), "=S" (src), "=c" (len) \
50 : "0" (dst), "1" (src), "2" (len)); 53 : "0" (dst), "1" (src), "2" (len));
54#endif
51#endif 55#endif
52 56
53unsigned int 57unsigned int
54lzf_decompress (const void *const in_data, unsigned int in_len, 58lzf_decompress (const void *const in_data, unsigned int in_len,
55 void *out_data, unsigned int out_len) 59 void *out_data, unsigned int out_len)
… …
82#endif 86#endif
83 87
84#ifdef lzf_movsb 88#ifdef lzf_movsb
85 lzf_movsb (op, ip, ctrl); 89 lzf_movsb (op, ip, ctrl);
86#else 90#else
91 switch (ctrl)
87 do 92 {
88 *op++ = *ip++; 93 case 32: *op++ = *ip++; case 31: *op++ = *ip++; case 30: *op++ = *ip++; case 29: *op++ = *ip++;
89 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 }
90#endif 102#endif
91 } 103 }
92 else /* back reference */ 104 else /* back reference */
93 { 105 {
94 unsigned int len = ctrl >> 5; 106 unsigned int len = ctrl >> 5;
… …
130 142
131#ifdef lzf_movsb 143#ifdef lzf_movsb
132 len += 2; 144 len += 2;
133 lzf_movsb (op, ref, len); 145 lzf_movsb (op, ref, len);
134#else 146#else
135 *op++ = *ref++; 147 switch (len)
136 *op++ = *ref++; 148 {
149 default:
150 len += 2;
137 151
138 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
139 *op++ = *ref++; 162 *op++ = *ref++;
140 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 }
141#endif 180#endif
142 } 181 }
143 } 182 }
144 while (ip < in_end); 183 while (ip < in_end);
145 184

Diff Legend

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