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.5 by root, Thu Mar 3 17:06:44 2005 UTC vs.
Revision 1.12 by root, Tue Jun 1 01:15:34 2010 UTC

1/* 1/*
2 * Copyright (c) 2000-2005 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,
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"
40 38
41#if AVOID_ERRNO 39#if AVOID_ERRNO
42# define SET_ERRNO(n) 40# define SET_ERRNO(n)
43#else 41#else
44# include <errno.h> 42# include <errno.h>
45# define SET_ERRNO(n) errno = (n) 43# define SET_ERRNO(n) errno = (n)
44#endif
45
46#if USE_REP_MOVSB /* small win on amd, big loss on intel */
47#if (__i386 || __amd64) && __GNUC__ >= 3
48# define lzf_movsb(dst, src, len) \
49 asm ("rep movsb" \
50 : "=D" (dst), "=S" (src), "=c" (len) \
51 : "0" (dst), "1" (src), "2" (len));
52#endif
46#endif 53#endif
47 54
48unsigned int 55unsigned int
49lzf_decompress (const void *const in_data, unsigned int in_len, 56lzf_decompress (const void *const in_data, unsigned int in_len,
50 void *out_data, unsigned int out_len) 57 void *out_data, unsigned int out_len)
… …
66 { 73 {
67 SET_ERRNO (E2BIG); 74 SET_ERRNO (E2BIG);
68 return 0; 75 return 0;
69 } 76 }
70 77
71#if USE_MEMCPY 78#if CHECK_INPUT
79 if (ip + ctrl > in_end)
80 {
81 SET_ERRNO (EINVAL);
82 return 0;
83 }
84#endif
85
86#ifdef lzf_movsb
72 memcpy (op, ip, ctrl); 87 lzf_movsb (op, ip, ctrl);
73 op += ctrl;
74 ip += ctrl;
75#else 88#else
89 switch (ctrl)
76 do 90 {
77 *op++ = *ip++; 91 case 32: *op++ = *ip++; case 31: *op++ = *ip++; case 30: *op++ = *ip++; case 29: *op++ = *ip++;
78 while (--ctrl); 92 case 28: *op++ = *ip++; case 27: *op++ = *ip++; case 26: *op++ = *ip++; case 25: *op++ = *ip++;
93 case 24: *op++ = *ip++; case 23: *op++ = *ip++; case 22: *op++ = *ip++; case 21: *op++ = *ip++;
94 case 20: *op++ = *ip++; case 19: *op++ = *ip++; case 18: *op++ = *ip++; case 17: *op++ = *ip++;
95 case 16: *op++ = *ip++; case 15: *op++ = *ip++; case 14: *op++ = *ip++; case 13: *op++ = *ip++;
96 case 12: *op++ = *ip++; case 11: *op++ = *ip++; case 10: *op++ = *ip++; case 9: *op++ = *ip++;
97 case 8: *op++ = *ip++; case 7: *op++ = *ip++; case 6: *op++ = *ip++; case 5: *op++ = *ip++;
98 case 4: *op++ = *ip++; case 3: *op++ = *ip++; case 2: *op++ = *ip++; case 1: *op++ = *ip++;
99 }
79#endif 100#endif
80 } 101 }
81 else /* back reference */ 102 else /* back reference */
82 { 103 {
83 unsigned int len = ctrl >> 5; 104 unsigned int len = ctrl >> 5;
84 105
85 u8 *ref = op - ((ctrl & 0x1f) << 8) - 1; 106 u8 *ref = op - ((ctrl & 0x1f) << 8) - 1;
86 107
108#if CHECK_INPUT
109 if (ip >= in_end)
110 {
111 SET_ERRNO (EINVAL);
112 return 0;
113 }
114#endif
87 if (len == 7) 115 if (len == 7)
116 {
88 len += *ip++; 117 len += *ip++;
118#if CHECK_INPUT
119 if (ip >= in_end)
120 {
121 SET_ERRNO (EINVAL);
122 return 0;
123 }
124#endif
89 125 }
126
90 ref -= *ip++; 127 ref -= *ip++;
91 128
92 if (op + len + 2 > out_end) 129 if (op + len + 2 > out_end)
93 { 130 {
94 SET_ERRNO (E2BIG); 131 SET_ERRNO (E2BIG);
… …
99 { 136 {
100 SET_ERRNO (EINVAL); 137 SET_ERRNO (EINVAL);
101 return 0; 138 return 0;
102 } 139 }
103 140
104 *op++ = *ref++; 141#ifdef lzf_movsb
105 *op++ = *ref++; 142 len += 2;
143 lzf_movsb (op, ref, len);
144#else
145 switch (len)
146 {
147 default:
148 len += 2;
106 149
107 do 150 if (op >= ref + len)
151 {
152 /* disjunct areas */
153 memcpy (op, ref, len);
154 op += len;
155 }
156 else
157 {
158 /* overlapping, use octte by octte copying */
159 do
108 *op++ = *ref++; 160 *op++ = *ref++;
109 while (--len); 161 while (--len);
162 }
163
164 break;
165
166 case 9: *op++ = *ref++;
167 case 8: *op++ = *ref++;
168 case 7: *op++ = *ref++;
169 case 6: *op++ = *ref++;
170 case 5: *op++ = *ref++;
171 case 4: *op++ = *ref++;
172 case 3: *op++ = *ref++;
173 case 2: *op++ = *ref++;
174 case 1: *op++ = *ref++;
175 case 0: *op++ = *ref++; /* two octets more */
176 *op++ = *ref++;
177 }
178#endif
110 } 179 }
111 } 180 }
112 while (op < out_end && ip < in_end); 181 while (ip < in_end);
113 182
114 return op - (u8 *)out_data; 183 return op - (u8 *)out_data;
115} 184}
116 185

Diff Legend

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