ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/liblzf/lzf_c.c
(Generate patch)

Comparing liblzf/lzf_c.c (file contents):
Revision 1.4 by pcg, Tue Dec 23 04:52:00 2003 UTC vs.
Revision 1.14 by root, Thu Jun 21 22:11:34 2007 UTC

1/* 1/*
2 * Copyright (c) 2000-2003 Marc Alexander Lehmann <pcg@goof.com> 2 * Copyright (c) 2000-2005 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,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- 24 * 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 25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26 * OF THE POSSIBILITY OF SUCH DAMAGE. 26 * OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
28 * 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
30 * provisions of the GPL are applicable instead of the above. If you wish to
31 * allow the use of your version of this file only under the terms of the
32 * GPL and not to allow others to use your version of this file under the
33 * BSD license, indicate your decision by deleting the provisions above and
34 * replace them with the notice and other provisions required by the GPL. If
35 * you do not delete the provisions above, a recipient may use your version
36 * of this file under either the BSD or the GPL.
27 */ 37 */
28 38
29#include "lzfP.h" 39#include "lzfP.h"
30 40
31#define HSIZE (1 << (HLOG)) 41#define HSIZE (1 << (HLOG))
34 * don't play with this unless you benchmark! 44 * don't play with this unless you benchmark!
35 * decompression is not dependent on the hash function 45 * decompression is not dependent on the hash function
36 * the hashing function might seem strange, just believe me 46 * the hashing function might seem strange, just believe me
37 * it works ;) 47 * it works ;)
38 */ 48 */
49#ifndef FRST
39#define FRST(p) (((p[0]) << 8) + p[1]) 50# define FRST(p) (((p[0]) << 8) | p[1])
40#define NEXT(v,p) (((v) << 8) + p[2]) 51# define NEXT(v,p) (((v) << 8) | p[2])
41#define IDX(h) ((((h ^ (h << 5)) >> (3*8 - HLOG)) + h*3) & (HSIZE - 1)) 52# define IDX(h) ((((h ^ (h << 5)) >> (3*8 - HLOG)) - h*5) & (HSIZE - 1))
53/*# define IDX(h) ((ip[0] * 121 ^ ip[1] * 33 ^ ip[2] * 1) & (HSIZE-1))*/
54#endif
42/* 55/*
43 * IDX works because it is very similar to a multiplicative hash, e.g. 56 * IDX works because it is very similar to a multiplicative hash, e.g.
44 * (h * 57321 >> (3*8 - HLOG)) 57 * ((h * 57321 >> (3*8 - HLOG)) & (HSIZE - 1))
58 * the latter is also quite fast on newer CPUs, and compresses similarly.
59 *
45 * the next one is also quite good, albeit slow ;) 60 * the next one is also quite good, albeit slow ;)
46 * (int)(cos(h & 0xffffff) * 1e6) 61 * (int)(cos(h & 0xffffff) * 1e6)
47 */ 62 */
48 63
49#if 0 64#if 0
50/* original lzv-like hash function */ 65/* original lzv-like hash function, much worse and thus slower */
51# define FRST(p) (p[0] << 5) ^ p[1] 66# define FRST(p) (p[0] << 5) ^ p[1]
52# define NEXT(v,p) ((v) << 5) ^ p[2] 67# define NEXT(v,p) ((v) << 5) ^ p[2]
53# define IDX(h) ((h) & (HSIZE - 1)) 68# define IDX(h) ((h) & (HSIZE - 1))
54#endif 69#endif
55 70
56#define MAX_LIT (1 << 5) 71#define MAX_LIT (1 << 5)
57#define MAX_OFF (1 << 13) 72#define MAX_OFF (1 << 13)
58#define MAX_REF ((1 << 8) + (1 << 3)) 73#define MAX_REF ((1 << 8) + (1 << 3))
74
75#if (__i386 || __amd64) && __GNUC__ >= 3
76# define lzf_movsb(dst, src, len) \
77 asm ("rep movsb" \
78 : "=D" (dst), "=S" (src), "=c" (len) \
79 : "0" (dst), "1" (src), "2" (len));
80#endif
59 81
60/* 82/*
61 * compressed format 83 * compressed format
62 * 84 *
63 * 000LLLLL <L+1> ; literal 85 * 000LLLLL <L+1> ; literal
64 * LLLOOOOO oooooooo ; backref L 86 * LLLooooo oooooooo ; backref L
65 * 111OOOOO LLLLLLLL oooooooo ; backref L+7 87 * 111ooooo LLLLLLLL oooooooo ; backref L+7
66 * 88 *
67 */ 89 */
68 90
69unsigned int 91unsigned int
70lzf_compress (const void *const in_data, unsigned int in_len, 92lzf_compress (const void *const in_data, unsigned int in_len,
71 void *out_data, unsigned int out_len 93 void *out_data, unsigned int out_len
72#if !LZF_STATE_ARG 94#if LZF_STATE_ARG
73 , LZF_STATE *htab 95 , LZF_STATE htab
74#endif 96#endif
75 ) 97 )
76{ 98{
77#if LZF_STATE_ARG 99#if !LZF_STATE_ARG
78 LZF_STATE htab; 100 LZF_STATE htab;
79#endif 101#endif
80 const u8 **hslot; 102 const u8 **hslot;
81 const u8 *ip = (const u8 *)in_data; 103 const u8 *ip = (const u8 *)in_data;
82 u8 *op = (u8 *)out_data; 104 u8 *op = (u8 *)out_data;
87 unsigned int hval = FRST (ip); 109 unsigned int hval = FRST (ip);
88 unsigned long off; 110 unsigned long off;
89 int lit = 0; 111 int lit = 0;
90 112
91#if INIT_HTAB 113#if INIT_HTAB
92# if USE_MEMCPY
93 memset (htab, 0, sizeof (htab)); 114 memset (htab, 0, sizeof (htab));
94# else 115# if 0
95 for (hslot = htab; hslot < htab + HSIZE; hslot++) 116 for (hslot = htab; hslot < htab + HSIZE; hslot++)
96 *hslot++ = ip; 117 *hslot++ = ip;
97# endif 118# endif
98#endif 119#endif
99 120
100 do 121 for (;;)
101 { 122 {
123 if (ip < in_end - 2)
124 {
102 hval = NEXT (hval, ip); 125 hval = NEXT (hval, ip);
103 hslot = htab + IDX (hval); 126 hslot = htab + IDX (hval);
104 ref = *hslot; *hslot = ip; 127 ref = *hslot; *hslot = ip;
105 128
106 if (1 129 if (1
107#if INIT_HTAB && !USE_MEMCPY 130#if INIT_HTAB && !USE_MEMCPY
108 && ref < ip /* the next test will actually take care of this, but it is faster */ 131 && ref < ip /* the next test will actually take care of this, but this is faster */
109#endif 132#endif
110 && (off = ip - ref - 1) < MAX_OFF 133 && (off = ip - ref - 1) < MAX_OFF
111 && ip + 4 < in_end 134 && ip + 4 < in_end
112 && ref > (u8 *)in_data 135 && ref > (u8 *)in_data
113#if STRICT_ALIGN 136#if STRICT_ALIGN
114 && ref[0] == ip[0] 137 && ref[0] == ip[0]
115 && ref[1] == ip[1] 138 && ref[1] == ip[1]
116 && ref[2] == ip[2] 139 && ref[2] == ip[2]
117#else 140#else
118 && *(u16 *)ref == *(u16 *)ip 141 && *(u16 *)ref == *(u16 *)ip
119 && ref[2] == ip[2] 142 && ref[2] == ip[2]
120#endif 143#endif
121 ) 144 )
122 { 145 {
123 /* match found at *ref++ */ 146 /* match found at *ref++ */
124 unsigned int len = 2; 147 unsigned int len = 2;
125 unsigned int maxlen = in_end - ip - len; 148 unsigned int maxlen = in_end - ip - len;
126 maxlen = maxlen > MAX_REF ? MAX_REF : maxlen; 149 maxlen = maxlen > MAX_REF ? MAX_REF : maxlen;
127 150
128 do 151 if (op + lit + 1 + 3 >= out_end)
129 len++; 152 return 0;
153
154 do
155 len++;
130 while (len < maxlen && ref[len] == ip[len]); 156 while (len < maxlen && ref[len] == ip[len]);
131 157
132 if (op + lit + 1 + 3 >= out_end) 158 if (lit)
133 return 0; 159 {
134
135 if (lit)
136 {
137 *op++ = lit - 1; 160 *op++ = lit - 1;
138 lit = -lit; 161 lit = -lit;
139 do 162 do
140 *op++ = ip[lit]; 163 *op++ = ip[lit];
141 while (++lit); 164 while (++lit);
142 } 165 }
143 166
144 len -= 2; 167 len -= 2;
145 ip++; 168 ip++;
146 169
147 if (len < 7) 170 if (len < 7)
148 { 171 {
149 *op++ = (off >> 8) + (len << 5); 172 *op++ = (off >> 8) + (len << 5);
150 } 173 }
151 else 174 else
152 { 175 {
153 *op++ = (off >> 8) + ( 7 << 5); 176 *op++ = (off >> 8) + ( 7 << 5);
154 *op++ = len - 7; 177 *op++ = len - 7;
155 } 178 }
156 179
157 *op++ = off; 180 *op++ = off;
158 181
159#if ULTRA_FAST 182#if ULTRA_FAST || VERY_FAST
160 ip += len; 183 ip += len;
184#if VERY_FAST && !ULTRA_FAST
185 --ip;
186#endif
161 hval = FRST (ip); 187 hval = FRST (ip);
188
162 hval = NEXT (hval, ip); 189 hval = NEXT (hval, ip);
163 htab[IDX (hval)] = ip; 190 htab[IDX (hval)] = ip;
164 ip++; 191 ip++;
165#else 192
166 do 193#if VERY_FAST && !ULTRA_FAST
167 {
168 hval = NEXT (hval, ip); 194 hval = NEXT (hval, ip);
169 htab[IDX (hval)] = ip; 195 htab[IDX (hval)] = ip;
196 ip++;
197#endif
198#else
199 do
200 {
201 hval = NEXT (hval, ip);
202 htab[IDX (hval)] = ip;
203 ip++;
204 }
205 while (len--);
206#endif
207 continue;
208 }
209 }
210 else if (ip == in_end)
211 break;
212
213 /* one more literal byte we must copy */
214 lit++;
170 ip++; 215 ip++;
171 }
172 while (len--);
173#endif
174 }
175 else
176 {
177 /* one more literal byte we must copy */
178 lit++;
179 ip++;
180 216
181 if (lit == MAX_LIT) 217 if (lit == MAX_LIT)
182 { 218 {
183 if (op + 1 + MAX_LIT >= out_end) 219 if (op + 1 + MAX_LIT >= out_end)
184 return 0; 220 return 0;
185 221
186 *op++ = MAX_LIT - 1; 222 *op++ = MAX_LIT - 1;
187#if USE_MEMCPY 223
188 memcpy (op, ip - MAX_LIT, MAX_LIT); 224#ifdef lzf_movsb
189 op += MAX_LIT; 225 ip -= lit;
190 lit = 0; 226 lzf_movsb (op, ip, lit);
191#else 227#else
192 lit = -lit; 228 lit = -lit;
193 do 229 do
194 *op++ = ip[lit]; 230 *op++ = ip[lit];
195 while (++lit); 231 while (++lit);
196#endif 232#endif
197 } 233 }
198 }
199 } 234 }
200 while (ip < in_end);
201 235
202 if (lit) 236 if (lit)
203 { 237 {
204 if (op + lit + 1 >= out_end) 238 if (op + lit + 1 >= out_end)
205 return 0; 239 return 0;
206 240
207 *op++ = lit - 1; 241 *op++ = lit - 1;
242#ifdef lzf_movsb
243 ip -= lit;
244 lzf_movsb (op, ip, lit);
245#else
208 lit = -lit; 246 lit = -lit;
209 do 247 do
210 *op++ = ip[lit]; 248 *op++ = ip[lit];
211 while (++lit); 249 while (++lit);
250#endif
212 } 251 }
213 252
214 return op - (u8 *) out_data; 253 return op - (u8 *) out_data;
215} 254}
255

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines