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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.19 by root, Wed Nov 20 02:03:09 2013 UTC vs.
Revision 1.45 by root, Sun Dec 14 05:48:39 2014 UTC

…		…
7	#include <stdlib.h>	7	#include <stdlib.h>
8	#include <stdio.h>	8	#include <stdio.h>
9	#include <limits.h>	9	#include <limits.h>
10	#include <float.h>	10	#include <float.h>
11		11
		12	#define ECB_NO_THREADS 1
12	#include "ecb.h"	13	#include "ecb.h"
13		14
14	// compatibility with perl <5.18	15	// compatibility with perl <5.18
15	#ifndef HvNAMELEN_get	16	#ifndef HvNAMELEN_get
16	# define HvNAMELEN_get(hv) strlen (HvNAME (hv))	17	# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
…		…
19	# define HvNAMELEN(hv) HvNAMELEN_get (hv)	20	# define HvNAMELEN(hv) HvNAMELEN_get (hv)
20	#endif	21	#endif
21	#ifndef HvNAMEUTF8	22	#ifndef HvNAMEUTF8
22	# define HvNAMEUTF8(hv) 0	23	# define HvNAMEUTF8(hv) 0
23	#endif	24	#endif
		25	#ifndef SvREFCNT_dec_NN
		26	# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
		27	#endif
		28
		29	// known major and minor types
		30	enum cbor_type
		31	{
		32	MAJOR_SHIFT = 5,
		33	MINOR_MASK = 0x1f,
		34
		35	MAJOR_POS_INT = 0 << MAJOR_SHIFT,
		36	MAJOR_NEG_INT = 1 << MAJOR_SHIFT,
		37	MAJOR_BYTES = 2 << MAJOR_SHIFT,
		38	MAJOR_TEXT = 3 << MAJOR_SHIFT,
		39	MAJOR_ARRAY = 4 << MAJOR_SHIFT,
		40	MAJOR_MAP = 5 << MAJOR_SHIFT,
		41	MAJOR_TAG = 6 << MAJOR_SHIFT,
		42	MAJOR_MISC = 7 << MAJOR_SHIFT,
		43
		44	// INT/STRING/ARRAY/MAP subtypes
		45	LENGTH_EXT1 = 24,
		46	LENGTH_EXT2 = 25,
		47	LENGTH_EXT4 = 26,
		48	LENGTH_EXT8 = 27,
		49
		50	// SIMPLE types (effectively MISC subtypes)
		51	SIMPLE_FALSE = 20,
		52	SIMPLE_TRUE = 21,
		53	SIMPLE_NULL = 22,
		54	SIMPLE_UNDEF = 23,
		55
		56	// MISC subtype (unused)
		57	MISC_EXT1 = 24,
		58	MISC_FLOAT16 = 25,
		59	MISC_FLOAT32 = 26,
		60	MISC_FLOAT64 = 27,
		61
		62	// BYTES/TEXT/ARRAY/MAP
		63	MINOR_INDEF = 31,
		64	};
24		65
25	// known tags	66	// known tags
26	enum cbor_tag	67	enum cbor_tag
27	{	68	{
28	// inofficial extensions (pending iana registration)	69	// extensions
		70	CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
29	CBOR_TAG_PERL_OBJECT = 24, // http://cbor.schmorp.de/perl-object	71	CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object
30	CBOR_TAG_GENERIC_OBJECT = 25, // http://cbor.schmorp.de/generic-object	72	CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object
31	CBOR_TAG_VALUE_SHAREABLE = 26, // http://cbor.schmorp.de/value-sharing	73	CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing
32	CBOR_TAG_VALUE_SHAREDREF = 27, // http://cbor.schmorp.de/value-sharing	74	CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing
33	CBOR_TAG_STRINGREF_NAMESPACE = 65537, // http://cbor.schmorp.de/stringref	75	CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref
34	CBOR_TAG_STRINGREF = 28, // http://cbor.schmorp.de/stringref
35	CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection	76	CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
36		77
37	// rfc7049	78	// rfc7049
38	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8	79	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
39	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any	80	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
40	CBOR_TAG_POS_BIGNUM = 2, // byte string	81	CBOR_TAG_POS_BIGNUM = 2, // byte string
41	CBOR_TAG_NEG_BIGNUM = 3, // byte string	82	CBOR_TAG_NEG_BIGNUM = 3, // byte string
42	CBOR_TAG_DECIMAL = 4, // decimal fraction, array	83	CBOR_TAG_DECIMAL = 4, // decimal fraction, array
43	CBOR_TAG_BIGFLOAT = 5, // array	84	CBOR_TAG_BIGFLOAT = 5, // array
44		85
45	CBOR_TAG_CONV_B64U = 21, // base64url, any	86	CBOR_TAG_CONV_B64U = 21, // base64url, any
46	CBOR_TAG_CONV_B64 = 22, // base64, any	87	CBOR_TAG_CONV_B64 = 22, // base64, any
47	CBOR_TAG_CONV_HEX = 23, // base16, any	88	CBOR_TAG_CONV_HEX = 23, // base16, any
48	CBOR_TAG_CBOR = 24, // embedded cbor, byte string	89	CBOR_TAG_CBOR = 24, // embedded cbor, byte string
49		90
50	CBOR_TAG_URI = 32, // URI rfc3986, utf-8	91	CBOR_TAG_URI = 32, // URI rfc3986, utf-8
51	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8	92	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
52	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8	93	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
53	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8	94	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
54	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8	95	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
55		96
56	CBOR_TAG_MAGIC = 55799 // self-describe cbor	97	CBOR_TAG_MAGIC = 55799, // self-describe cbor
57	};	98	};
58		99
59	#define F_SHRINK 0x00000001UL	100	#define F_SHRINK 0x00000001UL
60	#define F_ALLOW_UNKNOWN 0x00000002UL	101	#define F_ALLOW_UNKNOWN 0x00000002UL
61	#define F_ALLOW_SHARING 0x00000004UL //TODO	102	#define F_ALLOW_SHARING 0x00000004UL
		103	#define F_ALLOW_CYCLES 0x00000008UL
