ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Compress-LZF/LZF.xs
(Generate patch)

Comparing Compress-LZF/LZF.xs (file contents):
Revision 1.18 by pcg, Tue Aug 3 15:04:05 2004 UTC vs.
Revision 1.23 by root, Fri Feb 16 22:11:17 2007 UTC

… …
12#endif 12#endif
13#if PATCHLEVEL < 6 13#if PATCHLEVEL < 6
14# define call_sv perl_call_sv 14# define call_sv perl_call_sv
15#endif 15#endif
16 16
17#define HLOG 15 17#define LZF_STANDALONE 1
18#define ULTRA_FAST 0 18#define LZF_STATE_ARG 1
19 19
20#include "lzf_c.c" 20#include "lzf_c.c"
21#include "lzf_d.c" 21#include "lzf_d.c"
22 22
23/* we re-use the storable header for our purposes */ 23/* we re-use the storable header for our purposes */
… …
28#define MAGIC_CR 3 /* storable (reference, freeze), compressed */ 28#define MAGIC_CR 3 /* storable (reference, freeze), compressed */
29#define MAGIC_R 4 /* storable (reference, freeze) */ 29#define MAGIC_R 4 /* storable (reference, freeze) */
30#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */ 30#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */
31#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */ 31#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */
32#define MAGIC_HI 7 /* room for one higher storable major */ 32#define MAGIC_HI 7 /* room for one higher storable major */
33/* for historical reasons, MAGIC_undef + MAGIC_R and MAGIC_undef + MAGIC_R_deref are used, too */
33 34
34#define IN_RANGE(v,l,h) ((unsigned int)((unsigned)(v) - (unsigned)(l)) <= (unsigned)(h) - (unsigned)(l)) 35#define IN_RANGE(v,l,h) ((unsigned int)((unsigned)(v) - (unsigned)(l)) <= (unsigned)(h) - (unsigned)(l))
35 36
36static SV *serializer_package, *serializer_mstore, *serializer_mretrieve; 37static SV *serializer_package, *serializer_mstore, *serializer_mretrieve;
37static CV *storable_mstore, *storable_mretrieve; 38static CV *storable_mstore, *storable_mretrieve;
39
40#if Size_t_size > 4
41# define MAX_LENGTH ((Size_t)0x80000000L)
42#else
43# define MAX_LENGTH ((Size_t) 0x8000000L)
44#endif
38 45
39static SV * 46static SV *
40compress_sv (SV *data, char cprepend, int uprepend) 47compress_sv (SV *data, char cprepend, int uprepend)
41{ 48{
49 LZF_STATE *state;
42 STRLEN usize, csize; 50 STRLEN usize, csize;
43 char *src = (char *)SvPV (data, usize); 51 char *src = (char *)SvPV (data, usize);
44 52
45 if (usize) 53 if (usize)
46 { 54 {
… …
52 dst = (unsigned char *)SvPVX (ret); 60 dst = (unsigned char *)SvPVX (ret);
53 61
54 if (cprepend) 62 if (cprepend)
55 dst[skip++] = cprepend; 63 dst[skip++] = cprepend;
56 64
57 if (usize < 0x80) 65 if (usize <= 0x7f)
58 { 66 {
59 dst[skip++] = usize; 67 dst[skip++] = usize;
60 } 68 }
61 else if (usize < 0x800) 69 else if (usize <= 0x7ff)
62 { 70 {
63 dst[skip++] = (( usize >> 6) | 0xc0); 71 dst[skip++] = (( usize >> 6) | 0xc0);
64 dst[skip++] = (( usize & 0x3f) | 0x80); 72 dst[skip++] = (( usize & 0x3f) | 0x80);
65 } 73 }
66 else if (usize < 0x10000) 74 else if (usize <= 0xffff)
67 { 75 {
68 dst[skip++] = (( usize >> 12) | 0xe0); 76 dst[skip++] = (( usize >> 12) | 0xe0);
69 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 77 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
70 dst[skip++] = (( usize & 0x3f) | 0x80); 78 dst[skip++] = (( usize & 0x3f) | 0x80);
71 } 79 }
72 else if (usize < 0x200000) 80 else if (usize <= 0x1fffff)
73 { 81 {
74 dst[skip++] = (( usize >> 18) | 0xf0); 82 dst[skip++] = (( usize >> 18) | 0xf0);
75 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 83 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
76 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 84 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
77 dst[skip++] = (( usize & 0x3f) | 0x80); 85 dst[skip++] = (( usize & 0x3f) | 0x80);
78 } 86 }
79 else if (usize < 0x4000000) 87 else if (usize <= 0x3ffffff)
80 { 88 {
81 dst[skip++] = (( usize >> 24) | 0xf8); 89 dst[skip++] = (( usize >> 24) | 0xf8);
82 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80); 90 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80);
83 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 91 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
84 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 92 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
85 dst[skip++] = (( usize & 0x3f) | 0x80); 93 dst[skip++] = (( usize & 0x3f) | 0x80);
86 } 94 }
95 else if (usize <= 0x7fffffff)
96 {
97 dst[skip++] = (( usize >> 30) | 0xfc);
98 dst[skip++] = (((usize >> 24) & 0x3f) | 0x80);
99 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80);
100 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
101 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
102 dst[skip++] = (( usize & 0x3f) | 0x80);
103 }
87 else 104 else
88 croak ("compress can only compress up to %ld bytes", 0x4000000-1); 105 croak ("compress can only compress up to %ld bytes", 0x7fffffffL);
106
107 New (0, state, 1, LZF_STATE);
108 if (!state)
109 croak ("Compress::LZF unable to allocate memory for compression state");
89 110
90 /* 11 bytes is the smallest compressible string */ 111 /* 11 bytes is the smallest compressible string */
91 csize = usize < 11 ? 0 : 112 csize = usize < 11 ? 0 :
92 lzf_compress (src, usize, 113 lzf_compress (src, usize, dst + skip, usize - skip, *state);
93 dst + skip, 114
94 usize - skip); 115 Safefree (state);
95 116
96 if (csize) 117 if (csize)
97 { 118 {
98 SvCUR_set (ret, csize + skip); 119 SvCUR_set (ret, csize + skip);
99 } 120 }
… …
130 151
131 csize -= skip; 152 csize -= skip;
132 153
133 if (src[0]) 154 if (src[0])
134 { 155 {
135 if (!(src[0] & 0x80)) 156 if (!(src[0] & 0x80) && csize >= 1)
136 { 157 {
137 csize -= 1; 158 csize -= 1;
138 usize = *src++ & 0xff; 159 usize = *src++ & 0xff;
139 } 160 }
140 else if (!(src[0] & 0x20)) 161 else if (!(src[0] & 0x20) && csize >= 2)
141 { 162 {
142 csize -= 2; 163 csize -= 2;
143 usize = *src++ & 0x1f; 164 usize = *src++ & 0x1f;
144 usize = (usize << 6) | (*src++ & 0x3f); 165 usize = (usize << 6) | (*src++ & 0x3f);
145 } 166 }
146 else if (!(src[0] & 0x10)) 167 else if (!(src[0] & 0x10) && csize >= 3)
147 { 168 {
148 csize -= 3; 169 csize -= 3;
149 usize = *src++ & 0x0f; 170 usize = *src++ & 0x0f;
150 usize = (usize << 6) | (*src++ & 0x3f); 171 usize = (usize << 6) | (*src++ & 0x3f);
151 usize = (usize << 6) | (*src++ & 0x3f); 172 usize = (usize << 6) | (*src++ & 0x3f);
152 } 173 }
153 else if (!(src[0] & 0x08)) 174 else if (!(src[0] & 0x08) && csize >= 4)
154 { 175 {
155 csize -= 4; 176 csize -= 4;
156 usize = *src++ & 0x07; 177 usize = *src++ & 0x07;
157 usize = (usize << 6) | (*src++ & 0x3f); 178 usize = (usize << 6) | (*src++ & 0x3f);
158 usize = (usize << 6) | (*src++ & 0x3f); 179 usize = (usize << 6) | (*src++ & 0x3f);
159 usize = (usize << 6) | (*src++ & 0x3f); 180 usize = (usize << 6) | (*src++ & 0x3f);
160 } 181 }
161 else if (!(src[0] & 0x04)) 182 else if (!(src[0] & 0x04) && csize >= 5)
162 { 183 {
163 csize -= 5; 184 csize -= 5;
164 usize = *src++ & 0x03; 185 usize = *src++ & 0x03;
165 usize = (usize << 6) | (*src++ & 0x3f); 186 usize = (usize << 6) | (*src++ & 0x3f);
166 usize = (usize << 6) | (*src++ & 0x3f); 187 usize = (usize << 6) | (*src++ & 0x3f);
167 usize = (usize << 6) | (*src++ & 0x3f); 188 usize = (usize << 6) | (*src++ & 0x3f);
168 usize = (usize << 6) | (*src++ & 0x3f); 189 usize = (usize << 6) | (*src++ & 0x3f);
169 } 190 }
191 else if (!(src[0] & 0x02) && csize >= 6)
192 {
193 csize -= 6;
194 usize = *src++ & 0x01;
195 usize = (usize << 6) | (*src++ & 0x3f);
196 usize = (usize << 6) | (*src++ & 0x3f);
197 usize = (usize << 6) | (*src++ & 0x3f);
198 usize = (usize << 6) | (*src++ & 0x3f);
199 usize = (usize << 6) | (*src++ & 0x3f);
200 }
170 else 201 else
202 croak ("compressed data corrupted (invalid length)");
203
204 if (!usize)
171 croak ("compressed data corrupted (invalid length)"); 205 croak ("compressed data corrupted (invalid length)");
172 206
173 ret = NEWSV (0, usize); 207 ret = NEWSV (0, usize);
174 SvPOK_only (ret); 208 SvPOK_only (ret);
175 dst = SvPVX (ret); 209 dst = SvPVX (ret);
176 210
177 if (lzf_decompress (src, csize, dst, usize) != usize) 211 if (lzf_decompress (src, csize, dst, usize) != usize)
212 {
213 SvREFCNT_dec (ret);
178 croak ("compressed data corrupted (size mismatch)", csize, skip, usize); 214 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
215 }
179 } 216 }
180 else 217 else
181 { 218 {
182 usize = csize - 1; 219 usize = csize - 1;
183 ret = NEWSV (0, usize); 220 ret = NEWSV (0, usize | 1);
184 SvPOK_only (ret); 221 SvPOK_only (ret);
185 222
186 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char); 223 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char);
187 } 224 }
188 225
… …
211 248
212MODULE = Compress::LZF PACKAGE = Compress::LZF 249MODULE = Compress::LZF PACKAGE = Compress::LZF
213 250
214BOOT: 251BOOT:
215 serializer_package = newSVpv ("Storable", 0); 252 serializer_package = newSVpv ("Storable", 0);
216 serializer_mstore = newSVpv ("Storable::mstore", 0); 253 serializer_mstore = newSVpv ("Storable::net_mstore", 0);
217 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0); 254 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0);
218 255
219void 256void
220set_serializer(package, mstore, mretrieve) 257set_serializer(package, mstore, mretrieve)
221 SV * package 258 SV * package
… …
281 318
282 SPAGAIN; 319 SPAGAIN;
283 320
284 sv = POPs; 321 sv = POPs;
285 322
286 if (SvPVX (sv)[0] != MAGIC_R) 323 if (SvPVX (sv)[0] == MAGIC_R)
287 croak ("Storable format changed, need newer version of Compress::LZF"); 324 {
288
289 if (deref) 325 if (deref)
290 SvPVX (sv)[0] = MAGIC_R_deref; 326 SvPVX (sv)[0] = MAGIC_R_deref;
327 }
328 else
329 {
330 char pfx[2];
331
332 pfx[0] = MAGIC_undef;
333 pfx[1] = deref ? MAGIC_R_deref : MAGIC_R;
334
335 sv_insert (sv, 0, 0, pfx, 2);
336 }
291 337
292 if (ix) /* compress */ 338 if (ix) /* compress */
293 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1)); 339 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
294 340
295 XPUSHs (sv); 341 XPUSHs (sv);
… …
310void 356void
311sthaw(sv) 357sthaw(sv)
312 SV * sv 358 SV * sv
313 PROTOTYPE: $ 359 PROTOTYPE: $
314 PPCODE: 360 PPCODE:
315 361{
362 STRLEN svlen;
316 int deref = 0; 363 int deref = 0;
317 364
318 SvGETMAGIC (sv); 365 SvGETMAGIC (sv);
319 if (SvPOK (sv) && IN_RANGE (SvPV_nolen (sv)[0], MAGIC_LO, MAGIC_HI)) 366 if (SvPOK (sv) && IN_RANGE (SvPV (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
320 { 367 {
368 redo:
369
321 switch (SvPVX (sv)[0]) 370 switch (SvPVX (sv)[0])
322 { 371 {
323 case MAGIC_undef: 372 case MAGIC_undef:
373 if (svlen <= 1)
324 XPUSHs (sv_2mortal (NEWSV (0, 0))); 374 XPUSHs (sv_2mortal (NEWSV (0, 0)));
375 else
376 {
377 if (SvPVX (sv)[1] == MAGIC_R_deref)
378 deref = 1;
379 else if (SvPVX (sv)[1] != MAGIC_R)
380 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
381
382 sv_chop (sv, SvPVX (sv) + 2);
383
384 if (!storable_mstore)
385 need_storable ();
386
387 PUSHMARK (SP);
388 XPUSHs (sv);
389 PUTBACK;
390
391 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
392 croak ("Storable::mstore didn't return a single scalar");
393
394 SPAGAIN;
395
396 if (deref)
397 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
398 else
399 SETs (sv_2mortal (newSVsv (TOPs)));
400 }
325 break; 401 break;
326 402
327 case MAGIC_U: 403 case MAGIC_U:
328 XPUSHs (sv_2mortal (decompress_sv (sv, 0))); 404 XPUSHs (sv_2mortal (decompress_sv (sv, 0)));
329 break; 405 break;
… …
342 case MAGIC_CR: 418 case MAGIC_CR:
343 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */ 419 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
344 if (deref) 420 if (deref)
345 if (SvPVX (sv)[0] == MAGIC_R_deref) 421 if (SvPVX (sv)[0] == MAGIC_R_deref)
346 SvPVX (sv)[0] = MAGIC_R; 422 SvPVX (sv)[0] = MAGIC_R;
347 else 423
348 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 424 goto redo;
349 425
350 case MAGIC_R: 426 case MAGIC_R:
351 handle_MAGIC_R: 427 handle_MAGIC_R:
352 if (!storable_mstore) 428 if (!storable_mstore)
353 need_storable (); 429 need_storable ();
… …
377 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 453 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
378 } 454 }
379 } 455 }
380 else 456 else
381 XPUSHs (sv_2mortal (newSVsv (sv))); 457 XPUSHs (sv_2mortal (newSVsv (sv)));
458}
382 459

Diff Legend

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