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.21 by root, Wed Sep 27 15:52:47 2006 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
18#define ULTRA_FAST 0
19
20#include "lzf_c.c" 17#include "lzf_c.c"
21#include "lzf_d.c" 18#include "lzf_d.c"
22 19
23/* we re-use the storable header for our purposes */ 20/* we re-use the storable header for our purposes */
24#define MAGIC_LO 0 21#define MAGIC_LO 0
… …
28#define MAGIC_CR 3 /* storable (reference, freeze), compressed */ 25#define MAGIC_CR 3 /* storable (reference, freeze), compressed */
29#define MAGIC_R 4 /* storable (reference, freeze) */ 26#define MAGIC_R 4 /* storable (reference, freeze) */
30#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */ 27#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */
31#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */ 28#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */
32#define MAGIC_HI 7 /* room for one higher storable major */ 29#define MAGIC_HI 7 /* room for one higher storable major */
30/* for historical reasons, MAGIC_undef + MAGIC_R and MAGIC_undef + MAGIC_R_deref are used, too */
33 31
34#define IN_RANGE(v,l,h) ((unsigned int)((unsigned)(v) - (unsigned)(l)) <= (unsigned)(h) - (unsigned)(l)) 32#define IN_RANGE(v,l,h) ((unsigned int)((unsigned)(v) - (unsigned)(l)) <= (unsigned)(h) - (unsigned)(l))
35 33
36static SV *serializer_package, *serializer_mstore, *serializer_mretrieve; 34static SV *serializer_package, *serializer_mstore, *serializer_mretrieve;
37static CV *storable_mstore, *storable_mretrieve; 35static CV *storable_mstore, *storable_mretrieve;
36
37#if Size_t_size > 4
38# define MAX_LENGTH ((Size_t)0x80000000L)
39#else
40# define MAX_LENGTH ((Size_t) 0x8000000L)
41#endif
38 42
39static SV * 43static SV *
40compress_sv (SV *data, char cprepend, int uprepend) 44compress_sv (SV *data, char cprepend, int uprepend)
41{ 45{
42 STRLEN usize, csize; 46 STRLEN usize, csize;
… …
52 dst = (unsigned char *)SvPVX (ret); 56 dst = (unsigned char *)SvPVX (ret);
53 57
54 if (cprepend) 58 if (cprepend)
55 dst[skip++] = cprepend; 59 dst[skip++] = cprepend;
56 60
57 if (usize < 0x80) 61 if (usize <= 0x7f)
58 { 62 {
59 dst[skip++] = usize; 63 dst[skip++] = usize;
60 } 64 }
61 else if (usize < 0x800) 65 else if (usize <= 0x7ff)
62 { 66 {
63 dst[skip++] = (( usize >> 6) | 0xc0); 67 dst[skip++] = (( usize >> 6) | 0xc0);
64 dst[skip++] = (( usize & 0x3f) | 0x80); 68 dst[skip++] = (( usize & 0x3f) | 0x80);
65 } 69 }
66 else if (usize < 0x10000) 70 else if (usize <= 0xffff)
67 { 71 {
68 dst[skip++] = (( usize >> 12) | 0xe0); 72 dst[skip++] = (( usize >> 12) | 0xe0);
69 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 73 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
70 dst[skip++] = (( usize & 0x3f) | 0x80); 74 dst[skip++] = (( usize & 0x3f) | 0x80);
71 } 75 }
72 else if (usize < 0x200000) 76 else if (usize <= 0x1fffff)
73 { 77 {
74 dst[skip++] = (( usize >> 18) | 0xf0); 78 dst[skip++] = (( usize >> 18) | 0xf0);
75 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 79 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
76 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 80 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
77 dst[skip++] = (( usize & 0x3f) | 0x80); 81 dst[skip++] = (( usize & 0x3f) | 0x80);
78 } 82 }
79 else if (usize < 0x4000000) 83 else if (usize <= 0x3ffffff)
80 { 84 {
81 dst[skip++] = (( usize >> 24) | 0xf8); 85 dst[skip++] = (( usize >> 24) | 0xf8);
82 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80); 86 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80);
83 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 87 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
84 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 88 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
85 dst[skip++] = (( usize & 0x3f) | 0x80); 89 dst[skip++] = (( usize & 0x3f) | 0x80);
86 } 90 }
91 else if (usize <= 0x7fffffff)
92 {
93 dst[skip++] = (( usize >> 30) | 0xfc);
94 dst[skip++] = (((usize >> 24) & 0x3f) | 0x80);
95 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80);
96 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
97 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
98 dst[skip++] = (( usize & 0x3f) | 0x80);
99 }
87 else 100 else
88 croak ("compress can only compress up to %ld bytes", 0x4000000-1); 101 croak ("compress can only compress up to %ld bytes", 0x7fffffffL);
89 102
90 /* 11 bytes is the smallest compressible string */ 103 /* 11 bytes is the smallest compressible string */
91 csize = usize < 11 ? 0 : 104 csize = usize < 11 ? 0 :
92 lzf_compress (src, usize, 105 lzf_compress (src, usize,
93 dst + skip, 106 dst + skip,
… …
130 143
131 csize -= skip; 144 csize -= skip;
132 145
133 if (src[0]) 146 if (src[0])
134 { 147 {
135 if (!(src[0] & 0x80)) 148 if (!(src[0] & 0x80) && csize >= 1)
136 { 149 {
137 csize -= 1; 150 csize -= 1;
138 usize = *src++ & 0xff; 151 usize = *src++ & 0xff;
139 } 152 }
140 else if (!(src[0] & 0x20)) 153 else if (!(src[0] & 0x20) && csize >= 2)
141 { 154 {
142 csize -= 2; 155 csize -= 2;
143 usize = *src++ & 0x1f; 156 usize = *src++ & 0x1f;
144 usize = (usize << 6) | (*src++ & 0x3f); 157 usize = (usize << 6) | (*src++ & 0x3f);
145 } 158 }
146 else if (!(src[0] & 0x10)) 159 else if (!(src[0] & 0x10) && csize >= 3)
147 { 160 {
148 csize -= 3; 161 csize -= 3;
149 usize = *src++ & 0x0f; 162 usize = *src++ & 0x0f;
150 usize = (usize << 6) | (*src++ & 0x3f); 163 usize = (usize << 6) | (*src++ & 0x3f);
151 usize = (usize << 6) | (*src++ & 0x3f); 164 usize = (usize << 6) | (*src++ & 0x3f);
152 } 165 }
153 else if (!(src[0] & 0x08)) 166 else if (!(src[0] & 0x08) && csize >= 4)
154 { 167 {
155 csize -= 4; 168 csize -= 4;
156 usize = *src++ & 0x07; 169 usize = *src++ & 0x07;
157 usize = (usize << 6) | (*src++ & 0x3f); 170 usize = (usize << 6) | (*src++ & 0x3f);
158 usize = (usize << 6) | (*src++ & 0x3f); 171 usize = (usize << 6) | (*src++ & 0x3f);
159 usize = (usize << 6) | (*src++ & 0x3f); 172 usize = (usize << 6) | (*src++ & 0x3f);
160 } 173 }
161 else if (!(src[0] & 0x04)) 174 else if (!(src[0] & 0x04) && csize >= 5)
162 { 175 {
163 csize -= 5; 176 csize -= 5;
164 usize = *src++ & 0x03; 177 usize = *src++ & 0x03;
165 usize = (usize << 6) | (*src++ & 0x3f); 178 usize = (usize << 6) | (*src++ & 0x3f);
166 usize = (usize << 6) | (*src++ & 0x3f); 179 usize = (usize << 6) | (*src++ & 0x3f);
167 usize = (usize << 6) | (*src++ & 0x3f); 180 usize = (usize << 6) | (*src++ & 0x3f);
168 usize = (usize << 6) | (*src++ & 0x3f); 181 usize = (usize << 6) | (*src++ & 0x3f);
169 } 182 }
183 else if (!(src[0] & 0x02) && csize >= 6)
184 {
185 csize -= 6;
186 usize = *src++ & 0x01;
187 usize = (usize << 6) | (*src++ & 0x3f);
188 usize = (usize << 6) | (*src++ & 0x3f);
189 usize = (usize << 6) | (*src++ & 0x3f);
190 usize = (usize << 6) | (*src++ & 0x3f);
191 usize = (usize << 6) | (*src++ & 0x3f);
192 }
170 else 193 else
194 croak ("compressed data corrupted (invalid length)");
195
196 if (!usize)
171 croak ("compressed data corrupted (invalid length)"); 197 croak ("compressed data corrupted (invalid length)");
172 198
173 ret = NEWSV (0, usize); 199 ret = NEWSV (0, usize);
174 SvPOK_only (ret); 200 SvPOK_only (ret);
175 dst = SvPVX (ret); 201 dst = SvPVX (ret);
… …
178 croak ("compressed data corrupted (size mismatch)", csize, skip, usize); 204 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
179 } 205 }
180 else 206 else
181 { 207 {
182 usize = csize - 1; 208 usize = csize - 1;
183 ret = NEWSV (0, usize); 209 ret = NEWSV (0, usize | 1);
184 SvPOK_only (ret); 210 SvPOK_only (ret);
185 211
186 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char); 212 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char);
187 } 213 }
188 214
… …
211 237
212MODULE = Compress::LZF PACKAGE = Compress::LZF 238MODULE = Compress::LZF PACKAGE = Compress::LZF
213 239
214BOOT: 240BOOT:
215 serializer_package = newSVpv ("Storable", 0); 241 serializer_package = newSVpv ("Storable", 0);
216 serializer_mstore = newSVpv ("Storable::mstore", 0); 242 serializer_mstore = newSVpv ("Storable::net_mstore", 0);
217 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0); 243 serializer_mretrieve = newSVpv ("Storable::mretrieve", 0);
218 244
219void 245void
220set_serializer(package, mstore, mretrieve) 246set_serializer(package, mstore, mretrieve)
221 SV * package 247 SV * package
… …
281 307
282 SPAGAIN; 308 SPAGAIN;
283 309
284 sv = POPs; 310 sv = POPs;
285 311
286 if (SvPVX (sv)[0] != MAGIC_R) 312 if (SvPVX (sv)[0] == MAGIC_R)
287 croak ("Storable format changed, need newer version of Compress::LZF"); 313 {
288
289 if (deref) 314 if (deref)
290 SvPVX (sv)[0] = MAGIC_R_deref; 315 SvPVX (sv)[0] = MAGIC_R_deref;
316 }
317 else
318 {
319 char pfx[2];
320
321 pfx[0] = MAGIC_undef;
322 pfx[1] = deref ? MAGIC_R_deref : MAGIC_R;
323
324 sv_insert (sv, 0, 0, pfx, 2);
325 }
291 326
292 if (ix) /* compress */ 327 if (ix) /* compress */
293 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1)); 328 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
294 329
295 XPUSHs (sv); 330 XPUSHs (sv);
… …
310void 345void
311sthaw(sv) 346sthaw(sv)
312 SV * sv 347 SV * sv
313 PROTOTYPE: $ 348 PROTOTYPE: $
314 PPCODE: 349 PPCODE:
315 350{
351 STRLEN svlen;
316 int deref = 0; 352 int deref = 0;
317 353
318 SvGETMAGIC (sv); 354 SvGETMAGIC (sv);
319 if (SvPOK (sv) && IN_RANGE (SvPV_nolen (sv)[0], MAGIC_LO, MAGIC_HI)) 355 if (SvPOK (sv) && IN_RANGE (SvPV (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
320 { 356 {
357 redo:
358
321 switch (SvPVX (sv)[0]) 359 switch (SvPVX (sv)[0])
322 { 360 {
323 case MAGIC_undef: 361 case MAGIC_undef:
362 if (svlen <= 1)
324 XPUSHs (sv_2mortal (NEWSV (0, 0))); 363 XPUSHs (sv_2mortal (NEWSV (0, 0)));
364 else
365 {
366 if (SvPVX (sv)[1] == MAGIC_R_deref)
367 deref = 1;
368 else if (SvPVX (sv)[1] != MAGIC_R)
369 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
370
371 sv_chop (sv, SvPVX (sv) + 2);
372
373 if (!storable_mstore)
374 need_storable ();
375
376 PUSHMARK (SP);
377 XPUSHs (sv);
378 PUTBACK;
379
380 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
381 croak ("Storable::mstore didn't return a single scalar");
382
383 SPAGAIN;
384
385 if (deref)
386 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
387 else
388 SETs (sv_2mortal (newSVsv (TOPs)));
389 }
325 break; 390 break;
326 391
327 case MAGIC_U: 392 case MAGIC_U:
328 XPUSHs (sv_2mortal (decompress_sv (sv, 0))); 393 XPUSHs (sv_2mortal (decompress_sv (sv, 0)));
329 break; 394 break;
… …
342 case MAGIC_CR: 407 case MAGIC_CR:
343 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */ 408 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
344 if (deref) 409 if (deref)
345 if (SvPVX (sv)[0] == MAGIC_R_deref) 410 if (SvPVX (sv)[0] == MAGIC_R_deref)
346 SvPVX (sv)[0] = MAGIC_R; 411 SvPVX (sv)[0] = MAGIC_R;
347 else 412
348 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 413 goto redo;
349 414
350 case MAGIC_R: 415 case MAGIC_R:
351 handle_MAGIC_R: 416 handle_MAGIC_R:
352 if (!storable_mstore) 417 if (!storable_mstore)
353 need_storable (); 418 need_storable ();
… …
377 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 442 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
378 } 443 }
379 } 444 }
380 else 445 else
381 XPUSHs (sv_2mortal (newSVsv (sv))); 446 XPUSHs (sv_2mortal (newSVsv (sv)));
447}
382 448

Diff Legend

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