62	#define F_DEDUP_STRINGS 0x00000008UL //TODO	104	#define F_PACK_STRINGS 0x00000010UL
63	#define F_DEDUP_KEYS 0x00000010UL //TODO	105	#define F_VALIDATE_UTF8 0x00000020UL
64		106
65	#define INIT_SIZE 32 // initial scalar size to be allocated	107	#define INIT_SIZE 32 // initial scalar size to be allocated
66		108
67	#define SB do {	109	#define SB do {
68	#define SE } while (0)	110	#define SE } while (0)
…		…
80	# define CBOR_SLOW 0	122	# define CBOR_SLOW 0
81	# define CBOR_STASH cbor_stash	123	# define CBOR_STASH cbor_stash
82	#endif	124	#endif
83		125
84	static HV cbor_stash, types_boolean_stash, types_error_stash, cbor_tagged_stash; // CBOR::XS::	126	static HV cbor_stash, types_boolean_stash, types_error_stash, cbor_tagged_stash; // CBOR::XS::
85	static SV types_true, types_false, types_error, sv_cbor;	127	static SV types_true, types_false, types_error, sv_cbor, *default_filter;
86		128
87	typedef struct {	129	typedef struct {
88	U32 flags;	130	U32 flags;
89	U32 max_depth;	131	U32 max_depth;
90	STRLEN max_size;	132	STRLEN max_size;
		133	SV *filter;
		134
		135	// for the incremental parser
		136	STRLEN incr_pos; // the current offset into the text
		137	STRLEN incr_need; // minimum bytes needed to decode
		138	AV *incr_count; // for every nesting level, the number of outstanding values, or -1 for indef.
91	} CBOR;	139	} CBOR;
92		140
93	ecb_inline void	141	ecb_inline void
94	cbor_init (CBOR *cbor)	142	cbor_init (CBOR *cbor)
95	{	143	{
96	Zero (cbor, 1, CBOR);	144	Zero (cbor, 1, CBOR);
97	cbor->max_depth = 512;	145	cbor->max_depth = 512;
		146	}
		147
		148	ecb_inline void
		149	cbor_free (CBOR *cbor)
		150	{
		151	SvREFCNT_dec (cbor->filter);
		152	SvREFCNT_dec (cbor->incr_count);
98	}	153	}
99		154
100	/////////////////////////////////////////////////////////////////////////////	155	/////////////////////////////////////////////////////////////////////////////
101	// utility functions	156	// utility functions
102		157
…		…
124	SvPV_renew (sv, SvCUR (sv) + 1);	179	SvPV_renew (sv, SvCUR (sv) + 1);
125	#endif	180	#endif
126	}	181	}
127	}	182	}
128		183
		184	// minimum length of a string to be registered for stringref
		185	ecb_inline int
		186	minimum_string_length (UV idx)
		187	{
		188	return idx > 23
		189	? idx > 0xffU
		190	? idx > 0xffffU
		191	? idx > 0xffffffffU
		192	? 11
		193	: 7
		194	: 5
		195	: 4
		196	: 3;
		197	}
		198
129	/////////////////////////////////////////////////////////////////////////////	199	/////////////////////////////////////////////////////////////////////////////
130	// encoder	200	// encoder
131		201
132	// structure used for encoding CBOR	202	// structure used for encoding CBOR
133	typedef struct	203	typedef struct
…		…
135	char *cur; // SvPVX (sv) + current output position	205	char *cur; // SvPVX (sv) + current output position
136	char *end; // SvEND (sv)	206	char *end; // SvEND (sv)
137	SV *sv; // result scalar	207	SV *sv; // result scalar
138	CBOR cbor;	208	CBOR cbor;
139	U32 depth; // recursion level	209	U32 depth; // recursion level
140	HV *stringref; // string => index, or 0	210	HV *stringref[2]; // string => index, or 0 ([0] = bytes, [1] = utf-8)
		211	UV stringref_idx;
141	HV *shareable; // ptr => index, or 0	212	HV *shareable; // ptr => index, or 0
142	UV shareable_idx;	213	UV shareable_idx;
143	} enc_t;	214	} enc_t;
144		215
145	ecb_inline void	216	ecb_inline void
…		…
164	static void	235	static void
165	encode_uint (enc_t *enc, int major, UV len)	236	encode_uint (enc_t *enc, int major, UV len)
166	{	237	{
167	need (enc, 9);	238	need (enc, 9);
168		239
169	if (len < 24)	240	if (ecb_expect_true (len < LENGTH_EXT1))
170	*enc->cur++ = major \| len;	241	*enc->cur++ = major \| len;
171	else if (len <= 0xff)	242	else if (ecb_expect_true (len <= 0xffU))
172	{	243	{
173	*enc->cur++ = major \| 24;	244	*enc->cur++ = major \| LENGTH_EXT1;
174	*enc->cur++ = len;	245	*enc->cur++ = len;
175	}	246	}
176	else if (len <= 0xffff)	247	else if (len <= 0xffffU)
177	{	248	{
178	*enc->cur++ = major \| 25;	249	*enc->cur++ = major \| LENGTH_EXT2;
179	*enc->cur++ = len >> 8;	250	*enc->cur++ = len >> 8;
180	*enc->cur++ = len;	251	*enc->cur++ = len;
181	}	252	}
182	else if (len <= 0xffffffff)	253	else if (len <= 0xffffffffU)
183	{	254	{
184	*enc->cur++ = major \| 26;	255	*enc->cur++ = major \| LENGTH_EXT4;
185	*enc->cur++ = len >> 24;	256	*enc->cur++ = len >> 24;
186	*enc->cur++ = len >> 16;	257	*enc->cur++ = len >> 16;
187	*enc->cur++ = len >> 8;	258	*enc->cur++ = len >> 8;
188	*enc->cur++ = len;	259	*enc->cur++ = len;
189	}	260	}
190	else	261	else
191	{	262	{
192	*enc->cur++ = major \| 27;	263	*enc->cur++ = major \| LENGTH_EXT8;
193	*enc->cur++ = len >> 56;	264	*enc->cur++ = len >> 56;
194	*enc->cur++ = len >> 48;	265	*enc->cur++ = len >> 48;
195	*enc->cur++ = len >> 40;	266	*enc->cur++ = len >> 40;
196	*enc->cur++ = len >> 32;	267	*enc->cur++ = len >> 32;
197	*enc->cur++ = len >> 24;	268	*enc->cur++ = len >> 24;
…		…
199	*enc->cur++ = len >> 8;	270	*enc->cur++ = len >> 8;
200	*enc->cur++ = len;	271	*enc->cur++ = len;
201	}	272	}
202	}	273	}
203		274
204	static void	275	ecb_inline void
		276	encode_tag (enc_t *enc, UV tag)
		277	{
		278	encode_uint (enc, MAJOR_TAG, tag);
		279	}
		280
		281	ecb_inline void
205	encode_str (enc_t enc, int utf8, char str, STRLEN len)	282	encode_str (enc_t enc, int utf8, char str, STRLEN len)
206	{	283	{
207	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	284	encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
208	need (enc, len);	285	need (enc, len);
209	memcpy (enc->cur, str, len);	286	memcpy (enc->cur, str, len);
210	enc->cur += len;	287	enc->cur += len;
211	}	288	}
212		289
213	ecb_inline void	290	static void
214	encode_tag (enc_t *enc, UV tag)	291	encode_strref (enc_t enc, int utf8, char str, STRLEN len)
215	{	292	{
216	encode_uint (enc, 0xc0, tag);	293	if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
		294	{
		295	SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
		296
		297	if (SvOK (*svp))
		298	{
		299	// already registered, use stringref
		300	encode_tag (enc, CBOR_TAG_STRINGREF);
		301	encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
		302	return;
		303	}
		304	else if (len >= minimum_string_length (enc->stringref_idx))
		305	{
		306	// register only
		307	sv_setuv (*svp, enc->stringref_idx);
		308	++enc->stringref_idx;
		309	}
		310	}
		311
		312	encode_str (enc, utf8, str, len);
217	}	313	}
218		314
219	static void encode_sv (enc_t enc, SV sv);	315	static void encode_sv (enc_t enc, SV sv);
220		316
221	static void	317	static void
…		…
226	if (enc->depth >= enc->cbor.max_depth)	322	if (enc->depth >= enc->cbor.max_depth)
227	croak (ERR_NESTING_EXCEEDED);	323	croak (ERR_NESTING_EXCEEDED);
228		324
229	++enc->depth;	325	++enc->depth;
230		326
231	encode_uint (enc, 0x80, len + 1);	327	encode_uint (enc, MAJOR_ARRAY, len + 1);
232		328
		329	if (SvMAGICAL (av))
