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.17 by pcg, Mon May 3 18:25:44 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 LZF_STANDALONE 1
18#define LZF_STATE_ARG 1
19
17#include "lzf_c.c" 20#include "lzf_c.c"
18#include "lzf_d.c" 21#include "lzf_d.c"
19 22
20/* we re-use the storable header for our purposes */ 23/* we re-use the storable header for our purposes */
21#define MAGIC_LO 0 24#define MAGIC_LO 0
… …
25#define MAGIC_CR 3 /* storable (reference, freeze), compressed */ 28#define MAGIC_CR 3 /* storable (reference, freeze), compressed */
26#define MAGIC_R 4 /* storable (reference, freeze) */ 29#define MAGIC_R 4 /* storable (reference, freeze) */
27#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */ 30#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */
28#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */ 31#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */
29#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 */
30 34
31#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))
32 36
33static SV *serializer_package, *serializer_mstore, *serializer_mretrieve; 37static SV *serializer_package, *serializer_mstore, *serializer_mretrieve;
34static 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
35 45
36static SV * 46static SV *
37compress_sv (SV *data, char cprepend, int uprepend) 47compress_sv (SV *data, char cprepend, int uprepend)
38{ 48{
49 LZF_STATE *state;
39 STRLEN usize, csize; 50 STRLEN usize, csize;
40 char *src = (char *)SvPV (data, usize); 51 char *src = (char *)SvPV (data, usize);
41 52
42 if (usize) 53 if (usize)
43 { 54 {
… …
49 dst = (unsigned char *)SvPVX (ret); 60 dst = (unsigned char *)SvPVX (ret);
50 61
51 if (cprepend) 62 if (cprepend)
52 dst[skip++] = cprepend; 63 dst[skip++] = cprepend;
53 64
54 if (usize < 0x80) 65 if (usize <= 0x7f)
55 { 66 {
56 dst[skip++] = usize; 67 dst[skip++] = usize;
57 } 68 }
58 else if (usize < 0x800) 69 else if (usize <= 0x7ff)
59 { 70 {
60 dst[skip++] = (( usize >> 6) | 0xc0); 71 dst[skip++] = (( usize >> 6) | 0xc0);
61 dst[skip++] = (( usize & 0x3f) | 0x80); 72 dst[skip++] = (( usize & 0x3f) | 0x80);
62 } 73 }
63 else if (usize < 0x10000) 74 else if (usize <= 0xffff)
64 { 75 {
65 dst[skip++] = (( usize >> 12) | 0xe0); 76 dst[skip++] = (( usize >> 12) | 0xe0);
66 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 77 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
67 dst[skip++] = (( usize & 0x3f) | 0x80); 78 dst[skip++] = (( usize & 0x3f) | 0x80);
68 } 79 }
69 else if (usize < 0x200000) 80 else if (usize <= 0x1fffff)
70 { 81 {
71 dst[skip++] = (( usize >> 18) | 0xf0); 82 dst[skip++] = (( usize >> 18) | 0xf0);
72 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 83 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
73 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 84 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
74 dst[skip++] = (( usize & 0x3f) | 0x80); 85 dst[skip++] = (( usize & 0x3f) | 0x80);
75 } 86 }
76 else if (usize < 0x4000000) 87 else if (usize <= 0x3ffffff)
77 { 88 {
78 dst[skip++] = (( usize >> 24) | 0xf8); 89 dst[skip++] = (( usize >> 24) | 0xf8);
79 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80); 90 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80);
80 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 91 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
81 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 92 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
82 dst[skip++] = (( usize & 0x3f) | 0x80); 93 dst[skip++] = (( usize & 0x3f) | 0x80);
83 } 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 }
84 else 104 else
85 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");
86 110
87 /* 11 bytes is the smallest compressible string */ 111 /* 11 bytes is the smallest compressible string */
88 csize = usize < 11 ? 0 : 112 csize = usize < 11 ? 0 :
89 lzf_compress (src, usize, 113 lzf_compress (src, usize, dst + skip, usize - skip, *state);
90 dst + skip, 114
91 usize - skip); 115 Safefree (state);
92 116
93 if (csize) 117 if (csize)
94 { 118 {
95 SvCUR_set (ret, csize + skip); 119 SvCUR_set (ret, csize + skip);
96 } 120 }
… …
127 151
128 csize -= skip; 152 csize -= skip;
129 153
130 if (src[0]) 154 if (src[0])
131 { 155 {
132 if (!(src[0] & 0x80)) 156 if (!(src[0] & 0x80) && csize >= 1)
133 { 157 {
134 csize -= 1; 158 csize -= 1;
135 usize = *src++ & 0xff; 159 usize = *src++ & 0xff;
136 } 160 }
137 else if (!(src[0] & 0x20)) 161 else if (!(src[0] & 0x20) && csize >= 2)
138 { 162 {
139 csize -= 2; 163 csize -= 2;
140 usize = *src++ & 0x1f; 164 usize = *src++ & 0x1f;
141 usize = (usize << 6) | (*src++ & 0x3f); 165 usize = (usize << 6) | (*src++ & 0x3f);
142 } 166 }
143 else if (!(src[0] & 0x10)) 167 else if (!(src[0] & 0x10) && csize >= 3)
144 { 168 {
145 csize -= 3; 169 csize -= 3;
146 usize = *src++ & 0x0f; 170 usize = *src++ & 0x0f;
147 usize = (usize << 6) | (*src++ & 0x3f); 171 usize = (usize << 6) | (*src++ & 0x3f);
148 usize = (usize << 6) | (*src++ & 0x3f); 172 usize = (usize << 6) | (*src++ & 0x3f);
149 } 173 }
150 else if (!(src[0] & 0x08)) 174 else if (!(src[0] & 0x08) && csize >= 4)
151 { 175 {
152 csize -= 4; 176 csize -= 4;
153 usize = *src++ & 0x07; 177 usize = *src++ & 0x07;
154 usize = (usize << 6) | (*src++ & 0x3f); 178 usize = (usize << 6) | (*src++ & 0x3f);
155 usize = (usize << 6) | (*src++ & 0x3f); 179 usize = (usize << 6) | (*src++ & 0x3f);
156 usize = (usize << 6) | (*src++ & 0x3f); 180 usize = (usize << 6) | (*src++ & 0x3f);
157 } 181 }
158 else if (!(src[0] & 0x04)) 182 else if (!(src[0] & 0x04) && csize >= 5)
159 { 183 {
160 csize -= 5; 184 csize -= 5;
161 usize = *src++ & 0x03; 185 usize = *src++ & 0x03;
162 usize = (usize << 6) | (*src++ & 0x3f); 186 usize = (usize << 6) | (*src++ & 0x3f);
163 usize = (usize << 6) | (*src++ & 0x3f); 187 usize = (usize << 6) | (*src++ & 0x3f);
164 usize = (usize << 6) | (*src++ & 0x3f); 188 usize = (usize << 6) | (*src++ & 0x3f);
165 usize = (usize << 6) | (*src++ & 0x3f); 189 usize = (usize << 6) | (*src++ & 0x3f);
166 } 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 }
167 else 201 else
202 croak ("compressed data corrupted (invalid length)");
203
204 if (!usize)
168 croak ("compressed data corrupted (invalid length)"); 205 croak ("compressed data corrupted (invalid length)");
169 206
170 ret = NEWSV (0, usize); 207 ret = NEWSV (0, usize);
171 SvPOK_only (ret); 208 SvPOK_only (ret);
172 dst = SvPVX (ret); 209 dst = SvPVX (ret);
173 210
174 if (lzf_decompress (src, csize, dst, usize) != usize) 211 if (lzf_decompress (src, csize, dst, usize) != usize)
212 {
213 SvREFCNT_dec (ret);
175 croak ("compressed data corrupted (size mismatch)", csize, skip, usize); 214 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
215 }
176 } 216 }
177 else 217 else
178 { 218 {
179 usize = csize - 1; 219 usize = csize - 1;
180 ret = NEWSV (0, usize); 220 ret = NEWSV (0, usize | 1);
181 SvPOK_only (ret); 221 SvPOK_only (ret);
182 222
183 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char); 223 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char);
184 } 224 }
185 225
… …
208 248
209MODULE = Compress::LZF PACKAGE = Compress::LZF 249MODULE = Compress::LZF PACKAGE = Compress::LZF
210 250
211BOOT: 251BOOT:
212 serializer_package = newSVpv ("Storable", 0); 252 serializer_package = newSVpv ("Storable", 0);
213 serializer_mstore = newSVpv ("Storable::mstore", 0); 253 serializer_mstore = newSVpv ("Storable::net_mstore", 0);
214 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0); 254 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0);
215 255
216void 256void
217set_serializer(package, mstore, mretrieve) 257set_serializer(package, mstore, mretrieve)
218 SV * package 258 SV * package
… …
278 318
279 SPAGAIN; 319 SPAGAIN;
280 320
281 sv = POPs; 321 sv = POPs;
282 322
283 if (SvPVX (sv)[0] != MAGIC_R) 323 if (SvPVX (sv)[0] == MAGIC_R)
284 croak ("Storable format changed, need newer version of Compress::LZF"); 324 {
285
286 if (deref) 325 if (deref)
287 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 }
288 337
289 if (ix) /* compress */ 338 if (ix) /* compress */
290 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));
291 340
292 XPUSHs (sv); 341 XPUSHs (sv);
… …
307void 356void
308sthaw(sv) 357sthaw(sv)
309 SV * sv 358 SV * sv
310 PROTOTYPE: $ 359 PROTOTYPE: $
311 PPCODE: 360 PPCODE:
312 361{
362 STRLEN svlen;
313 int deref = 0; 363 int deref = 0;
314 364
315 SvGETMAGIC (sv); 365 SvGETMAGIC (sv);
316 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))
317 { 367 {
368 redo:
369
318 switch (SvPVX (sv)[0]) 370 switch (SvPVX (sv)[0])
319 { 371 {
320 case MAGIC_undef: 372 case MAGIC_undef:
373 if (svlen <= 1)
321 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 }
322 break; 401 break;
323 402
324 case MAGIC_U: 403 case MAGIC_U:
325 XPUSHs (sv_2mortal (decompress_sv (sv, 0))); 404 XPUSHs (sv_2mortal (decompress_sv (sv, 0)));
326 break; 405 break;
… …
339 case MAGIC_CR: 418 case MAGIC_CR:
340 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */ 419 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
341 if (deref) 420 if (deref)
342 if (SvPVX (sv)[0] == MAGIC_R_deref) 421 if (SvPVX (sv)[0] == MAGIC_R_deref)
343 SvPVX (sv)[0] = MAGIC_R; 422 SvPVX (sv)[0] = MAGIC_R;
344 else 423
345 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 424 goto redo;
346 425
347 case MAGIC_R: 426 case MAGIC_R:
348 handle_MAGIC_R: 427 handle_MAGIC_R:
349 if (!storable_mstore) 428 if (!storable_mstore)
350 need_storable (); 429 need_storable ();
… …
374 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?");
375 } 454 }
376 } 455 }
377 else 456 else
378 XPUSHs (sv_2mortal (newSVsv (sv))); 457 XPUSHs (sv_2mortal (newSVsv (sv)));
458}
379 459

Diff Legend

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