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.3 by pcg, Tue Dec 23 04:52:00 2003 UTC vs.
Revision 1.13 by root, Mon Mar 28 00:10:31 2011 UTC

1/* 1/*
2 * Copyright (c) 2000-2003 Marc Alexander Lehmann <pcg@goof.com> 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,
… …
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 * 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 *
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-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 20 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
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.
24 *
25 * Alternatively, the contents of this file may be used under the terms of
26 * the GNU General Public License ("GPL") version 2 or any later version,
27 * in which case the provisions of the GPL are applicable instead of
28 * the above. If you wish to allow the use of your version of this file
29 * only under the terms of the GPL and not to allow others to use your
30 * version of this file under the BSD license, indicate your decision
31 * by deleting the provisions above and replace them with the notice
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
34 * either the BSD or the GPL.
27 */ 35 */
28 36
29#include "lzfP.h" 37#include "lzfP.h"
30 38
31#if AVOID_ERRNO 39#if AVOID_ERRNO
32# define SET_ERRNO(n) 40# define SET_ERRNO(n)
33#else 41#else
34# include <errno.h> 42# include <errno.h>
35# define SET_ERRNO(n) errno = (n) 43# define SET_ERRNO(n) errno = (n)
44#endif
45
46#define USE_REP_MOVSB 1
47#if USE_REP_MOVSB /* small win on amd, big loss on intel */
48#if (__i386 || __amd64) && __GNUC__ >= 3
49# define lzf_movsb(dst, src, len) \
50 asm ("rep movsb" \
51 : "=D" (dst), "=S" (src), "=c" (len) \
52 : "0" (dst), "1" (src), "2" (len));
53#endif
36#endif 54#endif
37 55
38unsigned int 56unsigned int
39lzf_decompress (const void *const in_data, unsigned int in_len, 57lzf_decompress (const void *const in_data, unsigned int in_len,
40 void *out_data, unsigned int out_len) 58 void *out_data, unsigned int out_len)
… …
56 { 74 {
57 SET_ERRNO (E2BIG); 75 SET_ERRNO (E2BIG);
58 return 0; 76 return 0;
59 } 77 }
60 78
61#if USE_MEMCPY 79#if CHECK_INPUT
80 if (ip + ctrl > in_end)
81 {
82 SET_ERRNO (EINVAL);
83 return 0;
84 }
85#endif
86
87#ifdef lzf_movsb
62 memcpy (op, ip, ctrl); 88 lzf_movsb (op, ip, ctrl);
63 op += ctrl;
64 ip += ctrl;
65#else 89#else
90 switch (ctrl)
66 do 91 {
67 *op++ = *ip++; 92 case 32: *op++ = *ip++; case 31: *op++ = *ip++; case 30: *op++ = *ip++; case 29: *op++ = *ip++;
68 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 }
69#endif 101#endif
70 } 102 }
71 else /* back reference */ 103 else /* back reference */
72 { 104 {
73 unsigned int len = ctrl >> 5; 105 unsigned int len = ctrl >> 5;
74 106
75 u8 *ref = op - ((ctrl & 0x1f) << 8) - 1; 107 u8 *ref = op - ((ctrl & 0x1f) << 8) - 1;
76 108
109#if CHECK_INPUT
110 if (ip >= in_end)
111 {
112 SET_ERRNO (EINVAL);
113 return 0;
114 }
115#endif
77 if (len == 7) 116 if (len == 7)
117 {
78 len += *ip++; 118 len += *ip++;
119#if CHECK_INPUT
120 if (ip >= in_end)
121 {
122 SET_ERRNO (EINVAL);
123 return 0;
124 }
125#endif
79 126 }
127
80 ref -= *ip++; 128 ref -= *ip++;
81 129
82 if (op + len + 2 > out_end) 130 if (op + len + 2 > out_end)
83 { 131 {
84 SET_ERRNO (E2BIG); 132 SET_ERRNO (E2BIG);
… …
89 { 137 {
90 SET_ERRNO (EINVAL); 138 SET_ERRNO (EINVAL);
91 return 0; 139 return 0;
92 } 140 }
93 141
94 *op++ = *ref++; 142#ifdef lzf_movsb
95 *op++ = *ref++; 143 len += 2;
144 lzf_movsb (op, ref, len);
145#else
146 switch (len)
147 {
148 default:
149 len += 2;
96 150
97 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
98 *op++ = *ref++; 161 *op++ = *ref++;
99 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 }
179#endif
100 } 180 }
101 } 181 }
102 while (op < out_end && ip < in_end); 182 while (ip < in_end);
103 183
104 return op - (u8 *)out_data; 184 return op - (u8 *)out_data;
105} 185}
106 186

Diff Legend

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