233	for (i = 0; i <= len; ++i)	330	for (i = 0; i <= len; ++i)
234	{	331	{
235	SV **svp = av_fetch (av, i, 0);	332	SV **svp = av_fetch (av, i, 0);
236	encode_sv (enc, svp ? *svp : &PL_sv_undef);	333	encode_sv (enc, svp ? *svp : &PL_sv_undef);
237	}	334	}
		335	else
		336	for (i = 0; i <= len; ++i)
		337	encode_sv (enc, AvARRAY (av)[i]);
238		338
239	--enc->depth;	339	--enc->depth;
240	}	340	}
241		341
242	static void	342	static void
…		…
251		351
252	int pairs = hv_iterinit (hv);	352	int pairs = hv_iterinit (hv);
253	int mg = SvMAGICAL (hv);	353	int mg = SvMAGICAL (hv);
254		354
255	if (mg)	355	if (mg)
256	encode_ch (enc, 0xa0 \| 31);	356	encode_ch (enc, MAJOR_MAP \| MINOR_INDEF);
257	else	357	else
258	encode_uint (enc, 0xa0, pairs);	358	encode_uint (enc, MAJOR_MAP, pairs);
259		359
260	while ((he = hv_iternext (hv)))	360	while ((he = hv_iternext (hv)))
261	{	361	{
262	if (HeKLEN (he) == HEf_SVKEY)	362	if (HeKLEN (he) == HEf_SVKEY)
263	encode_sv (enc, HeSVKEY (he));	363	encode_sv (enc, HeSVKEY (he));
264	else	364	else
265	encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));	365	encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
266		366
267	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));	367	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
268	}	368	}
269		369
270	if (mg)	370	if (mg)
271	encode_ch (enc, 0xe0 \| 31);	371	encode_ch (enc, MAJOR_MISC \| MINOR_INDEF);
272		372
273	--enc->depth;	373	--enc->depth;
274	}	374	}
275		375
276	// encode objects, arrays and special \0=false and \1=true values.	376	// encode objects, arrays and special \0=false and \1=true values.
277	static void	377	static void
278	encode_rv (enc_t enc, SV sv)	378	encode_rv (enc_t enc, SV sv)
279	{	379	{
280	SvGETMAGIC (sv);	380	SvGETMAGIC (sv);
281
282	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
283	&& ecb_expect_false (SvREFCNT (sv) > 1))
284	{
285	if (!enc->shareable)
286	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
287
288	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
289
290	if (SvOK (*svp))
291	{
292	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
293	encode_uint (enc, 0x00, SvUV (*svp));
294	return;
295	}
296	else
297	{
298	sv_setuv (*svp, enc->shareable_idx);
299	++enc->shareable_idx;
300	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
301	}
302	}
303		381
304	svtype svt = SvTYPE (sv);	382	svtype svt = SvTYPE (sv);
305		383
306	if (ecb_expect_false (SvOBJECT (sv)))	384	if (ecb_expect_false (SvOBJECT (sv)))
307	{	385	{
…		…
314	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	392	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
315	? cbor_tagged_stash	393	? cbor_tagged_stash
316	: gv_stashpv ("CBOR::XS::Tagged" , 1);	394	: gv_stashpv ("CBOR::XS::Tagged" , 1);
317		395
318	HV *stash = SvSTASH (sv);	396	HV *stash = SvSTASH (sv);
319	GV *method;
320		397
321	if (stash == boolean_stash)	398	if (stash == boolean_stash)
322	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	399	{
		400	encode_ch (enc, SvIV (sv) ? MAJOR_MISC \| SIMPLE_TRUE : MAJOR_MISC \| SIMPLE_FALSE);
		401	return;
		402	}
323	else if (stash == error_stash)	403	else if (stash == error_stash)
324	encode_ch (enc, 0xe0 \| 23);	404	{
		405	encode_ch (enc, MAJOR_MISC \| SIMPLE_UNDEF);
		406	return;
		407	}
325	else if (stash == tagged_stash)	408	else if (stash == tagged_stash)
326	{	409	{
327	if (svt != SVt_PVAV)	410	if (svt != SVt_PVAV)
328	croak ("encountered CBOR::XS::Tagged object that isn't an array");	411	croak ("encountered CBOR::XS::Tagged object that isn't an array");
329		412
330	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));	413	encode_uint (enc, MAJOR_TAG, SvUV (av_fetch ((AV )sv, 0, 1)));
331	encode_sv (enc, av_fetch ((AV )sv, 1, 1));	414	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
		415
		416	return;
		417	}
		418	}
		419
		420	if (ecb_expect_false (SvREFCNT (sv) > 1)
		421	&& ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
		422	{
		423	if (!enc->shareable)
		424	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
		425
		426	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
		427
		428	if (SvOK (*svp))
332	}	429	{
		430	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		431	encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
		432	return;
		433	}
		434	else
		435	{
		436	sv_setuv (*svp, enc->shareable_idx);
		437	++enc->shareable_idx;
		438	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
		439	}
		440	}
		441
		442	if (ecb_expect_false (SvOBJECT (sv)))
		443	{
		444	HV *stash = SvSTASH (sv);
		445	GV *method;
		446
333	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))	447	if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
334	{	448	{
335	dSP;	449	dSP;
336		450
337	ENTER; SAVETMPS; PUSHMARK (SP);	451	ENTER; SAVETMPS; PUSHMARK (SP);
338	// we re-bless the reference to get overload and other niceties right	452	// we re-bless the reference to get overload and other niceties right
…		…
370	// catch this surprisingly common error	484	// catch this surprisingly common error
371	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)	485	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
372	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));	486	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
373		487
374	encode_tag (enc, CBOR_TAG_PERL_OBJECT);	488	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
375	encode_uint (enc, 0x80, count + 1);	489	encode_uint (enc, MAJOR_ARRAY, count + 1);
376	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));	490	encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
377		491
378	while (count)	492	while (count)
379	encode_sv (enc, SP[1 - count--]);	493	encode_sv (enc, SP[1 - count--]);
380		494
381	PUTBACK;	495	PUTBACK;
…		…
402	{	516	{
403	double nv = SvNVX (sv);	517	double nv = SvNVX (sv);
404		518
405	need (enc, 9);	519	need (enc, 9);
406		520
407	if (ecb_expect_false (nv == (U32)nv))	521	if (ecb_expect_false (nv == (NV)(U32)nv))
408	encode_uint (enc, 0x00, (U32)nv);	522	encode_uint (enc, MAJOR_POS_INT, (U32)nv);
409	//TODO: maybe I32?	523	//TODO: maybe I32?
410	else if (ecb_expect_false (nv == (float)nv))	524	else if (ecb_expect_false (nv == (float)nv))
411	{	525	{
412	uint32_t fp = ecb_float_to_binary32 (nv);	526	uint32_t fp = ecb_float_to_binary32 (nv);
413		527
414	*enc->cur++ = 0xe0 \| 26;	528	*enc->cur++ = MAJOR_MISC \| MISC_FLOAT32;
415		529
416	if (!ecb_big_endian ())	530	if (!ecb_big_endian ())
417	fp = ecb_bswap32 (fp);	531	fp = ecb_bswap32 (fp);
418		532
419	memcpy (enc->cur, &fp, 4);	533	memcpy (enc->cur, &fp, 4);
…		…
421	}	535	}
422	else	536	else
423	{	537	{
424	uint64_t fp = ecb_double_to_binary64 (nv);	538	uint64_t fp = ecb_double_to_binary64 (nv);
425		539
426	*enc->cur++ = 0xe0 \| 27;	540	*enc->cur++ = MAJOR_MISC \| MISC_FLOAT64;
427		541
428	if (!ecb_big_endian ())	542	if (!ecb_big_endian ())
429	fp = ecb_bswap64 (fp);	543	fp = ecb_bswap64 (fp);
430		544
431	memcpy (enc->cur, &fp, 8);	545	memcpy (enc->cur, &fp, 8);
…		…
440		554
441	if (SvPOKp (sv))	555	if (SvPOKp (sv))
442	{	556	{
443	STRLEN len;	557	STRLEN len;
444	char *str = SvPV (sv, len);	558	char *str = SvPV (sv, len);
445	encode_str (enc, SvUTF8 (sv), str, len);	559	encode_strref (enc, SvUTF8 (sv), str, len);
446	}	560	}
447	else if (SvNOKp (sv))	561	else if (SvNOKp (sv))
448	encode_nv (enc, sv);	562	encode_nv (enc, sv);
449	else if (SvIOKp (sv))	563	else if (SvIOKp (sv))
450	{	564	{
451	if (SvIsUV (sv))	565	if (SvIsUV (sv))
452	encode_uint (enc, 0x00, SvUVX (sv));	566	encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
453	else if (SvIVX (sv) >= 0)	567	else if (SvIVX (sv) >= 0)
454	encode_uint (enc, 0x00, SvIVX (sv));	568	encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
455	else	569	else
456	encode_uint (enc, 0x20, -(SvIVX (sv) + 1));	570	encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
457	}	571	}
458	else if (SvROK (sv))	572	else if (SvROK (sv))
459	encode_rv (enc, SvRV (sv));	573	encode_rv (enc, SvRV (sv));
460	else if (!SvOK (sv))	574	else if (!SvOK (sv))
461	encode_ch (enc, 0xe0 \| 22);	575	encode_ch (enc, MAJOR_MISC \| SIMPLE_NULL);
462	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)	576	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
463	encode_ch (enc, 0xe0 \| 23);	577	encode_ch (enc, MAJOR_MISC \| SIMPLE_UNDEF);
464	else	578	else
465	croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data",	579	croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data",
466	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));	580	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
467	}	581	}
468		582
…		…
475	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	589	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
476	enc.cur = SvPVX (enc.sv);	590	enc.cur = SvPVX (enc.sv);
477	enc.end = SvEND (enc.sv);	591	enc.end = SvEND (enc.sv);
478		592
479	SvPOK_only (enc.sv);	593	SvPOK_only (enc.sv);
		594
		595	if (cbor->flags & F_PACK_STRINGS)
		596	{
		597	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
		598	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
		599	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
		600	}
		601
