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.64 by root, Tue Jun 27 02:03:24 2017 UTC vs.
Revision 1.66 by root, Sun Nov 29 21:32:01 2020 UTC

… …
99 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8 99 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
100 100
101 CBOR_TAG_MAGIC = 55799, // self-describe cbor 101 CBOR_TAG_MAGIC = 55799, // self-describe cbor
102}; 102};
103 103
104// known forced types, also hardcoded in CBOR.pm
105enum
106{
107 AS_CBOR = 0,
108 AS_BYTES = 1,
109 AS_TEXT = 2,
110 AS_FLOAT16 = 3,
111 AS_FLOAT32 = 4,
112 AS_FLOAT64 = 5,
113 // possibly future enhancements: float, integer
114};
115
104#define F_SHRINK 0x00000001UL 116#define F_SHRINK 0x00000001UL
105#define F_ALLOW_UNKNOWN 0x00000002UL 117#define F_ALLOW_UNKNOWN 0x00000002UL
106#define F_ALLOW_SHARING 0x00000004UL 118#define F_ALLOW_SHARING 0x00000004UL
107#define F_ALLOW_CYCLES 0x00000008UL 119#define F_ALLOW_CYCLES 0x00000008UL
108#define F_FORBID_OBJECTS 0x00000010UL 120#define F_FORBID_OBJECTS 0x00000010UL
… …
233{ 245{
234 need (enc, 1); 246 need (enc, 1);
235 *enc->cur++ = ch; 247 *enc->cur++ = ch;
236} 248}
237 249
250// used for tags, intregers, element counts and so on
238static void 251static void
239encode_uint (enc_t *enc, int major, UV len) 252encode_uint (enc_t *enc, int major, UV len)
240{ 253{
241 need (enc, 9); 254 need (enc, 9);
242 255
… …
273 *enc->cur++ = len >> 8; 286 *enc->cur++ = len >> 8;
274 *enc->cur++ = len; 287 *enc->cur++ = len;
275 } 288 }
276} 289}
277 290
291// encodes a perl value into a CBOR integer
292ecb_inline
293encode_int (enc_t *enc, SV *sv)
294{
295 if (SvIsUV (sv))
296 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
297 else if (SvIVX (sv) >= 0)
298 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
299 else
300 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
301}
302
278ecb_inline void 303ecb_inline void
279encode_tag (enc_t *enc, UV tag) 304encode_tag (enc_t *enc, UV tag)
280{ 305{
281 encode_uint (enc, MAJOR_TAG, tag); 306 encode_uint (enc, MAJOR_TAG, tag);
282} 307}
… …
341 ++enc->stringref_idx; 366 ++enc->stringref_idx;
342 } 367 }
343 } 368 }
344 369
345 encode_str (enc, upgrade_utf8, utf8, str, len); 370 encode_str (enc, upgrade_utf8, utf8, str, len);
371}
372
373ecb_inline void
374encode_float16 (enc_t *enc, NV nv)
375{
376 need (enc, 1+2);
377
378 *enc->cur++ = MAJOR_MISC | MISC_FLOAT16;
379
380 uint16_t fp = ecb_float_to_binary16 (nv);
381
382 if (!ecb_big_endian ())
383 fp = ecb_bswap16 (fp);
384
385 memcpy (enc->cur, &fp, 2);
386 enc->cur += 2;
387}
388
389ecb_inline void
390encode_float32 (enc_t *enc, NV nv)
391{
392 need (enc, 1+4);
393
394 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
395
396 uint32_t fp = ecb_float_to_binary32 (nv);
397
398 if (!ecb_big_endian ())
399 fp = ecb_bswap32 (fp);
400
401 memcpy (enc->cur, &fp, 4);
402 enc->cur += 4;
403}
404
405ecb_inline void
406encode_float64 (enc_t *enc, NV nv)
407{
408 need (enc, 1+8);
409
410 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
411
412 uint64_t fp = ecb_double_to_binary64 (nv);
413
414 if (!ecb_big_endian ())
415 fp = ecb_bswap64 (fp);
416
417 memcpy (enc->cur, &fp, 8);
418 enc->cur += 8;
419}
420
421ecb_inline void
422encode_forced (enc_t *enc, UV type, SV *sv)
423{
424 switch (type)
425 {
426 case AS_CBOR:
427 {
428 STRLEN len;
429 char *str = SvPVbyte (sv, len);
430
431 need (enc, len);
432 memcpy (enc->cur, str, len);
433 enc->cur += len;
434 }
435 break;
436
437 case AS_BYTES:
438 {
439 STRLEN len;
440 char *str = SvPVbyte (sv, len);
441 encode_strref (enc, 0, 0, str, len);
442 }
443 break;
444
445 case AS_TEXT:
446 {
447 STRLEN len;
448 char *str = SvPVutf8 (sv, len);
449 encode_strref (enc, 1, 1, str, len);
450 }
451 break;
452
453 case AS_FLOAT16: encode_float16 (enc, SvNV (sv)); break;
454 case AS_FLOAT32: encode_float32 (enc, SvNV (sv)); break;
455 case AS_FLOAT64: encode_float64 (enc, SvNV (sv)); break;
456
457 default:
458 croak ("encountered malformed CBOR::XS::Tagged object");
459 }
346} 460}
347 461
348static void encode_sv (enc_t *enc, SV *sv); 462static void encode_sv (enc_t *enc, SV *sv);
349 463
350static void 464static void
… …
444 else if (stash == tagged_stash) 558 else if (stash == tagged_stash)
445 { 559 {
446 if (svt != SVt_PVAV) 560 if (svt != SVt_PVAV)
447 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 561 croak ("encountered CBOR::XS::Tagged object that isn't an array");
448 562
563 switch (av_len ((AV *)sv))
564 {
565 case 2-1:
566 // actually a tagged value
449 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1))); 567 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
450 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); 568 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
569 break;
570
571 case 3-1:
572 // a forced type [value, type, undef]
573 encode_forced (enc, SvUV (*av_fetch ((AV *)sv, 1, 1)), *av_fetch ((AV *)sv, 0, 1));
574 break;
575
576 default:
577 croak ("encountered malformed CBOR::XS::Tagged object");
578 }
451 579
452 return; 580 return;
453 } 581 }
454 } 582 }
455 583
… …
510 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 638 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
511 { 639 {
512 dSP; 640 dSP;
513 641
514 ENTER; SAVETMPS; 642 ENTER; SAVETMPS;
515 SAVESTACK_POS ();
516 PUSHMARK (SP); 643 PUSHMARK (SP);
517 EXTEND (SP, 2); 644 EXTEND (SP, 2);
518 // we re-bless the reference to get overload and other niceties right 645 // we re-bless the reference to get overload and other niceties right
519 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 646 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
520 PUSHs (sv_cbor); 647 PUSHs (sv_cbor);
… …
529 656
530 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 657 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
531 encode_uint (enc, MAJOR_ARRAY, count + 1); 658 encode_uint (enc, MAJOR_ARRAY, count + 1);
532 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 659 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
533 660
534 while (count) 661 {
662 int i;
663
664 for (i = 0; i < count; ++i)
535 encode_sv (enc, SP[1 - count--]); 665 encode_sv (enc, SP[i + 1 - count]);
666
667 SP -= count;
668 }
536 669
537 PUTBACK; 670 PUTBACK;
538 671
539 FREETMPS; LEAVE; 672 FREETMPS; LEAVE;
540 } 673 }
… …
562 695
563 if (ecb_expect_false (nv == (NV)(U32)nv)) 696 if (ecb_expect_false (nv == (NV)(U32)nv))
564 encode_uint (enc, MAJOR_POS_INT, (U32)nv); 697 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
565 //TODO: maybe I32? 698 //TODO: maybe I32?
566 else if (ecb_expect_false (nv == (float)nv)) 699 else if (ecb_expect_false (nv == (float)nv))
567 { 700 encode_float32 (enc, nv);
568 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
569
570 uint32_t fp = ecb_float_to_binary32 (nv);
571
572 if (!ecb_big_endian ())
573 fp = ecb_bswap32 (fp);
574
575 memcpy (enc->cur, &fp, 4);
576 enc->cur += 4;
577 }
578 else 701 else
579 { 702 encode_float64 (enc, nv);
580 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
581
582 uint64_t fp = ecb_double_to_binary64 (nv);
583
584 if (!ecb_big_endian ())
585 fp = ecb_bswap64 (fp);
586
587 memcpy (enc->cur, &fp, 8);
588 enc->cur += 8;
589 }
590} 703}
591 704
592static void 705static void
593encode_sv (enc_t *enc, SV *sv) 706encode_sv (enc_t *enc, SV *sv)
594{ 707{
… …
601 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len); 714 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
602 } 715 }
603 else if (SvNOKp (sv)) 716 else if (SvNOKp (sv))
604 encode_nv (enc, sv); 717 encode_nv (enc, sv);
605 else if (SvIOKp (sv)) 718 else if (SvIOKp (sv))
606 { 719 encode_int (e,v sv);
607 if (SvIsUV (sv))
608 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
609 else if (SvIVX (sv) >= 0)
610 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
611 else
612 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
613 }
614 else if (SvROK (sv)) 720 else if (SvROK (sv))
615 encode_rv (enc, SvRV (sv)); 721 encode_rv (enc, SvRV (sv));
616 else if (!SvOK (sv)) 722 else if (!SvOK (sv))
617 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL); 723 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
618 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 724 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
… …
1141 1247
1142 sv = decode_sv (dec); 1248 sv = decode_sv (dec);
1143 1249
1144 dSP; 1250 dSP;
1145 ENTER; SAVETMPS; 1251 ENTER; SAVETMPS;
1146 SAVESTACK_POS ();
1147 PUSHMARK (SP); 1252 PUSHMARK (SP);
1148 EXTEND (SP, 2); 1253 EXTEND (SP, 2);
1149 PUSHs (tag_sv); 1254 PUSHs (tag_sv);
1150 PUSHs (sv); 1255 PUSHs (sv);
1151 1256
… …
1162 1267
1163 if (count) 1268 if (count)
1164 { 1269 {
1165 SvREFCNT_dec_NN (tag_sv); 1270 SvREFCNT_dec_NN (tag_sv);
1166 SvREFCNT_dec_NN (sv); 1271 SvREFCNT_dec_NN (sv);
1167 sv = SvREFCNT_inc_NN (POPs); 1272 sv = SvREFCNT_inc_NN (TOPs);
1273 SP -= count;
1168 } 1274 }
1169 else 1275 else
1170 { 1276 {
1171 AV *av = newAV (); 1277 AV *av = newAV ();
1172 av_push (av, tag_sv); 1278 av_push (av, tag_sv);

Diff Legend

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