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.9 by root, Mon Nov 5 23:28:40 2007 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"
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 (__i386 || __amd64) && __GNUC__ >= 3
47# define lzf_movsb(dst, src, len) \
48 asm ("rep movsb" \
49 : "=D" (dst), "=S" (src), "=c" (len) \
50 : "0" (dst), "1" (src), "2" (len));
46#endif 51#endif
47 52
48unsigned int 53unsigned int
49lzf_decompress (const void *const in_data, unsigned int in_len, 54lzf_decompress (const void *const in_data, unsigned int in_len,
50 void *out_data, unsigned int out_len) 55 void *out_data, unsigned int out_len)
… …
74 SET_ERRNO (EINVAL); 79 SET_ERRNO (EINVAL);
75 return 0; 80 return 0;
76 } 81 }
77#endif 82#endif
78 83
79#if USE_MEMCPY 84#ifdef lzf_movsb
80 memcpy (op, ip, ctrl); 85 lzf_movsb (op, ip, ctrl);
81 op += ctrl;
82 ip += ctrl;
83#else 86#else
84 do 87 do
85 *op++ = *ip++; 88 *op++ = *ip++;
86 while (--ctrl); 89 while (--ctrl);
87#endif 90#endif
… …
123 { 126 {
124 SET_ERRNO (EINVAL); 127 SET_ERRNO (EINVAL);
125 return 0; 128 return 0;
126 } 129 }
127 130
131#ifdef lzf_movsb
132 len += 2;
133 lzf_movsb (op, ref, len);
134#else
128 *op++ = *ref++; 135 *op++ = *ref++;
129 *op++ = *ref++; 136 *op++ = *ref++;
130 137
131 do 138 do
132 *op++ = *ref++; 139 *op++ = *ref++;
133 while (--len); 140 while (--len);
141#endif
134 } 142 }
135 } 143 }
136 while (ip < in_end); 144 while (ip < in_end);
137 145
138 return op - (u8 *)out_data; 146 return op - (u8 *)out_data;

Diff Legend

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