480	encode_sv (&enc, scalar);	602	encode_sv (&enc, scalar);
481		603
482	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	604	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
483	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	605	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
484		606
…		…
499	const char *err; // parse error, if != 0	621	const char *err; // parse error, if != 0
500	CBOR cbor;	622	CBOR cbor;
501	U32 depth; // recursion depth	623	U32 depth; // recursion depth
502	U32 maxdepth; // recursion depth limit	624	U32 maxdepth; // recursion depth limit
503	AV *shareable;	625	AV *shareable;
		626	AV *stringref;
		627	SV *decode_tagged;
504	} dec_t;	628	} dec_t;
505		629
506	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	630	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
507		631
508	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")	632	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
…		…
511	#define DEC_DEC_DEPTH --dec->depth	635	#define DEC_DEC_DEPTH --dec->depth
512		636
513	static UV	637	static UV
514	decode_uint (dec_t *dec)	638	decode_uint (dec_t *dec)
515	{	639	{
516	switch (*dec->cur & 31)	640	U8 m = *dec->cur & MINOR_MASK;
517	{	641	++dec->cur;
518	case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
519	case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
520	case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:
521	return *dec->cur++ & 31;
522		642
523	case 24:	643	if (ecb_expect_true (m < LENGTH_EXT1))
		644	return m;
		645	else if (ecb_expect_true (m == LENGTH_EXT1))
		646	{
524	WANT (2);	647	WANT (1);
525	dec->cur += 2;	648	dec->cur += 1;
526	return dec->cur[-1];	649	return dec->cur[-1];
527		650	}
528	case 25:	651	else if (ecb_expect_true (m == LENGTH_EXT2))
		652	{
529	WANT (3);	653	WANT (2);
530	dec->cur += 3;	654	dec->cur += 2;
531	return (((UV)dec->cur[-2]) << 8)	655	return (((UV)dec->cur[-2]) << 8)
532	\| ((UV)dec->cur[-1]);	656	\| ((UV)dec->cur[-1]);
533		657	}
534	case 26:	658	else if (ecb_expect_true (m == LENGTH_EXT4))
		659	{
535	WANT (5);	660	WANT (4);
536	dec->cur += 5;	661	dec->cur += 4;
537	return (((UV)dec->cur[-4]) << 24)	662	return (((UV)dec->cur[-4]) << 24)
538	\| (((UV)dec->cur[-3]) << 16)	663	\| (((UV)dec->cur[-3]) << 16)
539	\| (((UV)dec->cur[-2]) << 8)	664	\| (((UV)dec->cur[-2]) << 8)
540	\| ((UV)dec->cur[-1]);	665	\| ((UV)dec->cur[-1]);
541		666	}
542	case 27:	667	else if (ecb_expect_true (m == LENGTH_EXT8))
		668	{
543	WANT (9);	669	WANT (8);
544	dec->cur += 9;	670	dec->cur += 8;
		671
		672	return
		673	#if UVSIZE < 8
		674	0
		675	#else
545	return (((UV)dec->cur[-8]) << 56)	676	(((UV)dec->cur[-8]) << 56)
546	\| (((UV)dec->cur[-7]) << 48)	677	\| (((UV)dec->cur[-7]) << 48)
547	\| (((UV)dec->cur[-6]) << 40)	678	\| (((UV)dec->cur[-6]) << 40)
548	\| (((UV)dec->cur[-5]) << 32)	679	\| (((UV)dec->cur[-5]) << 32)
		680	#endif
549	\| (((UV)dec->cur[-4]) << 24)	681	\| (((UV)dec->cur[-4]) << 24)
550	\| (((UV)dec->cur[-3]) << 16)	682	\| (((UV)dec->cur[-3]) << 16)
551	\| (((UV)dec->cur[-2]) << 8)	683	\| (((UV)dec->cur[-2]) << 8)
552	\| ((UV)dec->cur[-1]);	684	\| ((UV)dec->cur[-1]);
553		685	}
554	default:	686	else
555	ERR ("corrupted CBOR data (unsupported integer minor encoding)");	687	ERR ("corrupted CBOR data (unsupported integer minor encoding)");
556	}
557		688
558	fail:	689	fail:
559	return 0;	690	return 0;
560	}	691	}
561		692
…		…
566	{	697	{
567	AV *av = newAV ();	698	AV *av = newAV ();
568		699
569	DEC_INC_DEPTH;	700	DEC_INC_DEPTH;
570		701
571	if ((*dec->cur & 31) == 31)	702	if (*dec->cur == (MAJOR_ARRAY \| MINOR_INDEF))
572	{	703	{
573	++dec->cur;	704	++dec->cur;
574		705
575	for (;;)	706	for (;;)
576	{	707	{
577	WANT (1);	708	WANT (1);
578		709
579	if (*dec->cur == (0xe0 \| 31))	710	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
580	{	711	{
581	++dec->cur;	712	++dec->cur;
582	break;	713	break;
583	}	714	}
584		715
…		…
587	}	718	}
588	else	719	else
589	{	720	{
590	int i, len = decode_uint (dec);	721	int i, len = decode_uint (dec);
591		722
		723	WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
592	av_fill (av, len - 1);	724	av_fill (av, len - 1);
593		725
594	for (i = 0; i < len; ++i)	726	for (i = 0; i < len; ++i)
595	AvARRAY (av)[i] = decode_sv (dec);	727	AvARRAY (av)[i] = decode_sv (dec);
596	}	728	}
…		…
606		738
607	static void	739	static void
608	decode_he (dec_t dec, HV hv)	740	decode_he (dec_t dec, HV hv)
609	{	741	{
610	// for speed reasons, we specialcase single-string	742	// for speed reasons, we specialcase single-string
611	// byte or utf-8 strings as keys.	743	// byte or utf-8 strings as keys, but only when !stringref
612		744
613	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)	745	if (ecb_expect_true (!dec->stringref))
		746	if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
614	{	747	{
615	I32 len = decode_uint (dec);	748	I32 len = decode_uint (dec);
616	char key = (char )dec->cur;	749	char key = (char )dec->cur;
617		750
618	dec->cur += len;	751	dec->cur += len;
619		752
620	hv_store (hv, key, len, decode_sv (dec), 0);	753	hv_store (hv, key, len, decode_sv (dec), 0);
		754
		755	return;
621	}	756	}
622	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)	757	else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
623	{	758	{
624	I32 len = decode_uint (dec);	759	I32 len = decode_uint (dec);
625	char key = (char )dec->cur;	760	char key = (char )dec->cur;
626		761
627	dec->cur += len;	762	dec->cur += len;
628		763
		764	if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
		765	if (!is_utf8_string (key, len))
		766	ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
		767
629	hv_store (hv, key, -len, decode_sv (dec), 0);	768	hv_store (hv, key, -len, decode_sv (dec), 0);
		769
		770	return;
630	}	771	}
631	else	772
632	{
633	SV *k = decode_sv (dec);	773	SV *k = decode_sv (dec);
634	SV *v = decode_sv (dec);	774	SV *v = decode_sv (dec);
635		775
636	hv_store_ent (hv, k, v, 0);	776	hv_store_ent (hv, k, v, 0);
637	SvREFCNT_dec (k);	777	SvREFCNT_dec (k);
638	}	778
		779	fail:
		780	;
639	}	781	}
640		782
641	static SV *	783	static SV *
642	decode_hv (dec_t *dec)	784	decode_hv (dec_t *dec)
643	{	785	{
644	HV *hv = newHV ();	786	HV *hv = newHV ();
645		787
646	DEC_INC_DEPTH;	788	DEC_INC_DEPTH;
647		789
648	if ((*dec->cur & 31) == 31)	790	if (*dec->cur == (MAJOR_MAP \| MINOR_INDEF))
649	{	791	{
650	++dec->cur;	792	++dec->cur;
651		793
652	for (;;)	794	for (;;)
653	{	795	{
654	WANT (1);	796	WANT (1);
655		797
656	if (*dec->cur == (0xe0 \| 31))	798	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
657	{	799	{
658	++dec->cur;	800	++dec->cur;
659	break;	801	break;
660	}	802	}
661		803
…		…
682	static SV *	824	static SV *
683	decode_str (dec_t *dec, int utf8)	825	decode_str (dec_t *dec, int utf8)
684	{	826	{
685	SV *sv = 0;	827	SV *sv = 0;
686		828
687	if ((*dec->cur & 31) == 31)	829	if ((*dec->cur & MINOR_MASK) == MINOR_INDEF)
688	{	830	{
		831	// indefinite length strings
689	++dec->cur;	832	++dec->cur;
690		833
		834	U8 major = *dec->cur & MAJOR_MISC;
		835
691	sv = newSVpvn ("", 0);	836	sv = newSVpvn ("", 0);
692		837
693	// not very fast, and certainly not robust against illegal input
694	for (;;)	838	for (;;)
695	{	839	{
696	WANT (1);	840	WANT (1);
697		841
698	if (*dec->cur == (0xe0 \| 31))	842	if ((*dec->cur - major) > LENGTH_EXT8)
		843	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
699	{	844	{
700	++dec->cur;	845	++dec->cur;
701	break;	846	break;
702	}	847	}
		848	else
		849	ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
703		850
704	sv_catsv (sv, decode_sv (dec));	851	STRLEN len = decode_uint (dec);
		852
		853	WANT (len);
		854	sv_catpvn (sv, dec->cur, len);
		855	dec->cur += len;
705	}	856	}
706	}	857	}
707	else	858	else
708	{	859	{
709	STRLEN len = decode_uint (dec);	860	STRLEN len = decode_uint (dec);
710		861
711	WANT (len);	862	WANT (len);
712	sv = newSVpvn (dec->cur, len);	863	sv = newSVpvn (dec->cur, len);
713	dec->cur += len;	864	dec->cur += len;
		865
		866	if (ecb_expect_false (dec->stringref)
		867	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
		868	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
714	}	869	}
715		870
716	if (utf8)	871	if (utf8)
		872	{
		873	if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
		874	if (!is_utf8_string (SvPVX (sv), SvCUR (sv)))
		875	ERR ("corrupted CBOR data (invalid UTF-8 in text string)");
		876
717	SvUTF8_on (sv);	877	SvUTF8_on (sv);
		878	}
718		879
719	return sv;	880	return sv;
720		881
721	fail:	882	fail:
722	SvREFCNT_dec (sv);	883	SvREFCNT_dec (sv);
…		…
732	WANT (1);	893	WANT (1);
733		894
734	switch (tag)	895	switch (tag)
735	{	896	{
736	case CBOR_TAG_MAGIC:	897	case CBOR_TAG_MAGIC:
737	return decode_sv (dec);	898	sv = decode_sv (dec);
		899	break;
738		900
739	case CBOR_TAG_INDIRECTION:	901	case CBOR_TAG_INDIRECTION:
740	return newRV_noinc (decode_sv (dec));	902	sv = newRV_noinc (decode_sv (dec));
		903	break;
		904
		905	case CBOR_TAG_STRINGREF_NAMESPACE:
		906	{
		907	ENTER; SAVETMPS;
		908
		909	SAVESPTR (dec->stringref);
		910	dec->stringref = (AV )sv_2mortal ((SV )newAV ());
		911
		912	sv = decode_sv (dec);
		913
		914	FREETMPS; LEAVE;
		915	}
		916	break;
		917
		918	case CBOR_TAG_STRINGREF:
		919	{
		920	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
		921	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
		922
		923	UV idx = decode_uint (dec);
		924
		925	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
		926	ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
		927
		928	sv = newSVsv (AvARRAY (dec->stringref)[idx]);
		929	}
		930	break;
741		931
742	case CBOR_TAG_VALUE_SHAREABLE:	932	case CBOR_TAG_VALUE_SHAREABLE:
743	{	933	{
744	if (ecb_expect_false (!dec->shareable))	934	if (ecb_expect_false (!dec->shareable))
745	dec->shareable = (AV )sv_2mortal ((SV )newAV ());	935	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
746		936
		937	if (dec->cbor.flags & F_ALLOW_CYCLES)
		938	{
747	sv = newSV (0);	939	sv = newSV (0);
748	av_push (dec->shareable, SvREFCNT_inc_NN (sv));	940	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
749		941
750	SV *osv = decode_sv (dec);	942	SV *osv = decode_sv (dec);
751	sv_setsv (sv, osv);	943	sv_setsv (sv, osv);
752	SvREFCNT_dec_NN (osv);	944	SvREFCNT_dec_NN (osv);
753	}	945	}
754		946	else
755	return sv;	947	{
		948	av_push (dec->shareable, &PL_sv_undef);
		949	int idx = AvFILLp (dec->shareable);
		950	sv = decode_sv (dec);
		951	av_store (dec->shareable, idx, SvREFCNT_inc_NN (sv));
		952	}
		953	}
		954	break;
756		955
757	case CBOR_TAG_VALUE_SHAREDREF:	956	case CBOR_TAG_VALUE_SHAREDREF:
758	{	957	{
759	if ((*dec->cur >> 5) != 0)	958	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
760	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");	959	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
761		960
762	UV idx = decode_uint (dec);	961	UV idx = decode_uint (dec);
763		962
764	if (!dec->shareable \|\| idx > AvFILLp (dec->shareable))	963	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
765	ERR ("corrupted CBOR data (sharedref index out of bounds)");	964	ERR ("corrupted CBOR data (sharedref index out of bounds)");
766		965
767	return SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);	966	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		967
		968	if (sv == &PL_sv_undef)
		969	ERR ("cyclic CBOR data structure found, but allow_cycles is not enabled");
768	}	970	}
		971	break;
769		972
770	case CBOR_TAG_PERL_OBJECT:	973	case CBOR_TAG_PERL_OBJECT:
771	{	974	{
772	sv = decode_sv (dec);	975	sv = decode_sv (dec);
773		976
…		…
813	sv = SvREFCNT_inc (POPs);	1016	sv = SvREFCNT_inc (POPs);
814		1017
815	PUTBACK;	1018	PUTBACK;
816		1019
817	FREETMPS; LEAVE;	1020	FREETMPS; LEAVE;
818
819	return sv;
820	}	1021	}
		1022	break;
821		1023
822	default:	1024	default:
823	{	1025	{
824	sv = decode_sv (dec);	1026	sv = decode_sv (dec);
825		1027
		1028	dSP;
		1029	ENTER; SAVETMPS; PUSHMARK (SP);
		1030	EXTEND (SP, 2);
		1031	PUSHs (newSVuv (tag));
		1032	PUSHs (sv);
		1033
		1034	PUTBACK;
		1035	int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY \| G_EVAL);
		1036	SPAGAIN;
		1037
		1038	if (SvTRUE (ERRSV))
		1039	{
		1040	FREETMPS; LEAVE;
		1041	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		1042	}
		1043
		1044	if (count)
		1045	{
		1046	SvREFCNT_dec (sv);
		1047	sv = SvREFCNT_inc (POPs);
		1048	}
		1049	else
		1050	{
826	AV *av = newAV ();	1051	AV *av = newAV ();
827	av_push (av, newSVuv (tag));	1052	av_push (av, newSVuv (tag));
828	av_push (av, sv);	1053	av_push (av, sv);
829		1054
830	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	1055	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
831	? cbor_tagged_stash	1056	? cbor_tagged_stash
832	: gv_stashpv ("CBOR::XS::Tagged" , 1);	1057	: gv_stashpv ("CBOR::XS::Tagged" , 1);
833
834	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);	1058	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
835	}	1059	}
		1060
		1061	PUTBACK;
		1062
		1063	FREETMPS; LEAVE;
		1064	}
		1065	break;
836	}	1066	}
		1067
		1068	return sv;
837		1069
838	fail:	1070	fail:
839	SvREFCNT_dec (sv);	1071	SvREFCNT_dec (sv);
840	return &PL_sv_undef;	1072	return &PL_sv_undef;
841	}	1073	}
…		…
843	static SV *	1075	static SV *
844	decode_sv (dec_t *dec)	1076	decode_sv (dec_t *dec)
845	{	1077	{
846	WANT (1);	1078	WANT (1);
847		1079
848	switch (*dec->cur >> 5)	1080	switch (*dec->cur >> MAJOR_SHIFT)
849	{	1081	{
850	case 0: // unsigned int	1082	case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
851	return newSVuv (decode_uint (dec));	1083	case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
852	case 1: // negative int	1084	case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
853	return newSViv (-1 - (IV)decode_uint (dec));	1085	case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
854	case 2: // octet string	1086	case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
855	return decode_str (dec, 0);	1087	case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
856	case 3: // utf-8 string	1088	case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
857	return decode_str (dec, 1);	1089
858	case 4: // array	1090	case MAJOR_MISC >> MAJOR_SHIFT:
859	return decode_av (dec);
860	case 5: // map
861	return decode_hv (dec);
862	case 6: // tag
863	return decode_tagged (dec);
864	case 7: // misc
865	switch (*dec->cur++ & 31)	1091	switch (*dec->cur++ & MINOR_MASK)
866	{	1092	{
867	case 20:	1093	case SIMPLE_FALSE:
868	#if CBOR_SLOW	1094	#if CBOR_SLOW
869	types_false = get_bool ("Types::Serialiser::false");	1095	types_false = get_bool ("Types::Serialiser::false");
870	#endif	1096	#endif
871	return newSVsv (types_false);	1097	return newSVsv (types_false);
872	case 21:	1098	case SIMPLE_TRUE:
873	#if CBOR_SLOW	1099	#if CBOR_SLOW
874	types_true = get_bool ("Types::Serialiser::true");	1100	types_true = get_bool ("Types::Serialiser::true");
875	#endif	1101	#endif
876	return newSVsv (types_true);	1102	return newSVsv (types_true);
877	case 22:	1103	case SIMPLE_NULL:
878	return newSVsv (&PL_sv_undef);	1104	return newSVsv (&PL_sv_undef);
879	case 23:	1105	case SIMPLE_UNDEF:
880	#if CBOR_SLOW	1106	#if CBOR_SLOW
881	types_error = get_bool ("Types::Serialiser::error");	1107	types_error = get_bool ("Types::Serialiser::error");
882	#endif	1108	#endif
883	return newSVsv (types_error);	1109	return newSVsv (types_error);
884		1110
885	case 25:	1111	case MISC_FLOAT16:
886	{	1112	{
887	WANT (2);	1113	WANT (2);
888		1114
889	uint16_t fp = (dec->cur[0] << 8) \| dec->cur[1];	1115	uint16_t fp = (dec->cur[0] << 8) \| dec->cur[1];
890	dec->cur += 2;	1116	dec->cur += 2;
891		1117
892	return newSVnv (ecb_binary16_to_float (fp));	1118	return newSVnv (ecb_binary16_to_float (fp));
893	}	1119	}
894		1120
895	case 26:	1121	case MISC_FLOAT32:
896	{	1122	{
897	uint32_t fp;	1123	uint32_t fp;
898	WANT (4);	1124	WANT (4);
899	memcpy (&fp, dec->cur, 4);	1125	memcpy (&fp, dec->cur, 4);
900	dec->cur += 4;	1126	dec->cur += 4;
…		…
903	fp = ecb_bswap32 (fp);	1129	fp = ecb_bswap32 (fp);
904		1130
905	return newSVnv (ecb_binary32_to_float (fp));	1131	return newSVnv (ecb_binary32_to_float (fp));
906	}	1132	}
907		1133
908	case 27:	1134	case MISC_FLOAT64:
909	{	1135	{
910	uint64_t fp;	1136	uint64_t fp;
911	WANT (8);	1137	WANT (8);
912	memcpy (&fp, dec->cur, 8);	1138	memcpy (&fp, dec->cur, 8);
913	dec->cur += 8;	1139	dec->cur += 8;
…		…
916	fp = ecb_bswap64 (fp);	1142	fp = ecb_bswap64 (fp);
917		1143
918	return newSVnv (ecb_binary64_to_double (fp));	1144	return newSVnv (ecb_binary64_to_double (fp));
919	}	1145	}
920		1146
921	// 0..19 unassigned	1147	// 0..19 unassigned simple
922	// 24 reserved + unassigned (reserved values are not encodable)	1148	// 24 reserved + unassigned simple (reserved values are not encodable)
		1149	// 28-30 unassigned misc
		1150	// 31 break code
923	default:	1151	default:
924	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");	1152	ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
925	}	1153	}
926		1154
927	break;	1155	break;
928	}	1156	}
929		1157
…		…
956	if (dec.cur != dec.end && !dec.err)	1184	if (dec.cur != dec.end && !dec.err)
957	dec.err = "garbage after CBOR object";	1185	dec.err = "garbage after CBOR object";
958		1186
959	if (dec.err)	1187	if (dec.err)
960	{	1188	{
		1189	if (dec.shareable)
		1190	{
		1191	// need to break cyclic links, which whould all be in shareable
		1192	int i;
		1193	SV **svp;
		1194
		1195	for (i = av_len (dec.shareable) + 1; i--; )
		1196	if ((svp = av_fetch (dec.shareable, i, 0)))
		1197	sv_setsv (*svp, &PL_sv_undef);
		1198	}
		1199
961	SvREFCNT_dec (sv);	1200	SvREFCNT_dec (sv);
962	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);	1201	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);
963	}	1202	}
964		1203
965	sv = sv_2mortal (sv);	1204	sv = sv_2mortal (sv);
966		1205
967	return sv;	1206	return sv;
968	}	1207	}
969		1208
		1209	/////////////////////////////////////////////////////////////////////////////
		1210	// incremental parser
		1211
		1212	#define INCR_DONE(cbor) (AvFILLp (cbor->incr_count) < 0)
		1213
		1214	// returns 0 for notyet, 1 for success or error
		1215	static int
		1216	incr_parse (CBOR self, SV cborstr)
		1217	{
		1218	STRLEN cur;
		1219	SvPV (cborstr, cur);
		1220
		1221	while (ecb_expect_true (self->incr_need <= cur))
		1222	{
		1223	// table of integer count bytes
		1224	static I8 incr_len[MINOR_MASK + 1] = {
		1225	0, 0, 0, 0, 0, 0, 0, 0,
		1226	0, 0, 0, 0, 0, 0, 0, 0,
		1227	0, 0, 0, 0, 0, 0, 0, 0,
		1228	1, 2, 4, 8,-1,-1,-1,-2
		1229	};
		1230
		1231	const U8 *p = SvPVX (cborstr) + self->incr_pos;
		1232	U8 m = *p & MINOR_MASK;
		1233	IV count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
		1234	I8 ilen = incr_len[m];
		1235
		1236	self->incr_need = self->incr_pos + 1;
		1237
		1238	if (ecb_expect_false (ilen < 0))
		1239	{
		1240	if (m != MINOR_INDEF)
		1241	return 1; // error
		1242
		1243	if (*p == (MAJOR_MISC \| MINOR_INDEF))
		1244	{
		1245	if (count >= 0)
		1246	return 1; // error
		1247
		1248	count = 1;
		1249	}
		1250	else
		1251	{
		1252	av_push (self->incr_count, newSViv (-1)); //TODO: nest
		1253	count = -1;
		1254	}
		1255	}
		1256	else
		1257	{
		1258	self->incr_need += ilen;
		1259	if (ecb_expect_false (self->incr_need > cur))
		1260	return 0;
		1261
		1262	int major = *p >> MAJOR_SHIFT;
		1263
		1264	switch (major)
		1265	{
		1266	case MAJOR_BYTES >> MAJOR_SHIFT:
		1267	case MAJOR_TEXT >> MAJOR_SHIFT:
		1268	case MAJOR_ARRAY >> MAJOR_SHIFT:
		1269	case MAJOR_MAP >> MAJOR_SHIFT:
		1270	{
		1271	UV len;
		1272
		1273	if (ecb_expect_false (ilen))
		1274	{
		1275	len = 0;
		1276
		1277	do {
		1278	len = (len << 8) \| *++p;
		1279	} while (--ilen);
		1280	}
		1281	else
		1282	len = m;
		1283
		1284	switch (major)
		1285	{
		1286	case MAJOR_BYTES >> MAJOR_SHIFT:
		1287	case MAJOR_TEXT >> MAJOR_SHIFT:
		1288	self->incr_need += len;
		1289	if (ecb_expect_false (self->incr_need > cur))
		1290	return 0;
		1291
		1292	break;
		1293
		1294	case MAJOR_MAP >> MAJOR_SHIFT:
		1295	len <<= 1;
		1296	case MAJOR_ARRAY >> MAJOR_SHIFT:
		1297	if (len)
		1298	{
		1299	av_push (self->incr_count, newSViv (len + 1)); //TODO: nest
		1300	count = len + 1;
		1301	}
		1302	break;
		1303	}
		1304	}
		1305	}
		1306	}
		1307
		1308	self->incr_pos = self->incr_need;
		1309
		1310	if (count > 0)
		1311	{
		1312	while (!--count)
		1313	{
		1314	if (!AvFILLp (self->incr_count))
		1315	return 1; // done
		1316
		1317	SvREFCNT_dec_NN (av_pop (self->incr_count));
		1318	count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
		1319	}
		1320
		1321	SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]) = count;
		1322	}
		1323	}
		1324
		1325	return 0;
		1326	}
		1327
		1328
970	/////////////////////////////////////////////////////////////////////////////	1329	/////////////////////////////////////////////////////////////////////////////
971	// XS interface functions	1330	// XS interface functions
972		1331
973	MODULE = CBOR::XS PACKAGE = CBOR::XS	1332	MODULE = CBOR::XS PACKAGE = CBOR::XS
974		1333
…		…
981	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);	1340	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
982		1341
983	types_true = get_bool ("Types::Serialiser::true" );	1342	types_true = get_bool ("Types::Serialiser::true" );
984	types_false = get_bool ("Types::Serialiser::false");	1343	types_false = get_bool ("Types::Serialiser::false");
985	types_error = get_bool ("Types::Serialiser::error");	1344	types_error = get_bool ("Types::Serialiser::error");
		1345
		1346	default_filter = newSVpv ("CBOR::XS::default_filter", 0);
986		1347
987	sv_cbor = newSVpv ("CBOR", 0);	1348	sv_cbor = newSVpv ("CBOR", 0);
988	SvREADONLY_on (sv_cbor);	1349	SvREADONLY_on (sv_cbor);
989	}	1350	}
990		1351
…		…
1012	void shrink (CBOR *self, int enable = 1)	1373	void shrink (CBOR *self, int enable = 1)
1013	ALIAS:	1374	ALIAS:
1014	shrink = F_SHRINK	1375	shrink = F_SHRINK
1015	allow_unknown = F_ALLOW_UNKNOWN	1376	allow_unknown = F_ALLOW_UNKNOWN
1016	allow_sharing = F_ALLOW_SHARING	1377	allow_sharing = F_ALLOW_SHARING
1017	dedup_keys = F_DEDUP_KEYS	1378	allow_cycles = F_ALLOW_CYCLES
1018	dedup_strings = F_DEDUP_STRINGS	1379	pack_strings = F_PACK_STRINGS
		1380	validate_utf8 = F_VALIDATE_UTF8
