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.6 by root, Fri Jul 7 15:34:11 2006 UTC vs.
Revision 1.10 by root, Sun May 30 05:46:56 2010 UTC

1/* 1/*
2 * Copyright (c) 2000-2005 Marc Alexander Lehmann <schmorp@schmorp.de> 2 * Copyright (c) 2000-2007 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,
8 * this list of conditions and the following disclaimer. 8 * this list of conditions and the following disclaimer.
9 * 9 *
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 *
14 * 3. The name of the author may not be used to endorse or promote products
15 * derived from this software without specific prior written permission.
16 * 13 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 14 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- 15 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 16 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- 17 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
… …
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- 21 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25 * 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
26 * OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THE POSSIBILITY OF SUCH DAMAGE.
27 * 24 *
28 * 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
29 * 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,
30 * 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
31 * 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
32 * 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
33 * BSD license, indicate your decision by deleting the provisions above and 30 * version of this file under the BSD license, indicate your decision
34 * 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
35 * 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
36 * of this file under either the BSD or the GPL. 34 * either the BSD or the GPL.
37 */ 35 */
38 36
39#include "lzfP.h" 37#include "lzfP.h"
38
39#include <string.h> /* for memcpy/memset */
40 40
41#if AVOID_ERRNO 41#if AVOID_ERRNO
42# define SET_ERRNO(n) 42# define SET_ERRNO(n)
43#else 43#else
44# include <errno.h> 44# include <errno.h>
45# define SET_ERRNO(n) errno = (n) 45# define SET_ERRNO(n) errno = (n)
46#endif
47
48#if USE_REP_MOVSB /* small win on amd, big loss on intel */
49#if (__i386 || __amd64) && __GNUC__ >= 3
50# define lzf_movsb(dst, src, len) \
51 asm ("rep movsb" \
52 : "=D" (dst), "=S" (src), "=c" (len) \
53 : "0" (dst), "1" (src), "2" (len));
54#endif
46#endif 55#endif
47 56
48unsigned int 57unsigned int
49lzf_decompress (const void *const in_data, unsigned int in_len, 58lzf_decompress (const void *const in_data, unsigned int in_len,
50 void *out_data, unsigned int out_len) 59 void *out_data, unsigned int out_len)
… …
74 SET_ERRNO (EINVAL); 83 SET_ERRNO (EINVAL);
75 return 0; 84 return 0;
76 } 85 }
77#endif 86#endif
78 87
79#if USE_MEMCPY 88#ifdef lzf_movsb
80 memcpy (op, ip, ctrl); 89 lzf_movsb (op, ip, ctrl);
81 op += ctrl;
82 ip += ctrl;
83#else 90#else
91 switch (ctrl)
84 do 92 {
85 *op++ = *ip++; 93 case 32: *op++ = *ip++; case 31: *op++ = *ip++; case 30: *op++ = *ip++; case 29: *op++ = *ip++;
86 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 }
87#endif 102#endif
88 } 103 }
89 else /* back reference */ 104 else /* back reference */
90 { 105 {
91 unsigned int len = ctrl >> 5; 106 unsigned int len = ctrl >> 5;
… …
123 { 138 {
124 SET_ERRNO (EINVAL); 139 SET_ERRNO (EINVAL);
125 return 0; 140 return 0;
126 } 141 }
127 142
128 *op++ = *ref++; 143#ifdef lzf_movsb
129 *op++ = *ref++; 144 len += 2;
145 lzf_movsb (op, ref, len);
146#else
147 switch (len)
148 {
149 default:
150 len += 2;
130 151
131 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
132 *op++ = *ref++; 162 *op++ = *ref++;
133 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 }
180#endif
134 } 181 }
135 } 182 }
136 while (ip < in_end); 183 while (ip < in_end);
137 184
138 return op - (u8 *)out_data; 185 return op - (u8 *)out_data;

Diff Legend

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