[ViewVC] Diff of: cvs/CBOR-XS/XS.xs

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.17 by root, Tue Oct 29 22:04:52 2013 UTC vs.
Revision 1.35 by root, Sat Nov 30 17:19:34 2013 UTC

…		…
19	# define HvNAMELEN(hv) HvNAMELEN_get (hv)	19	# define HvNAMELEN(hv) HvNAMELEN_get (hv)
20	#endif	20	#endif
21	#ifndef HvNAMEUTF8	21	#ifndef HvNAMEUTF8
22	# define HvNAMEUTF8(hv) 0	22	# define HvNAMEUTF8(hv) 0
23	#endif	23	#endif
		24	#ifndef SvREFCNT_dec_NN
		25	# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
		26	#endif
		27
		28	// known major and minor types
		29	enum cbor_type
		30	{
		31	MAJOR_SHIFT = 5,
		32	MINOR_MASK = 0x1f,
		33
		34	MAJOR_POS_INT = 0 << MAJOR_SHIFT,
		35	MAJOR_NEG_INT = 1 << MAJOR_SHIFT,
		36	MAJOR_BYTES = 2 << MAJOR_SHIFT,
		37	MAJOR_TEXT = 3 << MAJOR_SHIFT,
		38	MAJOR_ARRAY = 4 << MAJOR_SHIFT,
		39	MAJOR_MAP = 5 << MAJOR_SHIFT,
		40	MAJOR_TAG = 6 << MAJOR_SHIFT,
		41	MAJOR_MISC = 7 << MAJOR_SHIFT,
		42
		43	// INT/STRING/ARRAY/MAP subtypes
		44	LENGTH_EXT1 = 24,
		45	LENGTH_EXT2 = 25,
		46	LENGTH_EXT4 = 26,
		47	LENGTH_EXT8 = 27,
		48
		49	// SIMPLE types (effectively MISC subtypes)
		50	SIMPLE_FALSE = 20,
		51	SIMPLE_TRUE = 21,
		52	SIMPLE_NULL = 22,
		53	SIMPLE_UNDEF = 23,
		54
		55	// MISC subtype (unused)
		56	MISC_EXT1 = 24,
		57	MISC_FLOAT16 = 25,
		58	MISC_FLOAT32 = 26,
		59	MISC_FLOAT64 = 27,
		60
		61	// BYTES/TEXT/ARRAY/MAP
		62	MINOR_INDEF = 31,
		63	};
24		64
25	// known tags	65	// known tags
26	enum cbor_tag	66	enum cbor_tag
27	{	67	{
28	// inofficial extensions (pending iana registration)	68	// extensions
29	CBOR_TAG_PERL_OBJECT = 256,	69	CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
30	CBOR_TAG_GENERIC_OBJECT = 257,	70	CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object
		71	CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object
		72	CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing
		73	CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing
		74	CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref
		75	CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
31		76
32	// rfc7049	77	// rfc7049
33	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8	78	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
34	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any	79	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
35	CBOR_TAG_POS_BIGNUM = 2, // byte string	80	CBOR_TAG_POS_BIGNUM = 2, // byte string
36	CBOR_TAG_NEG_BIGNUM = 3, // byte string	81	CBOR_TAG_NEG_BIGNUM = 3, // byte string
37	CBOR_TAG_DECIMAL = 4, // decimal fraction, array	82	CBOR_TAG_DECIMAL = 4, // decimal fraction, array
38	CBOR_TAG_BIGFLOAT = 5, // array	83	CBOR_TAG_BIGFLOAT = 5, // array
39		84
40	CBOR_TAG_CONV_B64U = 21, // base64url, any	85	CBOR_TAG_CONV_B64U = 21, // base64url, any
41	CBOR_TAG_CONV_B64 = 22, // base64, any	86	CBOR_TAG_CONV_B64 = 22, // base64, any
42	CBOR_TAG_CONV_HEX = 23, // base16, any	87	CBOR_TAG_CONV_HEX = 23, // base16, any
43	CBOR_TAG_CBOR = 24, // embedded cbor, byte string	88	CBOR_TAG_CBOR = 24, // embedded cbor, byte string
44		89
45	CBOR_TAG_URI = 32, // URI rfc3986, utf-8	90	CBOR_TAG_URI = 32, // URI rfc3986, utf-8
46	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8	91	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
47	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8	92	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
48	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8	93	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
49	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8	94	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
50		95
51	CBOR_TAG_MAGIC = 55799 // self-describe cbor	96	CBOR_TAG_MAGIC = 55799, // self-describe cbor
52	};	97	};
53		98
54	#define F_SHRINK 0x00000200UL	99	#define F_SHRINK 0x00000001UL
55	#define F_ALLOW_UNKNOWN 0x00002000UL	100	#define F_ALLOW_UNKNOWN 0x00000002UL
		101	#define F_ALLOW_SHARING 0x00000004UL
		102	#define F_PACK_STRINGS 0x00000008UL
56		103
57	#define INIT_SIZE 32 // initial scalar size to be allocated	104	#define INIT_SIZE 32 // initial scalar size to be allocated
58		105
59	#define SB do {	106	#define SB do {
60	#define SE } while (0)	107	#define SE } while (0)
…		…
72	# define CBOR_SLOW 0	119	# define CBOR_SLOW 0
73	# define CBOR_STASH cbor_stash	120	# define CBOR_STASH cbor_stash
74	#endif	121	#endif
75		122
76	static HV cbor_stash, types_boolean_stash, types_error_stash, cbor_tagged_stash; // CBOR::XS::	123	static HV cbor_stash, types_boolean_stash, types_error_stash, cbor_tagged_stash; // CBOR::XS::
77	static SV types_true, types_false, types_error, sv_cbor;	124	static SV types_true, types_false, types_error, sv_cbor, *default_filter;
78		125
79	typedef struct {	126	typedef struct {
80	U32 flags;	127	U32 flags;
81	U32 max_depth;	128	U32 max_depth;
82	STRLEN max_size;	129	STRLEN max_size;
		130	SV *filter;
83	} CBOR;	131	} CBOR;
84		132
85	ecb_inline void	133	ecb_inline void
86	cbor_init (CBOR *cbor)	134	cbor_init (CBOR *cbor)
87	{	135	{
88	Zero (cbor, 1, CBOR);	136	Zero (cbor, 1, CBOR);
89	cbor->max_depth = 512;	137	cbor->max_depth = 512;
		138	}
		139
		140	ecb_inline void
		141	cbor_free (CBOR *cbor)
		142	{
		143	SvREFCNT_dec (cbor->filter);
90	}	144	}
91		145
92	/////////////////////////////////////////////////////////////////////////////	146	/////////////////////////////////////////////////////////////////////////////
93	// utility functions	147	// utility functions
94		148
…		…
116	SvPV_renew (sv, SvCUR (sv) + 1);	170	SvPV_renew (sv, SvCUR (sv) + 1);
117	#endif	171	#endif
118	}	172	}
119	}	173	}
120		174
121	/////////////////////////////////////////////////////////////////////////////	175	// minimum length of a string to be registered for stringref
122	// fp hell	176	ecb_inline int
123		177	minimum_string_length (UV idx)
124	//TODO	178	{
		179	return idx > 23
		180	? idx > 0xffU
		181	? idx > 0xffffU
		182	? idx > 0xffffffffU
		183	? 11
		184	: 7
		185	: 5
		186	: 4
		187	: 3;
		188	}