1019	PPCODE:	1381	PPCODE:
1020	{	1382	{
1021	if (enable)	1383	if (enable)
1022	self->flags \|= ix;	1384	self->flags \|= ix;
1023	else	1385	else
…		…
1029	void get_shrink (CBOR *self)	1391	void get_shrink (CBOR *self)
1030	ALIAS:	1392	ALIAS:
1031	get_shrink = F_SHRINK	1393	get_shrink = F_SHRINK
1032	get_allow_unknown = F_ALLOW_UNKNOWN	1394	get_allow_unknown = F_ALLOW_UNKNOWN
1033	get_allow_sharing = F_ALLOW_SHARING	1395	get_allow_sharing = F_ALLOW_SHARING
1034	get_dedup_keys = F_DEDUP_KEYS	1396	get_allow_cycles = F_ALLOW_CYCLES
1035	get_dedup_strings = F_DEDUP_STRINGS	1397	get_pack_strings = F_PACK_STRINGS
		1398	get_validate_utf8 = F_VALIDATE_UTF8
1036	PPCODE:	1399	PPCODE:
1037	XPUSHs (boolSV (self->flags & ix));	1400	XPUSHs (boolSV (self->flags & ix));
1038		1401
1039	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1402	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1040	PPCODE:	1403	PPCODE:
…		…
1053	XPUSHs (ST (0));	1416	XPUSHs (ST (0));
1054		1417
1055	int get_max_size (CBOR *self)	1418	int get_max_size (CBOR *self)
1056	CODE:	1419	CODE:
1057	RETVAL = self->max_size;	1420	RETVAL = self->max_size;
		1421	OUTPUT:
		1422	RETVAL
		1423
		1424	void filter (CBOR self, SV filter = 0)
		1425	PPCODE:
		1426	SvREFCNT_dec (self->filter);
		1427	self->filter = filter ? newSVsv (filter) : filter;
		1428	XPUSHs (ST (0));
		1429
		1430	SV get_filter (CBOR self)
		1431	CODE:
		1432	RETVAL = self->filter ? self->filter : NEWSV (0, 0);
1058	OUTPUT:	1433	OUTPUT:
1059	RETVAL	1434	RETVAL
1060		1435
1061	void encode (CBOR self, SV scalar)	1436	void encode (CBOR self, SV scalar)
1062	PPCODE:	1437	PPCODE:
…		…
1077	EXTEND (SP, 2);	1452	EXTEND (SP, 2);
1078	PUSHs (sv);	1453	PUSHs (sv);
1079	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1454	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1080	}	1455	}
1081		1456
		1457	void incr_parse (CBOR self, SV cborstr)
		1458	ALIAS:
		1459	incr_parse_multiple = 1
		1460	PPCODE:
		1461	{
		1462	if (SvUTF8 (cborstr))
		1463	sv_utf8_downgrade (cborstr, 0);
		1464
		1465	if (!self->incr_count)
		1466	{
		1467	self->incr_count = newAV ();
		1468	self->incr_pos = 0;
		1469	self->incr_need = 1;
		1470
		1471	av_push (self->incr_count, newSViv (1));
		1472	}
		1473
		1474	do
		1475	{
		1476	if (!incr_parse (self, cborstr))
		1477	{
		1478	if (self->incr_need > self->max_size && self->max_size)
		1479	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
		1480	(unsigned long)self->incr_need, (unsigned long)self->max_size);
		1481
		1482	break;
		1483	}
		1484
		1485	SV *sv;
		1486	char *offset;
		1487
		1488	PUTBACK; sv = decode_cbor (cborstr, self, &offset); SPAGAIN;
		1489	XPUSHs (sv);
		1490
		1491	sv_chop (cborstr, offset);
		1492
		1493	av_clear (self->incr_count);
		1494	av_push (self->incr_count, newSViv (1));
		1495
		1496	self->incr_pos = 0;
		1497	self->incr_need = self->incr_pos + 1;
		1498	}
		1499	while (ix);
		1500	}
		1501
		1502	void incr_reset (CBOR *self)
		1503	CODE:
		1504	{
		1505	SvREFCNT_dec (self->incr_count);
		1506	self->incr_count = 0;
		1507	}
		1508
		1509	void DESTROY (CBOR *self)
		1510	PPCODE:
		1511	cbor_free (self);
		1512
1082	PROTOTYPES: ENABLE	1513	PROTOTYPES: ENABLE
1083		1514
1084	void encode_cbor (SV *scalar)	1515	void encode_cbor (SV *scalar)
		1516	ALIAS:
		1517	encode_cbor = 0
		1518	encode_cbor_sharing = F_ALLOW_SHARING
1085	PPCODE:	1519	PPCODE:
1086	{	1520	{
1087	CBOR cbor;	1521	CBOR cbor;
1088	cbor_init (&cbor);	1522	cbor_init (&cbor);
		1523	cbor.flags \|= ix;
1089	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;	1524	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
1090	XPUSHs (scalar);	1525	XPUSHs (scalar);
1091	}	1526	}
1092		1527
1093	void decode_cbor (SV *cborstr)	1528	void decode_cbor (SV *cborstr)

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.19 by root, Wed Nov 20 02:03:09 2013 UTC vs. Revision 1.45 by root, Sun Dec 14 05:48:39 2014 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.19 by root, Wed Nov 20 02:03:09 2013 UTC vs.
Revision 1.45 by root, Sun Dec 14 05:48:39 2014 UTC