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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.44 by root, Tue Feb 18 22:12:12 2014 UTC vs.
Revision 1.52 by root, Sun Apr 24 19:31:55 2016 UTC

… …
100#define F_SHRINK 0x00000001UL 100#define F_SHRINK 0x00000001UL
101#define F_ALLOW_UNKNOWN 0x00000002UL 101#define F_ALLOW_UNKNOWN 0x00000002UL
102#define F_ALLOW_SHARING 0x00000004UL 102#define F_ALLOW_SHARING 0x00000004UL
103#define F_ALLOW_CYCLES 0x00000008UL 103#define F_ALLOW_CYCLES 0x00000008UL
104#define F_PACK_STRINGS 0x00000010UL 104#define F_PACK_STRINGS 0x00000010UL
105#define F_UTF8_STRINGS 0x00000020UL
105#define F_VALIDATE_UTF8 0x00000020UL 106#define F_VALIDATE_UTF8 0x00000040UL
106 107
107#define INIT_SIZE 32 // initial scalar size to be allocated 108#define INIT_SIZE 32 // initial scalar size to be allocated
108 109
109#define SB do { 110#define SB do {
110#define SE } while (0) 111#define SE } while (0)
… …
279} 280}
280 281
281ecb_inline void 282ecb_inline void
282encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 283encode_str (enc_t *enc, int utf8, char *str, STRLEN len)
283{ 284{
285 if (ecb_expect_false (enc->cbor.flags & F_UTF8_STRINGS))
286 if (!utf8)
287 {
288 // exceptional path for bytze strings that need to be utf8-encoded
289 STRLEN ulen = len;
290 U8 *p, *pend = (U8 *)str + len;
291
292 for (p = (U8 *)str; p < pend; ++p)
293 ulen += *p >> 7; // count set high bits
294
295 encode_uint (enc, MAJOR_TEXT, ulen);
296
297 need (enc, ulen);
298 for (p = (U8 *)str; p < pend; ++p)
299 if (*p < 0x80)
300 *enc->cur++ = *p;
301 else
302 {
303 *enc->cur++ = 0xc0 + (*p >> 6);
304 *enc->cur++ = 0x80 + (*p & 63);
305 }
306
307 return;
308 }
309
284 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); 310 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
285 need (enc, len); 311 need (enc, len);
286 memcpy (enc->cur, str, len); 312 memcpy (enc->cur, str, len);
287 enc->cur += len; 313 enc->cur += len;
288} 314}
… …
324 350
325 ++enc->depth; 351 ++enc->depth;
326 352
327 encode_uint (enc, MAJOR_ARRAY, len + 1); 353 encode_uint (enc, MAJOR_ARRAY, len + 1);
328 354
355 if (SvMAGICAL (av))
329 for (i = 0; i <= len; ++i) 356 for (i = 0; i <= len; ++i)
330 { 357 {
331 SV **svp = av_fetch (av, i, 0); 358 SV **svp = av_fetch (av, i, 0);
332 encode_sv (enc, svp ? *svp : &PL_sv_undef); 359 encode_sv (enc, svp ? *svp : &PL_sv_undef);
333 } 360 }
361 else
362 for (i = 0; i <= len; ++i)
363 {
364 SV *sv = AvARRAY (av)[i];
365 encode_sv (enc, sv ? sv : &PL_sv_undef);
366 }
334 367
335 --enc->depth; 368 --enc->depth;
336} 369}
337 370
338static void 371static void
… …
442 475
443 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 476 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
444 { 477 {
445 dSP; 478 dSP;
446 479
447 ENTER; SAVETMPS; PUSHMARK (SP); 480 ENTER; SAVETMPS;
481 PUSHMARK (SP);
448 // we re-bless the reference to get overload and other niceties right 482 // we re-bless the reference to get overload and other niceties right
449 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 483 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
450 484
451 PUTBACK; 485 PUTBACK;
452 // G_SCALAR ensures that return value is 1 486 // G_SCALAR ensures that return value is 1
… …
465 } 499 }
466 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 500 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
467 { 501 {
468 dSP; 502 dSP;
469 503
470 ENTER; SAVETMPS; PUSHMARK (SP); 504 ENTER; SAVETMPS;
505 SAVESTACK_POS ();
506 PUSHMARK (SP);
471 EXTEND (SP, 2); 507 EXTEND (SP, 2);
472 // we re-bless the reference to get overload and other niceties right 508 // we re-bless the reference to get overload and other niceties right
473 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 509 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
474 PUSHs (sv_cbor); 510 PUSHs (sv_cbor);
475 511
… …
577} 613}
578 614
579static SV * 615static SV *
580encode_cbor (SV *scalar, CBOR *cbor) 616encode_cbor (SV *scalar, CBOR *cbor)
581{ 617{
582 enc_t enc = { }; 618 enc_t enc = { 0 };
583 619
584 enc.cbor = *cbor; 620 enc.cbor = *cbor;
585 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 621 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
586 enc.cur = SvPVX (enc.sv); 622 enc.cur = SvPVX (enc.sv);
587 enc.end = SvEND (enc.sv); 623 enc.end = SvEND (enc.sv);
… …
742 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) 778 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
743 { 779 {
744 I32 len = decode_uint (dec); 780 I32 len = decode_uint (dec);
745 char *key = (char *)dec->cur; 781 char *key = (char *)dec->cur;
746 782
783 WANT (len);
747 dec->cur += len; 784 dec->cur += len;
748 785
749 hv_store (hv, key, len, decode_sv (dec), 0); 786 hv_store (hv, key, len, decode_sv (dec), 0);
750 787
751 return; 788 return;
752 } 789 }
753 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) 790 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
754 { 791 {
755 I32 len = decode_uint (dec); 792 I32 len = decode_uint (dec);
756 char *key = (char *)dec->cur; 793 char *key = (char *)dec->cur;
757 794
795 WANT (len);
758 dec->cur += len; 796 dec->cur += len;
759 797
760 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) 798 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
761 if (!is_utf8_string (key, len)) 799 if (!is_utf8_string (key, len))
762 ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); 800 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
… …
985 if (!method) 1023 if (!method)
986 ERR ("cannot decode perl-object (package does not have a THAW method)"); 1024 ERR ("cannot decode perl-object (package does not have a THAW method)");
987 1025
988 dSP; 1026 dSP;
989 1027
990 ENTER; SAVETMPS; PUSHMARK (SP); 1028 ENTER; SAVETMPS;
1029 PUSHMARK (SP);
991 EXTEND (SP, len + 1); 1030 EXTEND (SP, len + 1);
992 // we re-bless the reference to get overload and other niceties right 1031 // we re-bless the reference to get overload and other niceties right
993 PUSHs (*av_fetch (av, 0, 1)); 1032 PUSHs (*av_fetch (av, 0, 1));
994 PUSHs (sv_cbor); 1033 PUSHs (sv_cbor);
995 1034
… …
1020 default: 1059 default:
1021 { 1060 {
1022 sv = decode_sv (dec); 1061 sv = decode_sv (dec);
1023 1062
1024 dSP; 1063 dSP;
1025 ENTER; SAVETMPS; PUSHMARK (SP); 1064 ENTER; SAVETMPS;
1065 SAVESTACK_POS ();
1066 PUSHMARK (SP);
1026 EXTEND (SP, 2); 1067 EXTEND (SP, 2);
1027 PUSHs (newSVuv (tag)); 1068 PUSHs (newSVuv (tag));
1028 PUSHs (sv); 1069 PUSHs (sv);
1029 1070
1030 PUTBACK; 1071 PUTBACK;
… …
1156} 1197}
1157 1198
1158static SV * 1199static SV *
1159decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1200decode_cbor (SV *string, CBOR *cbor, char **offset_return)
1160{ 1201{
1161 dec_t dec = { }; 1202 dec_t dec = { 0 };
1162 SV *sv; 1203 SV *sv;
1163 STRLEN len; 1204 STRLEN len;
1164 char *data = SvPVbyte (string, len); 1205 char *data = SvPVbyte (string, len);
1165 1206
1166 if (len > cbor->max_size && cbor->max_size) 1207 if (len > cbor->max_size && cbor->max_size)
… …
1257 1298
1258 int major = *p >> MAJOR_SHIFT; 1299 int major = *p >> MAJOR_SHIFT;
1259 1300
1260 switch (major) 1301 switch (major)
1261 { 1302 {
1303 case MAJOR_TAG >> MAJOR_SHIFT:
1304 ++count; // tags merely prefix another value
1305 break;
1306
1262 case MAJOR_BYTES >> MAJOR_SHIFT: 1307 case MAJOR_BYTES >> MAJOR_SHIFT:
1263 case MAJOR_TEXT >> MAJOR_SHIFT: 1308 case MAJOR_TEXT >> MAJOR_SHIFT:
1264 case MAJOR_ARRAY >> MAJOR_SHIFT: 1309 case MAJOR_ARRAY >> MAJOR_SHIFT:
1265 case MAJOR_MAP >> MAJOR_SHIFT: 1310 case MAJOR_MAP >> MAJOR_SHIFT:
1266 { 1311 {
… …
1371 shrink = F_SHRINK 1416 shrink = F_SHRINK
1372 allow_unknown = F_ALLOW_UNKNOWN 1417 allow_unknown = F_ALLOW_UNKNOWN
1373 allow_sharing = F_ALLOW_SHARING 1418 allow_sharing = F_ALLOW_SHARING
1374 allow_cycles = F_ALLOW_CYCLES 1419 allow_cycles = F_ALLOW_CYCLES
1375 pack_strings = F_PACK_STRINGS 1420 pack_strings = F_PACK_STRINGS
1421 utf8_strings = F_UTF8_STRINGS
1376 validate_utf8 = F_VALIDATE_UTF8 1422 validate_utf8 = F_VALIDATE_UTF8
1377 PPCODE: 1423 PPCODE:
1378{ 1424{
1379 if (enable) 1425 if (enable)
1380 self->flags |= ix; 1426 self->flags |= ix;

Diff Legend

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