125		189
126	/////////////////////////////////////////////////////////////////////////////	190	/////////////////////////////////////////////////////////////////////////////
127	// encoder	191	// encoder
128		192
129	// structure used for encoding CBOR	193	// structure used for encoding CBOR
…		…
132	char *cur; // SvPVX (sv) + current output position	196	char *cur; // SvPVX (sv) + current output position
133	char *end; // SvEND (sv)	197	char *end; // SvEND (sv)
134	SV *sv; // result scalar	198	SV *sv; // result scalar
135	CBOR cbor;	199	CBOR cbor;
136	U32 depth; // recursion level	200	U32 depth; // recursion level
		201	HV *stringref[2]; // string => index, or 0 ([0] = bytes, [1] = utf-8)
		202	UV stringref_idx;
		203	HV *shareable; // ptr => index, or 0
		204	UV shareable_idx;
137	} enc_t;	205	} enc_t;
138		206
139	ecb_inline void	207	ecb_inline void
140	need (enc_t *enc, STRLEN len)	208	need (enc_t *enc, STRLEN len)
141	{	209	{
…		…
158	static void	226	static void
159	encode_uint (enc_t *enc, int major, UV len)	227	encode_uint (enc_t *enc, int major, UV len)
160	{	228	{
161	need (enc, 9);	229	need (enc, 9);
162		230
163	if (len < 24)	231	if (ecb_expect_true (len < LENGTH_EXT1))
164	*enc->cur++ = major \| len;	232	*enc->cur++ = major \| len;
165	else if (len <= 0xff)	233	else if (ecb_expect_true (len <= 0xff))
166	{	234	{
167	*enc->cur++ = major \| 24;	235	*enc->cur++ = major \| LENGTH_EXT1;
168	*enc->cur++ = len;	236	*enc->cur++ = len;
169	}	237	}
170	else if (len <= 0xffff)	238	else if (len <= 0xffff)
171	{	239	{
172	*enc->cur++ = major \| 25;	240	*enc->cur++ = major \| LENGTH_EXT2;
173	*enc->cur++ = len >> 8;	241	*enc->cur++ = len >> 8;
174	*enc->cur++ = len;	242	*enc->cur++ = len;
175	}	243	}
176	else if (len <= 0xffffffff)	244	else if (len <= 0xffffffff)
177	{	245	{
178	*enc->cur++ = major \| 26;	246	*enc->cur++ = major \| LENGTH_EXT4;
179	*enc->cur++ = len >> 24;	247	*enc->cur++ = len >> 24;
180	*enc->cur++ = len >> 16;	248	*enc->cur++ = len >> 16;
181	*enc->cur++ = len >> 8;	249	*enc->cur++ = len >> 8;
182	*enc->cur++ = len;	250	*enc->cur++ = len;
183	}	251	}
184	else	252	else
185	{	253	{
186	*enc->cur++ = major \| 27;	254	*enc->cur++ = major \| LENGTH_EXT8;
187	*enc->cur++ = len >> 56;	255	*enc->cur++ = len >> 56;
188	*enc->cur++ = len >> 48;	256	*enc->cur++ = len >> 48;
189	*enc->cur++ = len >> 40;	257	*enc->cur++ = len >> 40;
190	*enc->cur++ = len >> 32;	258	*enc->cur++ = len >> 32;
191	*enc->cur++ = len >> 24;	259	*enc->cur++ = len >> 24;
…		…
193	*enc->cur++ = len >> 8;	261	*enc->cur++ = len >> 8;
194	*enc->cur++ = len;	262	*enc->cur++ = len;
195	}	263	}
196	}	264	}
197		265
198	static void	266	ecb_inline void
		267	encode_tag (enc_t *enc, UV tag)
		268	{
		269	encode_uint (enc, MAJOR_TAG, tag);
		270	}
		271
		272	ecb_inline void
199	encode_str (enc_t enc, int utf8, char str, STRLEN len)	273	encode_str (enc_t enc, int utf8, char str, STRLEN len)
200	{	274	{
201	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	275	encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
202	need (enc, len);	276	need (enc, len);
203	memcpy (enc->cur, str, len);	277	memcpy (enc->cur, str, len);
204	enc->cur += len;	278	enc->cur += len;
205	}	279	}
206		280
		281	static void
		282	encode_strref (enc_t enc, int utf8, char str, STRLEN len)
		283	{
		284	if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
		285	{
		286	SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
		287
		288	if (SvOK (*svp))
		289	{
		290	// already registered, use stringref
		291	encode_tag (enc, CBOR_TAG_STRINGREF);
		292	encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
		293	return;
		294	}
		295	else if (len >= minimum_string_length (enc->stringref_idx))
		296	{
		297	// register only
		298	sv_setuv (*svp, enc->stringref_idx);
		299	++enc->stringref_idx;
		300	}
		301	}
		302
		303	encode_str (enc, utf8, str, len);
		304	}
		305
207	static void encode_sv (enc_t enc, SV sv);	306	static void encode_sv (enc_t enc, SV sv);
208		307
209	static void	308	static void
210	encode_av (enc_t enc, AV av)	309	encode_av (enc_t enc, AV av)
211	{	310	{
…		…
214	if (enc->depth >= enc->cbor.max_depth)	313	if (enc->depth >= enc->cbor.max_depth)
215	croak (ERR_NESTING_EXCEEDED);	314	croak (ERR_NESTING_EXCEEDED);
216		315
217	++enc->depth;	316	++enc->depth;
218		317
219	encode_uint (enc, 0x80, len + 1);	318	encode_uint (enc, MAJOR_ARRAY, len + 1);
220		319
221	for (i = 0; i <= len; ++i)	320	for (i = 0; i <= len; ++i)
222	{	321	{
223	SV **svp = av_fetch (av, i, 0);	322	SV **svp = av_fetch (av, i, 0);
224	encode_sv (enc, svp ? *svp : &PL_sv_undef);	323	encode_sv (enc, svp ? *svp : &PL_sv_undef);
…		…
239		338
240	int pairs = hv_iterinit (hv);	339	int pairs = hv_iterinit (hv);
241	int mg = SvMAGICAL (hv);	340	int mg = SvMAGICAL (hv);
242		341
243	if (mg)	342	if (mg)
244	encode_ch (enc, 0xa0 \| 31);	343	encode_ch (enc, MAJOR_MAP \| MINOR_INDEF);
245	else	344	else
246	encode_uint (enc, 0xa0, pairs);	345	encode_uint (enc, MAJOR_MAP, pairs);
247		346
248	while ((he = hv_iternext (hv)))	347	while ((he = hv_iternext (hv)))
249	{	348	{
250	if (HeKLEN (he) == HEf_SVKEY)	349	if (HeKLEN (he) == HEf_SVKEY)
251	encode_sv (enc, HeSVKEY (he));	350	encode_sv (enc, HeSVKEY (he));
252	else	351	else
253	encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));	352	encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
254		353
255	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));	354	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
256	}	355	}
257		356
258	if (mg)	357	if (mg)
259	encode_ch (enc, 0xe0 \| 31);	358	encode_ch (enc, MAJOR_MISC \| MINOR_INDEF);
260		359
261	--enc->depth;	360	--enc->depth;
262	}	361	}
263		362
264	// encode objects, arrays and special \0=false and \1=true values.	363	// encode objects, arrays and special \0=false and \1=true values.
265	static void	364	static void
266	encode_rv (enc_t enc, SV sv)	365	encode_rv (enc_t enc, SV sv)
267	{	366	{
268	svtype svt;
269
270	SvGETMAGIC (sv);	367	SvGETMAGIC (sv);
		368
271	svt = SvTYPE (sv);	369	svtype svt = SvTYPE (sv);
272		370
273	if (ecb_expect_false (SvOBJECT (sv)))	371	if (ecb_expect_false (SvOBJECT (sv)))
274	{	372	{
275	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash	373	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash
276	? types_boolean_stash	374	? types_boolean_stash
…		…
281	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	379	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
282	? cbor_tagged_stash	380	? cbor_tagged_stash
283	: gv_stashpv ("CBOR::XS::Tagged" , 1);	381	: gv_stashpv ("CBOR::XS::Tagged" , 1);
284		382
285	HV *stash = SvSTASH (sv);	383	HV *stash = SvSTASH (sv);
286	GV *method;
287		384
288	if (stash == boolean_stash)	385	if (stash == boolean_stash)
289	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	386	{
		387	encode_ch (enc, SvIV (sv) ? MAJOR_MISC \| SIMPLE_TRUE : MAJOR_MISC \| SIMPLE_FALSE);
		388	return;
		389	}
290	else if (stash == error_stash)	390	else if (stash == error_stash)
291	encode_ch (enc, 0xe0 \| 23);	391	{
		392	encode_ch (enc, MAJOR_MISC \| SIMPLE_UNDEF);
		393	return;
		394	}
292	else if (stash == tagged_stash)	395	else if (stash == tagged_stash)
293	{	396	{
294	if (svt != SVt_PVAV)	397	if (svt != SVt_PVAV)
295	croak ("encountered CBOR::XS::Tagged object that isn't an array");	398	croak ("encountered CBOR::XS::Tagged object that isn't an array");
296		399
297	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));	400	encode_uint (enc, MAJOR_TAG, SvUV (av_fetch ((AV )sv, 0, 1)));
298	encode_sv (enc, av_fetch ((AV )sv, 1, 1));	401	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
		402
		403	return;
		404	}
		405	}
		406
		407	if (ecb_expect_false (SvREFCNT (sv) > 1)
		408	&& ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
		409	{
		410	if (!enc->shareable)
		411	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
		412
		413	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
		414
		415	if (SvOK (*svp))
299	}	416	{
		417	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		418	encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
		419	return;
		420	}
		421	else
		422	{
		423	sv_setuv (*svp, enc->shareable_idx);
		424	++enc->shareable_idx;
		425	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
		426	}
		427	}
		428
		429	if (ecb_expect_false (SvOBJECT (sv)))
		430	{
		431	HV *stash = SvSTASH (sv);
		432	GV *method;
		433
300	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))	434	if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
301	{	435	{
302	dSP;	436	dSP;
303		437
304	ENTER; SAVETMPS; PUSHMARK (SP);	438	ENTER; SAVETMPS; PUSHMARK (SP);
305	// we re-bless the reference to get overload and other niceties right	439	// we re-bless the reference to get overload and other niceties right
…		…
336		470
337	// catch this surprisingly common error	471	// catch this surprisingly common error
338	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)	472	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
339	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));	473	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
340		474
341	encode_uint (enc, 0xc0, CBOR_TAG_PERL_OBJECT);	475	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
342	encode_uint (enc, 0x80, count + 1);	476	encode_uint (enc, MAJOR_ARRAY, count + 1);
343	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));	477	encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
344		478
345	while (count)	479	while (count)
346	encode_sv (enc, SP[1 - count--]);	480	encode_sv (enc, SP[1 - count--]);
347		481
348	PUTBACK;	482	PUTBACK;
…		…
355	}	489	}
356	else if (svt == SVt_PVHV)	490	else if (svt == SVt_PVHV)
357	encode_hv (enc, (HV *)sv);	491	encode_hv (enc, (HV *)sv);
358	else if (svt == SVt_PVAV)	492	else if (svt == SVt_PVAV)
359	encode_av (enc, (AV *)sv);	493	encode_av (enc, (AV *)sv);
360	else if (svt < SVt_PVAV)
361	{
362	STRLEN len = 0;
363	char *pv = svt ? SvPV (sv, len) : 0;
364
365	if (len == 1 && *pv == '1')
366	encode_ch (enc, 0xe0 \| 21);
367	else if (len == 1 && *pv == '0')
368	encode_ch (enc, 0xe0 \| 20);
369	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
370	encode_ch (enc, 0xe0 \| 23);
371	else
372	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
373	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
374	}
375	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
376	encode_ch (enc, 0xe0 \| 23);
377	else	494	else
378	croak ("encountered %s, but CBOR can only represent references to arrays or hashes",	495	{
379	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	496	encode_tag (enc, CBOR_TAG_INDIRECTION);
		497	encode_sv (enc, sv);
		498	}
380	}	499	}
381		500
382	static void	501	static void
383	encode_nv (enc_t enc, SV sv)	502	encode_nv (enc_t enc, SV sv)
384	{	503	{
385	double nv = SvNVX (sv);	504	double nv = SvNVX (sv);
386		505
387	need (enc, 9);	506	need (enc, 9);
388		507
389	if (ecb_expect_false (nv == (U32)nv))	508	if (ecb_expect_false (nv == (NV)(U32)nv))
390	encode_uint (enc, 0x00, (U32)nv);	509	encode_uint (enc, MAJOR_POS_INT, (U32)nv);
391	//TODO: maybe I32?	510	//TODO: maybe I32?
392	else if (ecb_expect_false (nv == (float)nv))	511	else if (ecb_expect_false (nv == (float)nv))
393	{	512	{
394	uint32_t fp = ecb_float_to_binary32 (nv);	513	uint32_t fp = ecb_float_to_binary32 (nv);
395		514
396	*enc->cur++ = 0xe0 \| 26;	515	*enc->cur++ = MAJOR_MISC \| MISC_FLOAT32;
397		516
398	if (!ecb_big_endian ())	517	if (!ecb_big_endian ())
399	fp = ecb_bswap32 (fp);	518	fp = ecb_bswap32 (fp);
400		519
401	memcpy (enc->cur, &fp, 4);	520	memcpy (enc->cur, &fp, 4);
…		…
403	}	522	}
404	else	523	else
405	{	524	{
406	uint64_t fp = ecb_double_to_binary64 (nv);	525	uint64_t fp = ecb_double_to_binary64 (nv);
407		526
408	*enc->cur++ = 0xe0 \| 27;	527	*enc->cur++ = MAJOR_MISC \| MISC_FLOAT64;
409		528
410	if (!ecb_big_endian ())	529	if (!ecb_big_endian ())
411	fp = ecb_bswap64 (fp);	530	fp = ecb_bswap64 (fp);
412		531
413	memcpy (enc->cur, &fp, 8);	532	memcpy (enc->cur, &fp, 8);
…		…
422		541
423	if (SvPOKp (sv))	542	if (SvPOKp (sv))
424	{	543	{
425	STRLEN len;	544	STRLEN len;
426	char *str = SvPV (sv, len);	545	char *str = SvPV (sv, len);
427	encode_str (enc, SvUTF8 (sv), str, len);	546	encode_strref (enc, SvUTF8 (sv), str, len);
428	}	547	}
429	else if (SvNOKp (sv))	548	else if (SvNOKp (sv))
430	encode_nv (enc, sv);	549	encode_nv (enc, sv);
431	else if (SvIOKp (sv))	550	else if (SvIOKp (sv))
432	{	551	{
433	if (SvIsUV (sv))	552	if (SvIsUV (sv))
434	encode_uint (enc, 0x00, SvUVX (sv));	553	encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
435	else if (SvIVX (sv) >= 0)	554	else if (SvIVX (sv) >= 0)
436	encode_uint (enc, 0x00, SvIVX (sv));	555	encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
437	else	556	else
438	encode_uint (enc, 0x20, -(SvIVX (sv) + 1));	557	encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
439	}	558	}
440	else if (SvROK (sv))	559	else if (SvROK (sv))
441	encode_rv (enc, SvRV (sv));	560	encode_rv (enc, SvRV (sv));
442	else if (!SvOK (sv))	561	else if (!SvOK (sv))
443	encode_ch (enc, 0xe0 \| 22);	562	encode_ch (enc, MAJOR_MISC \| SIMPLE_NULL);
444	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)	563	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
445	encode_ch (enc, 0xe0 \| 23);	564	encode_ch (enc, MAJOR_MISC \| SIMPLE_UNDEF);
446	else	565	else
447	croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data",	566	croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data",
448	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));	567	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
449	}	568	}
450		569
451	static SV *	570	static SV *
452	encode_cbor (SV scalar, CBOR cbor)	571	encode_cbor (SV scalar, CBOR cbor)
453	{	572	{
454	enc_t enc;	573	enc_t enc = { };
455		574
456	enc.cbor = *cbor;	575	enc.cbor = *cbor;
457	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	576	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
458	enc.cur = SvPVX (enc.sv);	577	enc.cur = SvPVX (enc.sv);
459	enc.end = SvEND (enc.sv);	578	enc.end = SvEND (enc.sv);
460	enc.depth = 0;
461		579
462	SvPOK_only (enc.sv);	580	SvPOK_only (enc.sv);
		581
		582	if (cbor->flags & F_PACK_STRINGS)
		583	{
		584	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
		585	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
		586	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
		587	}
		588
463	encode_sv (&enc, scalar);	589	encode_sv (&enc, scalar);
464		590
465	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	591	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
466	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	592	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
467		593
…		…
481	U8 *end; // end of input string	607	U8 *end; // end of input string
482	const char *err; // parse error, if != 0	608	const char *err; // parse error, if != 0
483	CBOR cbor;	609	CBOR cbor;
484	U32 depth; // recursion depth	610	U32 depth; // recursion depth
485	U32 maxdepth; // recursion depth limit	611	U32 maxdepth; // recursion depth limit
		612	AV *shareable;
		613	AV *stringref;
		614	SV *decode_tagged;
486	} dec_t;	615	} dec_t;
487		616
488	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	617	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
489		618
490	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")	619	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
…		…
493	#define DEC_DEC_DEPTH --dec->depth	622	#define DEC_DEC_DEPTH --dec->depth
494		623
495	static UV	624	static UV
496	decode_uint (dec_t *dec)	625	decode_uint (dec_t *dec)
497	{	626	{
498	switch (*dec->cur & 31)	627	U8 m = *dec->cur & MINOR_MASK;
		628	++dec->cur;
		629
		630	if (ecb_expect_true (m < LENGTH_EXT1))
		631	return m;
		632
		633	switch (m)
499	{	634	{
500	case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:	635	case LENGTH_EXT1:
501	case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:	636	WANT (1);
502	case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:	637	dec->cur += 1;
503	return *dec->cur++ & 31;	638	return dec->cur[-1];
504		639
505	case 24:	640	case LENGTH_EXT2:
506	WANT (2);	641	WANT (2);
507	dec->cur += 2;	642	dec->cur += 2;
508	return dec->cur[-1];
509
510	case 25:
511	WANT (3);
512	dec->cur += 3;
513	return (((UV)dec->cur[-2]) << 8)	643	return (((UV)dec->cur[-2]) << 8)
514	\| ((UV)dec->cur[-1]);	644	\| ((UV)dec->cur[-1]);
515		645
516	case 26:	646	case LENGTH_EXT4:
517	WANT (5);	647	WANT (4);
518	dec->cur += 5;	648	dec->cur += 4;
519	return (((UV)dec->cur[-4]) << 24)	649	return (((UV)dec->cur[-4]) << 24)
520	\| (((UV)dec->cur[-3]) << 16)	650	\| (((UV)dec->cur[-3]) << 16)
521	\| (((UV)dec->cur[-2]) << 8)	651	\| (((UV)dec->cur[-2]) << 8)
522	\| ((UV)dec->cur[-1]);	652	\| ((UV)dec->cur[-1]);
523		653
524	case 27:	654	case LENGTH_EXT8:
525	WANT (9);	655	WANT (8);
526	dec->cur += 9;	656	dec->cur += 8;
		657
		658	return
		659	#if UVSIZE < 8
		660	0
		661	#else
527	return (((UV)dec->cur[-8]) << 56)	662	(((UV)dec->cur[-8]) << 56)
528	\| (((UV)dec->cur[-7]) << 48)	663	\| (((UV)dec->cur[-7]) << 48)
529	\| (((UV)dec->cur[-6]) << 40)	664	\| (((UV)dec->cur[-6]) << 40)
530	\| (((UV)dec->cur[-5]) << 32)	665	\| (((UV)dec->cur[-5]) << 32)
		666	#endif
531	\| (((UV)dec->cur[-4]) << 24)	667	\| (((UV)dec->cur[-4]) << 24)
532	\| (((UV)dec->cur[-3]) << 16)	668	\| (((UV)dec->cur[-3]) << 16)
533	\| (((UV)dec->cur[-2]) << 8)	669	\| (((UV)dec->cur[-2]) << 8)
534	\| ((UV)dec->cur[-1]);	670	\| ((UV)dec->cur[-1]);
535		671
…		…
548	{	684	{
549	AV *av = newAV ();	685	AV *av = newAV ();
550		686
551	DEC_INC_DEPTH;	687	DEC_INC_DEPTH;
552		688
553	if ((*dec->cur & 31) == 31)	689	if (*dec->cur == (MAJOR_ARRAY \| MINOR_INDEF))
554	{	690	{
555	++dec->cur;	691	++dec->cur;
556		692
557	for (;;)	693	for (;;)
558	{	694	{
559	WANT (1);	695	WANT (1);
560		696
561	if (*dec->cur == (0xe0 \| 31))	697	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
562	{	698	{
563	++dec->cur;	699	++dec->cur;
564	break;	700	break;
565	}	701	}
566		702
…		…
588		724
589	static void	725	static void
590	decode_he (dec_t dec, HV hv)	726	decode_he (dec_t dec, HV hv)
591	{	727	{
592	// for speed reasons, we specialcase single-string	728	// for speed reasons, we specialcase single-string
593	// byte or utf-8 strings as keys.	729	// byte or utf-8 strings as keys, but only when !stringref
594		730
595	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)	731	if (ecb_expect_true (!dec->stringref))
		732	if ((*dec->cur - MAJOR_BYTES) <= 27)
596	{	733	{
597	I32 len = decode_uint (dec);	734	I32 len = decode_uint (dec);
598	char key = (char )dec->cur;	735	char key = (char )dec->cur;
599		736
600	dec->cur += len;	737	dec->cur += len;
601		738
		739	if (ecb_expect_false (dec->stringref))
		740	av_push (dec->stringref, newSVpvn (key, len));
		741
602	hv_store (hv, key, len, decode_sv (dec), 0);	742	hv_store (hv, key, len, decode_sv (dec), 0);
		743
		744	return;
603	}	745	}
604	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)	746	else if ((*dec->cur - MAJOR_TEXT) <= 27)
605	{	747	{
606	I32 len = decode_uint (dec);	748	I32 len = decode_uint (dec);
607	char key = (char )dec->cur;	749	char key = (char )dec->cur;
608		750
609	dec->cur += len;	751	dec->cur += len;
610		752
		753	if (ecb_expect_false (dec->stringref))
		754	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));
		755
611	hv_store (hv, key, -len, decode_sv (dec), 0);	756	hv_store (hv, key, -len, decode_sv (dec), 0);
		757
		758	return;
612	}	759	}
613	else	760
614	{
615	SV *k = decode_sv (dec);	761	SV *k = decode_sv (dec);
616	SV *v = decode_sv (dec);	762	SV *v = decode_sv (dec);
617		763
618	hv_store_ent (hv, k, v, 0);	764	hv_store_ent (hv, k, v, 0);
619	SvREFCNT_dec (k);	765	SvREFCNT_dec (k);
620	}
621	}	766	}
622		767
623	static SV *	768	static SV *
624	decode_hv (dec_t *dec)	769	decode_hv (dec_t *dec)
625	{	770	{
626	HV *hv = newHV ();	771	HV *hv = newHV ();
627		772
628	DEC_INC_DEPTH;	773	DEC_INC_DEPTH;
629		774
630	if ((*dec->cur & 31) == 31)	775	if (*dec->cur == (MAJOR_MAP \| MINOR_INDEF))
631	{	776	{
632	++dec->cur;	777	++dec->cur;
633		778
634	for (;;)	779	for (;;)
635	{	780	{
636	WANT (1);	781	WANT (1);
637		782
638	if (*dec->cur == (0xe0 \| 31))	783	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
639	{	784	{
640	++dec->cur;	785	++dec->cur;
641	break;	786	break;
642	}	787	}
643		788
…		…
664	static SV *	809	static SV *
665	decode_str (dec_t *dec, int utf8)	810	decode_str (dec_t *dec, int utf8)
666	{	811	{
667	SV *sv = 0;	812	SV *sv = 0;
668		813
669	if ((*dec->cur & 31) == 31)	814	if ((*dec->cur & MINOR_MASK) == MINOR_INDEF)
670	{	815	{
		816	// indefinite length strings
671	++dec->cur;	817	++dec->cur;
672		818
		819	U8 major = *dec->cur & MAJOR_MISC;
		820
673	sv = newSVpvn ("", 0);	821	sv = newSVpvn ("", 0);
674		822
675	// not very fast, and certainly not robust against illegal input
676	for (;;)	823	for (;;)
677	{	824	{
678	WANT (1);	825	WANT (1);
679		826
680	if (*dec->cur == (0xe0 \| 31))	827	if ((*dec->cur - major) > LENGTH_EXT8)
		828	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
681	{	829	{
682	++dec->cur;	830	++dec->cur;
683	break;	831	break;
684	}	832	}
		833	else
		834	ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
685		835
686	sv_catsv (sv, decode_sv (dec));	836	STRLEN len = decode_uint (dec);
		837
		838	WANT (len);
		839	sv_catpvn (sv, dec->cur, len);
		840	dec->cur += len;
687	}	841	}
688	}	842	}
689	else	843	else
690	{	844	{
691	STRLEN len = decode_uint (dec);	845	STRLEN len = decode_uint (dec);
692		846
693	WANT (len);	847	WANT (len);
694	sv = newSVpvn (dec->cur, len);	848	sv = newSVpvn (dec->cur, len);
695	dec->cur += len;	849	dec->cur += len;
		850
		851	if (ecb_expect_false (dec->stringref)
		852	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
		853	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
696	}	854	}
697		855
698	if (utf8)	856	if (utf8)
699	SvUTF8_on (sv);	857	SvUTF8_on (sv);
700		858
…		…
706	}	864	}
707		865
708	static SV *	866	static SV *
709	decode_tagged (dec_t *dec)	867	decode_tagged (dec_t *dec)
710	{	868	{
		869	SV *sv = 0;
711	UV tag = decode_uint (dec);	870	UV tag = decode_uint (dec);
		871
		872	WANT (1);
		873
		874	switch (tag)
		875	{
		876	case CBOR_TAG_MAGIC:
712	SV *sv = decode_sv (dec);	877	sv = decode_sv (dec);
		878	break;
713		879
714	if (tag == CBOR_TAG_MAGIC)	880	case CBOR_TAG_INDIRECTION:
715	return sv;	881	sv = newRV_noinc (decode_sv (dec));
716	else if (tag == CBOR_TAG_PERL_OBJECT)	882	break;
717	{
718	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
719	ERR ("corrupted CBOR data (non-array perl object)");
720		883
721	AV av = (AV )SvRV (sv);	884	case CBOR_TAG_STRINGREF_NAMESPACE:
722	int len = av_len (av) + 1;
723	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
724
725	if (!stash)
726	ERR ("cannot decode perl-object (package does not exist)");
727
728	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
729		885	{
730	if (!method)	886	ENTER; SAVETMPS;
731	ERR ("cannot decode perl-object (package does not have a THAW method)");
732
733	dSP;
734		887
735	ENTER; SAVETMPS; PUSHMARK (SP);	888	SAVESPTR (dec->stringref);
736	EXTEND (SP, len + 1);	889	dec->stringref = (AV )sv_2mortal ((SV )newAV ());
737	// we re-bless the reference to get overload and other niceties right
738	PUSHs (*av_fetch (av, 0, 1));
739	PUSHs (sv_cbor);
740		890
741	int i;	891	sv = decode_sv (dec);
742		892
743	for (i = 1; i < len; ++i)
744	PUSHs (*av_fetch (av, i, 1));
745
746	PUTBACK;
747	call_sv ((SV *)GvCV (method), G_SCALAR \| G_EVAL);
748	SPAGAIN;
749
750	if (SvTRUE (ERRSV))
751	{
752	FREETMPS; LEAVE;	893	FREETMPS; LEAVE;
		894	}
		895	break;
		896
		897	case CBOR_TAG_STRINGREF:
		898	{
		899	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
		900	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
		901
		902	UV idx = decode_uint (dec);
		903
		904	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
		905	ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
		906
		907	sv = newSVsv (AvARRAY (dec->stringref)[idx]);
		908	}
		909	break;
		910
		911	case CBOR_TAG_VALUE_SHAREABLE:
		912	{
		913	if (ecb_expect_false (!dec->shareable))
		914	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
		915
		916	sv = newSV (0);
		917	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
		918
		919	SV *osv = decode_sv (dec);
		920	sv_setsv (sv, osv);
		921	SvREFCNT_dec_NN (osv);
		922	}
		923	break;
		924
		925	case CBOR_TAG_VALUE_SHAREDREF:
		926	{
		927	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
		928	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
		929
		930	UV idx = decode_uint (dec);
		931
		932	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
		933	ERR ("corrupted CBOR data (sharedref index out of bounds)");
		934
		935	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		936	}
		937	break;
		938
		939	case CBOR_TAG_PERL_OBJECT:
		940	{
		941	sv = decode_sv (dec);
		942
		943	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
		944	ERR ("corrupted CBOR data (non-array perl object)");
		945
		946	AV av = (AV )SvRV (sv);
		947	int len = av_len (av) + 1;
		948	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
		949
		950	if (!stash)
		951	ERR ("cannot decode perl-object (package does not exist)");
		952
		953	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		954
		955	if (!method)
		956	ERR ("cannot decode perl-object (package does not have a THAW method)");
		957
		958	dSP;
		959
		960	ENTER; SAVETMPS; PUSHMARK (SP);
		961	EXTEND (SP, len + 1);
		962	// we re-bless the reference to get overload and other niceties right
		963	PUSHs (*av_fetch (av, 0, 1));
		964	PUSHs (sv_cbor);
		965
		966	int i;
		967
		968	for (i = 1; i < len; ++i)
		969	PUSHs (*av_fetch (av, i, 1));
		970
		971	PUTBACK;
		972	call_sv ((SV *)GvCV (method), G_SCALAR \| G_EVAL);
		973	SPAGAIN;
		974
		975	if (SvTRUE (ERRSV))
		976	{
		977	FREETMPS; LEAVE;
753	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));	978	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
754	}	979	}
755		980
756	SvREFCNT_dec (sv);	981	SvREFCNT_dec (sv);
757	sv = SvREFCNT_inc (POPs);	982	sv = SvREFCNT_inc (POPs);
758		983
759	PUTBACK;	984	PUTBACK;
760		985
761	FREETMPS; LEAVE;	986	FREETMPS; LEAVE;
		987	}
		988	break;
762		989
763	return sv;	990	default:
764	}	991	{
765	else	992	sv = decode_sv (dec);
766	{	993
		994	dSP;
		995	ENTER; SAVETMPS; PUSHMARK (SP);
		996	EXTEND (SP, 2);
		997	PUSHs (newSVuv (tag));
		998	PUSHs (sv);
		999
		1000	PUTBACK;
		1001	int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY \| G_EVAL);
		1002	SPAGAIN;
		1003
		1004	if (SvTRUE (ERRSV))
		1005	{
		1006	FREETMPS; LEAVE;
		1007	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		1008	}
		1009
		1010	if (count)
		1011	{
		1012	SvREFCNT_dec (sv);
		1013	sv = SvREFCNT_inc (POPs);
		1014	}
		1015	else
		1016	{
767	AV *av = newAV ();	1017	AV *av = newAV ();
768	av_push (av, newSVuv (tag));	1018	av_push (av, newSVuv (tag));
769	av_push (av, sv);	1019	av_push (av, sv);
770		1020
771	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	1021	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
772	? cbor_tagged_stash	1022	? cbor_tagged_stash
773	: gv_stashpv ("CBOR::XS::Tagged" , 1);	1023	: gv_stashpv ("CBOR::XS::Tagged" , 1);
774
775	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);	1024	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		1025	}
		1026
		1027	PUTBACK;
		1028
		1029	FREETMPS; LEAVE;
		1030	}
		1031	break;
776	}	1032	}
		1033
		1034	return sv;
777		1035
778	fail:	1036	fail:
779	SvREFCNT_dec (sv);	1037	SvREFCNT_dec (sv);
780	return &PL_sv_undef;	1038	return &PL_sv_undef;
781	}	1039	}
…		…
783	static SV *	1041	static SV *
784	decode_sv (dec_t *dec)	1042	decode_sv (dec_t *dec)
785	{	1043	{
786	WANT (1);	1044	WANT (1);
787		1045
788	switch (*dec->cur >> 5)	1046	switch (*dec->cur >> MAJOR_SHIFT)
789	{	1047	{
790	case 0: // unsigned int	1048	case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
791	return newSVuv (decode_uint (dec));	1049	case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
792	case 1: // negative int	1050	case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
793	return newSViv (-1 - (IV)decode_uint (dec));	1051	case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
794	case 2: // octet string	1052	case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
795	return decode_str (dec, 0);	1053	case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
796	case 3: // utf-8 string	1054	case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
797	return decode_str (dec, 1);	1055
798	case 4: // array	1056	case MAJOR_MISC >> MAJOR_SHIFT:
799	return decode_av (dec);
800	case 5: // map
801	return decode_hv (dec);
802	case 6: // tag
803	return decode_tagged (dec);
804	case 7: // misc
805	switch (*dec->cur++ & 31)	1057	switch (*dec->cur++ & MINOR_MASK)
806	{	1058	{
807	case 20:	1059	case SIMPLE_FALSE:
808	#if CBOR_SLOW	1060	#if CBOR_SLOW
809	types_false = get_bool ("Types::Serialiser::false");	1061	types_false = get_bool ("Types::Serialiser::false");
810	#endif	1062	#endif
811	return newSVsv (types_false);	1063	return newSVsv (types_false);
812	case 21:	1064	case SIMPLE_TRUE:
813	#if CBOR_SLOW	1065	#if CBOR_SLOW
814	types_true = get_bool ("Types::Serialiser::true");	1066	types_true = get_bool ("Types::Serialiser::true");
815	#endif	1067	#endif
816	return newSVsv (types_true);	1068	return newSVsv (types_true);
817	case 22:	1069	case SIMPLE_NULL:
818	return newSVsv (&PL_sv_undef);	1070	return newSVsv (&PL_sv_undef);
819	case 23:	1071	case SIMPLE_UNDEF:
820	#if CBOR_SLOW	1072	#if CBOR_SLOW
821	types_error = get_bool ("Types::Serialiser::error");	1073	types_error = get_bool ("Types::Serialiser::error");
822	#endif	1074	#endif
823	return newSVsv (types_error);	1075	return newSVsv (types_error);
824		1076
825	case 25:	1077	case MISC_FLOAT16:
826	{	1078	{
827	WANT (2);	1079	WANT (2);
828		1080
829	uint16_t fp = (dec->cur[0] << 8) \| dec->cur[1];	1081	uint16_t fp = (dec->cur[0] << 8) \| dec->cur[1];
830	dec->cur += 2;	1082	dec->cur += 2;
831		1083
832	return newSVnv (ecb_binary16_to_float (fp));	1084	return newSVnv (ecb_binary16_to_float (fp));
833	}	1085	}
834		1086
835	case 26:	1087	case MISC_FLOAT32:
836	{	1088	{
837	uint32_t fp;	1089	uint32_t fp;
838	WANT (4);	1090	WANT (4);
839	memcpy (&fp, dec->cur, 4);	1091	memcpy (&fp, dec->cur, 4);
840	dec->cur += 4;	1092	dec->cur += 4;
…		…
843	fp = ecb_bswap32 (fp);	1095	fp = ecb_bswap32 (fp);
844		1096
845	return newSVnv (ecb_binary32_to_float (fp));	1097	return newSVnv (ecb_binary32_to_float (fp));
846	}	1098	}
847		1099
848	case 27:	1100	case MISC_FLOAT64:
849	{	1101	{
850	uint64_t fp;	1102	uint64_t fp;
851	WANT (8);	1103	WANT (8);
852	memcpy (&fp, dec->cur, 8);	1104	memcpy (&fp, dec->cur, 8);
853	dec->cur += 8;	1105	dec->cur += 8;
…		…
856	fp = ecb_bswap64 (fp);	1108	fp = ecb_bswap64 (fp);
857		1109
858	return newSVnv (ecb_binary64_to_double (fp));	1110	return newSVnv (ecb_binary64_to_double (fp));
859	}	1111	}
860		1112
861	// 0..19 unassigned	1113	// 0..19 unassigned simple
862	// 24 reserved + unassigned (reserved values are not encodable)	1114	// 24 reserved + unassigned (reserved values are not encodable)
863	default:	1115	default:
864	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");	1116	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");
865	}	1117	}
866		1118
…		…
872	}	1124	}
873		1125
874	static SV *	1126	static SV *
875	decode_cbor (SV string, CBOR cbor, char **offset_return)	1127	decode_cbor (SV string, CBOR cbor, char **offset_return)
876	{	1128	{
877	dec_t dec;	1129	dec_t dec = { };
878	SV *sv;	1130	SV *sv;
879	STRLEN len;	1131	STRLEN len;
880	char *data = SvPVbyte (string, len);	1132	char *data = SvPVbyte (string, len);
881		1133
882	if (len > cbor->max_size && cbor->max_size)	1134	if (len > cbor->max_size && cbor->max_size)
…		…
884	(unsigned long)len, (unsigned long)cbor->max_size);	1136	(unsigned long)len, (unsigned long)cbor->max_size);
885		1137
886	dec.cbor = *cbor;	1138	dec.cbor = *cbor;
887	dec.cur = (U8 *)data;	1139	dec.cur = (U8 *)data;
888	dec.end = (U8 *)data + len;	1140	dec.end = (U8 *)data + len;
889	dec.err = 0;
890	dec.depth = 0;
891		1141
892	sv = decode_sv (&dec);	1142	sv = decode_sv (&dec);
893		1143
894	if (offset_return)	1144	if (offset_return)
895	*offset_return = dec.cur;	1145	*offset_return = dec.cur;
…		…
923	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);	1173	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
924		1174
925	types_true = get_bool ("Types::Serialiser::true" );	1175	types_true = get_bool ("Types::Serialiser::true" );
926	types_false = get_bool ("Types::Serialiser::false");	1176	types_false = get_bool ("Types::Serialiser::false");
927	types_error = get_bool ("Types::Serialiser::error");	1177	types_error = get_bool ("Types::Serialiser::error");
		1178
		1179	default_filter = newSVpv ("CBOR::XS::default_filter", 0);
928		1180
929	sv_cbor = newSVpv ("CBOR", 0);	1181	sv_cbor = newSVpv ("CBOR", 0);
930	SvREADONLY_on (sv_cbor);	1182	SvREADONLY_on (sv_cbor);
931	}	1183	}
932		1184
…		…
953		1205
954	void shrink (CBOR *self, int enable = 1)	1206	void shrink (CBOR *self, int enable = 1)
955	ALIAS:	1207	ALIAS:
956	shrink = F_SHRINK	1208	shrink = F_SHRINK
957	allow_unknown = F_ALLOW_UNKNOWN	1209	allow_unknown = F_ALLOW_UNKNOWN
		1210	allow_sharing = F_ALLOW_SHARING
		1211	pack_strings = F_PACK_STRINGS
958	PPCODE:	1212	PPCODE:
959	{	1213	{
960	if (enable)	1214	if (enable)
961	self->flags \|= ix;	1215	self->flags \|= ix;
962	else	1216	else
…		…
967		1221
968	void get_shrink (CBOR *self)	1222	void get_shrink (CBOR *self)
969	ALIAS:	1223	ALIAS:
970	get_shrink = F_SHRINK	1224	get_shrink = F_SHRINK
971	get_allow_unknown = F_ALLOW_UNKNOWN	1225	get_allow_unknown = F_ALLOW_UNKNOWN
		1226	get_allow_sharing = F_ALLOW_SHARING
		1227	get_pack_strings = F_PACK_STRINGS
972	PPCODE:	1228	PPCODE:
973	XPUSHs (boolSV (self->flags & ix));	1229	XPUSHs (boolSV (self->flags & ix));
974		1230
975	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1231	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
976	PPCODE:	1232	PPCODE:
…		…
989	XPUSHs (ST (0));	1245	XPUSHs (ST (0));
990		1246
991	int get_max_size (CBOR *self)	1247	int get_max_size (CBOR *self)
992	CODE:	1248	CODE:
993	RETVAL = self->max_size;	1249	RETVAL = self->max_size;
		1250	OUTPUT:
		1251	RETVAL
		1252
		1253	void filter (CBOR self, SV filter = 0)
		1254	PPCODE:
		1255	SvREFCNT_dec (self->filter);
		1256	self->filter = filter ? newSVsv (filter) : filter;
		1257	XPUSHs (ST (0));
		1258
		1259	SV get_filter (CBOR self)
		1260	CODE:
		1261	RETVAL = self->filter ? self->filter : NEWSV (0, 0);
994	OUTPUT:	1262	OUTPUT:
995	RETVAL	1263	RETVAL
996		1264
997	void encode (CBOR self, SV scalar)	1265	void encode (CBOR self, SV scalar)
998	PPCODE:	1266	PPCODE:
…		…
1013	EXTEND (SP, 2);	1281	EXTEND (SP, 2);
1014	PUSHs (sv);	1282	PUSHs (sv);
1015	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1283	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1016	}	1284	}
1017		1285
		1286	void DESTROY (CBOR *self)
		1287	PPCODE:
		1288	cbor_free (self);
		1289
1018	PROTOTYPES: ENABLE	1290	PROTOTYPES: ENABLE
1019		1291
1020	void encode_cbor (SV *scalar)	1292	void encode_cbor (SV *scalar)
1021	PPCODE:	1293	PPCODE:
1022	{	1294	{

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.17 by root, Tue Oct 29 22:04:52 2013 UTC vs. Revision 1.35 by root, Sat Nov 30 17:19:34 2013 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.17 by root, Tue Oct 29 22:04:52 2013 UTC vs.
Revision 1.35 by root, Sat Nov 30 17:19:34 2013 UTC