/* pp_pack.c
*
* Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- * 2000, 2001, 2002, 2003, by Larry Wall and others
+ * 2000, 2001, 2002, 2003, 2004, 2005, by Larry Wall and others
*
* You may distribute under the terms of either the GNU General Public
* License or the Artistic License, as specified in the README file.
* some salt.
*/
+/* This file contains pp ("push/pop") functions that
+ * execute the opcodes that make up a perl program. A typical pp function
+ * expects to find its arguments on the stack, and usually pushes its
+ * results onto the stack, hence the 'pp' terminology. Each OP structure
+ * contains a pointer to the relevant pp_foo() function.
+ *
+ * This particular file just contains pp_pack() and pp_unpack(). See the
+ * other pp*.c files for the rest of the pp_ functions.
+ */
+
+
#include "EXTERN.h"
#define PERL_IN_PP_PACK_C
#include "perl.h"
-/*
- * The compiler on Concurrent CX/UX systems has a subtle bug which only
- * seems to show up when compiling pp.c - it generates the wrong double
- * precision constant value for (double)UV_MAX when used inline in the body
- * of the code below, so this makes a static variable up front (which the
- * compiler seems to get correct) and uses it in place of UV_MAX below.
- */
-#ifdef CXUX_BROKEN_CONSTANT_CONVERT
-static double UV_MAX_cxux = ((double)UV_MAX);
+#if PERL_VERSION >= 9
+#define PERL_PACK_CAN_BYTEORDER
+#define PERL_PACK_CAN_SHRIEKSIGN
#endif
/*
/* CROSSCOMPILE and MULTIARCH are going to affect pp_pack() and pp_unpack().
--jhi Feb 1999 */
-#if SHORTSIZE != SIZE16 || LONGSIZE != SIZE32
-# define PERL_NATINT_PACK
-#endif
-
-#if LONGSIZE > 4 && defined(_CRAY)
-# if BYTEORDER == 0x12345678
+#if U16SIZE > SIZE16 || U32SIZE > SIZE32
+# if BYTEORDER == 0x1234 || BYTEORDER == 0x12345678 /* little-endian */
# define OFF16(p) (char*)(p)
# define OFF32(p) (char*)(p)
# else
-# if BYTEORDER == 0x87654321
+# if BYTEORDER == 0x4321 || BYTEORDER == 0x87654321 /* big-endian */
# define OFF16(p) ((char*)(p) + (sizeof(U16) - SIZE16))
# define OFF32(p) ((char*)(p) + (sizeof(U32) - SIZE32))
# else
/* Avoid stack overflow due to pathological templates. 100 should be plenty. */
#define MAX_SUB_TEMPLATE_LEVEL 100
-/* flags */
+/* flags (note that type modifiers can also be used as flags!) */
#define FLAG_UNPACK_ONLY_ONE 0x10
#define FLAG_UNPACK_DO_UTF8 0x08
#define FLAG_SLASH 0x04
#define ISUUCHAR(ch) (memchr(PL_uuemap, (ch), sizeof(PL_uuemap)-1) || (ch) == ' ')
#endif
+/* type modifiers */
#define TYPE_IS_SHRIEKING 0x100
+#define TYPE_IS_BIG_ENDIAN 0x200
+#define TYPE_IS_LITTLE_ENDIAN 0x400
+#define TYPE_ENDIANNESS_MASK (TYPE_IS_BIG_ENDIAN|TYPE_IS_LITTLE_ENDIAN)
+#define TYPE_MODIFIERS(t) ((t) & ~0xFF)
+#define TYPE_NO_MODIFIERS(t) ((t) & 0xFF)
+
+#ifdef PERL_PACK_CAN_SHRIEKSIGN
+#define SHRIEKING_ALLOWED_TYPES "sSiIlLxXnNvV"
+#else
+#define SHRIEKING_ALLOWED_TYPES "sSiIlLxX"
+#endif
+
+#ifndef PERL_PACK_CAN_BYTEORDER
+/* Put "can't" first because it is shorter */
+# define TYPE_ENDIANNESS(t) 0
+# define TYPE_NO_ENDIANNESS(t) (t)
+
+# define ENDIANNESS_ALLOWED_TYPES ""
+
+# define DO_BO_UNPACK(var, type)
+# define DO_BO_PACK(var, type)
+# define DO_BO_UNPACK_PTR(var, type, pre_cast)
+# define DO_BO_PACK_PTR(var, type, pre_cast)
+# define DO_BO_UNPACK_N(var, type)
+# define DO_BO_PACK_N(var, type)
+# define DO_BO_UNPACK_P(var)
+# define DO_BO_PACK_P(var)
+
+#else
+
+# define TYPE_ENDIANNESS(t) ((t) & TYPE_ENDIANNESS_MASK)
+# define TYPE_NO_ENDIANNESS(t) ((t) & ~TYPE_ENDIANNESS_MASK)
+
+# define ENDIANNESS_ALLOWED_TYPES "sSiIlLqQjJfFdDpP("
+
+# define DO_BO_UNPACK(var, type) \
+ STMT_START { \
+ switch (TYPE_ENDIANNESS(datumtype)) { \
+ case TYPE_IS_BIG_ENDIAN: var = my_betoh ## type (var); break; \
+ case TYPE_IS_LITTLE_ENDIAN: var = my_letoh ## type (var); break; \
+ default: break; \
+ } \
+ } STMT_END
+
+# define DO_BO_PACK(var, type) \
+ STMT_START { \
+ switch (TYPE_ENDIANNESS(datumtype)) { \
+ case TYPE_IS_BIG_ENDIAN: var = my_htobe ## type (var); break; \
+ case TYPE_IS_LITTLE_ENDIAN: var = my_htole ## type (var); break; \
+ default: break; \
+ } \
+ } STMT_END
+
+# define DO_BO_UNPACK_PTR(var, type, pre_cast) \
+ STMT_START { \
+ switch (TYPE_ENDIANNESS(datumtype)) { \
+ case TYPE_IS_BIG_ENDIAN: \
+ var = (void *) my_betoh ## type ((pre_cast) var); \
+ break; \
+ case TYPE_IS_LITTLE_ENDIAN: \
+ var = (void *) my_letoh ## type ((pre_cast) var); \
+ break; \
+ default: \
+ break; \
+ } \
+ } STMT_END
+
+# define DO_BO_PACK_PTR(var, type, pre_cast) \
+ STMT_START { \
+ switch (TYPE_ENDIANNESS(datumtype)) { \
+ case TYPE_IS_BIG_ENDIAN: \
+ var = (void *) my_htobe ## type ((pre_cast) var); \
+ break; \
+ case TYPE_IS_LITTLE_ENDIAN: \
+ var = (void *) my_htole ## type ((pre_cast) var); \
+ break; \
+ default: \
+ break; \
+ } \
+ } STMT_END
+
+# define BO_CANT_DOIT(action, type) \
+ STMT_START { \
+ switch (TYPE_ENDIANNESS(datumtype)) { \
+ case TYPE_IS_BIG_ENDIAN: \
+ Perl_croak(aTHX_ "Can't %s big-endian %ss on this " \
+ "platform", #action, #type); \
+ break; \
+ case TYPE_IS_LITTLE_ENDIAN: \
+ Perl_croak(aTHX_ "Can't %s little-endian %ss on this " \
+ "platform", #action, #type); \
+ break; \
+ default: \
+ break; \
+ } \
+ } STMT_END
+
+# if PTRSIZE == INTSIZE
+# define DO_BO_UNPACK_P(var) DO_BO_UNPACK_PTR(var, i, int)
+# define DO_BO_PACK_P(var) DO_BO_PACK_PTR(var, i, int)
+# elif PTRSIZE == LONGSIZE
+# define DO_BO_UNPACK_P(var) DO_BO_UNPACK_PTR(var, l, long)
+# define DO_BO_PACK_P(var) DO_BO_PACK_PTR(var, l, long)
+# else
+# define DO_BO_UNPACK_P(var) BO_CANT_DOIT(unpack, pointer)
+# define DO_BO_PACK_P(var) BO_CANT_DOIT(pack, pointer)
+# endif
+
+# if defined(my_htolen) && defined(my_letohn) && \
+ defined(my_htoben) && defined(my_betohn)
+# define DO_BO_UNPACK_N(var, type) \
+ STMT_START { \
+ switch (TYPE_ENDIANNESS(datumtype)) { \
+ case TYPE_IS_BIG_ENDIAN: my_betohn(&var, sizeof(type)); break;\
+ case TYPE_IS_LITTLE_ENDIAN: my_letohn(&var, sizeof(type)); break;\
+ default: break; \
+ } \
+ } STMT_END
+
+# define DO_BO_PACK_N(var, type) \
+ STMT_START { \
+ switch (TYPE_ENDIANNESS(datumtype)) { \
+ case TYPE_IS_BIG_ENDIAN: my_htoben(&var, sizeof(type)); break;\
+ case TYPE_IS_LITTLE_ENDIAN: my_htolen(&var, sizeof(type)); break;\
+ default: break; \
+ } \
+ } STMT_END
+# else
+# define DO_BO_UNPACK_N(var, type) BO_CANT_DOIT(unpack, type)
+# define DO_BO_PACK_N(var, type) BO_CANT_DOIT(pack, type)
+# endif
+
+#endif
+
+#define PACK_SIZE_CANNOT_CSUM 0x80
+#define PACK_SIZE_SPARE 0x40
+#define PACK_SIZE_MASK 0x3F
+
+
+struct packsize_t {
+ const unsigned char *array;
+ int first;
+ int size;
+};
+
+#define PACK_SIZE_NORMAL 0
+#define PACK_SIZE_SHRIEKING 1
+
+/* These tables are regenerated by genpacksizetables.pl (and then hand pasted
+ in). You're unlikely ever to need to regenerate them. */
+#if 'J'-'I' == 1
+/* ASCII */
+unsigned char size_normal[53] = {
+ /* C */ sizeof(unsigned char),
+#if defined(HAS_LONG_DOUBLE) && defined(USE_LONG_DOUBLE)
+ /* D */ LONG_DOUBLESIZE,
+#else
+ 0,
+#endif
+ 0,
+ /* F */ NVSIZE,
+ 0, 0,
+ /* I */ sizeof(unsigned int),
+ /* J */ UVSIZE,
+ 0,
+ /* L */ SIZE32,
+ 0,
+ /* N */ SIZE32,
+ 0, 0,
+#if defined(HAS_QUAD)
+ /* Q */ sizeof(Uquad_t),
+#else
+ 0,
+#endif
+ 0,
+ /* S */ SIZE16,
+ 0,
+ /* U */ sizeof(char),
+ /* V */ SIZE32,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ /* c */ sizeof(char),
+ /* d */ sizeof(double),
+ 0,
+ /* f */ sizeof(float),
+ 0, 0,
+ /* i */ sizeof(int),
+ /* j */ IVSIZE,
+ 0,
+ /* l */ SIZE32,
+ 0,
+ /* n */ SIZE16,
+ 0,
+ /* p */ sizeof(char *) | PACK_SIZE_CANNOT_CSUM,
+#if defined(HAS_QUAD)
+ /* q */ sizeof(Quad_t),
+#else
+ 0,
+#endif
+ 0,
+ /* s */ SIZE16,
+ 0, 0,
+ /* v */ SIZE16,
+ /* w */ sizeof(char) | PACK_SIZE_CANNOT_CSUM,
+};
+unsigned char size_shrieking[46] = {
+ /* I */ sizeof(unsigned int),
+ 0, 0,
+ /* L */ sizeof(unsigned long),
+ 0,
+#if defined(PERL_PACK_CAN_SHRIEKSIGN)
+ /* N */ SIZE32,
+#else
+ 0,
+#endif
+ 0, 0, 0, 0,
+ /* S */ sizeof(unsigned short),
+ 0, 0,
+#if defined(PERL_PACK_CAN_SHRIEKSIGN)
+ /* V */ SIZE32,
+#else
+ 0,
+#endif
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ /* i */ sizeof(int),
+ 0, 0,
+ /* l */ sizeof(long),
+ 0,
+#if defined(PERL_PACK_CAN_SHRIEKSIGN)
+ /* n */ SIZE16,
+#else
+ 0,
+#endif
+ 0, 0, 0, 0,
+ /* s */ sizeof(short),
+ 0, 0,
+#if defined(PERL_PACK_CAN_SHRIEKSIGN)
+ /* v */ SIZE16
+#else
+ 0
+#endif
+};
+struct packsize_t packsize[2] = {
+ {size_normal, 67, 53},
+ {size_shrieking, 73, 46}
+};
+#else
+/* EBCDIC (or bust) */
+unsigned char size_normal[99] = {
+ /* c */ sizeof(char),
+ /* d */ sizeof(double),
+ 0,
+ /* f */ sizeof(float),
+ 0, 0,
+ /* i */ sizeof(int),
+ 0, 0, 0, 0, 0, 0, 0,
+ /* j */ IVSIZE,
+ 0,
+ /* l */ SIZE32,
+ 0,
+ /* n */ SIZE16,
+ 0,
+ /* p */ sizeof(char *) | PACK_SIZE_CANNOT_CSUM,
+#if defined(HAS_QUAD)
+ /* q */ sizeof(Quad_t),
+#else
+ 0,
+#endif
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ /* s */ SIZE16,
+ 0, 0,
+ /* v */ SIZE16,
+ /* w */ sizeof(char) | PACK_SIZE_CANNOT_CSUM,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,
+ /* C */ sizeof(unsigned char),
+#if defined(HAS_LONG_DOUBLE) && defined(USE_LONG_DOUBLE)
+ /* D */ LONG_DOUBLESIZE,
+#else
+ 0,
+#endif
+ 0,
+ /* F */ NVSIZE,
+ 0, 0,
+ /* I */ sizeof(unsigned int),
+ 0, 0, 0, 0, 0, 0, 0,
+ /* J */ UVSIZE,
+ 0,
+ /* L */ SIZE32,
+ 0,
+ /* N */ SIZE32,
+ 0, 0,
+#if defined(HAS_QUAD)
+ /* Q */ sizeof(Uquad_t),
+#else
+ 0,
+#endif
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ /* S */ SIZE16,
+ 0,
+ /* U */ sizeof(char),
+ /* V */ SIZE32,
+};
+unsigned char size_shrieking[93] = {
+ /* i */ sizeof(int),
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ /* l */ sizeof(long),
+ 0,
+#if defined(PERL_PACK_CAN_SHRIEKSIGN)
+ /* n */ SIZE16,
+#else
+ 0,
+#endif
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ /* s */ sizeof(short),
+ 0, 0,
+#if defined(PERL_PACK_CAN_SHRIEKSIGN)
+ /* v */ SIZE16,
+#else
+ 0,
+#endif
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ /* I */ sizeof(unsigned int),
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ /* L */ sizeof(unsigned long),
+ 0,
+#if defined(PERL_PACK_CAN_SHRIEKSIGN)
+ /* N */ SIZE32,
+#else
+ 0,
+#endif
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ /* S */ sizeof(unsigned short),
+ 0, 0,
+#if defined(PERL_PACK_CAN_SHRIEKSIGN)
+ /* V */ SIZE32
+#else
+ 0
+#endif
+};
+struct packsize_t packsize[2] = {
+ {size_normal, 131, 99},
+ {size_shrieking, 137, 93}
+};
+#endif
+
/* Returns the sizeof() struct described by pat */
STATIC I32
register int size;
while (next_symbol(symptr)) {
+ int which = (symptr->code & TYPE_IS_SHRIEKING)
+ ? PACK_SIZE_SHRIEKING : PACK_SIZE_NORMAL;
+ int offset
+ = TYPE_NO_MODIFIERS(symptr->code) - packsize[which].first;
switch( symptr->howlen ){
case e_no_len:
break;
}
- switch(symptr->code) {
- default:
- Perl_croak(aTHX_ "Invalid type '%c' in %s",
- (int)symptr->code,
- symptr->flags & FLAG_PACK ? "pack" : "unpack" );
- case '@':
- case '/':
- case 'U': /* XXXX Is it correct? */
- case 'w':
- case 'u':
- Perl_croak(aTHX_ "Within []-length '%c' not allowed in %s",
- (int)symptr->code,
- symptr->flags & FLAG_PACK ? "pack" : "unpack" );
- case '%':
+ if ((offset >= 0) && (offset < packsize[which].size))
+ size = packsize[which].array[offset] & PACK_SIZE_MASK;
+ else
size = 0;
- break;
- case '(':
- {
- tempsym_t savsym = *symptr;
- symptr->patptr = savsym.grpbeg;
- symptr->patend = savsym.grpend;
- /* XXXX Theoretically, we need to measure many times at different
- positions, since the subexpression may contain
- alignment commands, but be not of aligned length.
- Need to detect this and croak(). */
- size = measure_struct(symptr);
- *symptr = savsym;
- break;
- }
- case 'X' | TYPE_IS_SHRIEKING:
- /* XXXX Is this useful? Then need to treat MEASURE_BACKWARDS. */
- if (!len) /* Avoid division by 0 */
- len = 1;
- len = total % len; /* Assumed: the start is aligned. */
- /* FALL THROUGH */
- case 'X':
- size = -1;
- if (total < len)
- Perl_croak(aTHX_ "'X' outside of string in %s",
- symptr->flags & FLAG_PACK ? "pack" : "unpack" );
- break;
- case 'x' | TYPE_IS_SHRIEKING:
- if (!len) /* Avoid division by 0 */
- len = 1;
- star = total % len; /* Assumed: the start is aligned. */
- if (star) /* Other portable ways? */
- len = len - star;
- else
- len = 0;
- /* FALL THROUGH */
- case 'x':
- case 'A':
- case 'Z':
- case 'a':
- case 'c':
- case 'C':
- size = 1;
- break;
- case 'B':
- case 'b':
- len = (len + 7)/8;
- size = 1;
- break;
- case 'H':
- case 'h':
- len = (len + 1)/2;
- size = 1;
- break;
- case 's' | TYPE_IS_SHRIEKING:
-#if SHORTSIZE != SIZE16
- size = sizeof(short);
- break;
-#else
- /* FALL THROUGH */
-#endif
- case 's':
- size = SIZE16;
- break;
- case 'S' | TYPE_IS_SHRIEKING:
-#if SHORTSIZE != SIZE16
- size = sizeof(unsigned short);
- break;
-#else
- /* FALL THROUGH */
-#endif
- case 'v':
- case 'n':
- case 'S':
- size = SIZE16;
- break;
- case 'i' | TYPE_IS_SHRIEKING:
- case 'i':
- size = sizeof(int);
- break;
- case 'I' | TYPE_IS_SHRIEKING:
- case 'I':
- size = sizeof(unsigned int);
- break;
- case 'j':
- size = IVSIZE;
- break;
- case 'J':
- size = UVSIZE;
- break;
- case 'l' | TYPE_IS_SHRIEKING:
-#if LONGSIZE != SIZE32
- size = sizeof(long);
- break;
-#else
- /* FALL THROUGH */
-#endif
- case 'l':
- size = SIZE32;
- break;
- case 'L' | TYPE_IS_SHRIEKING:
-#if LONGSIZE != SIZE32
- size = sizeof(unsigned long);
- break;
-#else
- /* FALL THROUGH */
-#endif
- case 'V':
- case 'N':
- case 'L':
- size = SIZE32;
- break;
- case 'P':
- len = 1;
- /* FALL THROUGH */
- case 'p':
- size = sizeof(char*);
- break;
-#ifdef HAS_QUAD
- case 'q':
- size = sizeof(Quad_t);
- break;
- case 'Q':
- size = sizeof(Uquad_t);
- break;
-#endif
- case 'f':
- size = sizeof(float);
- break;
- case 'd':
- size = sizeof(double);
- break;
- case 'F':
- size = NVSIZE;
- break;
-#if defined(HAS_LONG_DOUBLE) && defined(USE_LONG_DOUBLE)
- case 'D':
- size = LONG_DOUBLESIZE;
- break;
-#endif
+
+ if (!size) {
+ /* endianness doesn't influence the size of a type */
+ switch(TYPE_NO_ENDIANNESS(symptr->code)) {
+ default:
+ Perl_croak(aTHX_ "Invalid type '%c' in %s",
+ (int)TYPE_NO_MODIFIERS(symptr->code),
+ symptr->flags & FLAG_PACK ? "pack" : "unpack" );
+ case '@':
+ case '/':
+ case 'U': /* XXXX Is it correct? */
+ case 'w':
+ case 'u':
+ Perl_croak(aTHX_ "Within []-length '%c' not allowed in %s",
+ (int)symptr->code,
+ symptr->flags & FLAG_PACK ? "pack" : "unpack" );
+ case '%':
+ size = 0;
+ break;
+ case '(':
+ {
+ tempsym_t savsym = *symptr;
+ symptr->patptr = savsym.grpbeg;
+ symptr->patend = savsym.grpend;
+ /* XXXX Theoretically, we need to measure many times at
+ different positions, since the subexpression may contain
+ alignment commands, but be not of aligned length.
+ Need to detect this and croak(). */
+ size = measure_struct(symptr);
+ *symptr = savsym;
+ break;
+ }
+ case 'X' | TYPE_IS_SHRIEKING:
+ /* XXXX Is this useful? Then need to treat MEASURE_BACKWARDS.
+ */
+ if (!len) /* Avoid division by 0 */
+ len = 1;
+ len = total % len; /* Assumed: the start is aligned. */
+ /* FALL THROUGH */
+ case 'X':
+ size = -1;
+ if (total < len)
+ Perl_croak(aTHX_ "'X' outside of string in %s",
+ symptr->flags & FLAG_PACK ? "pack" : "unpack" );
+ break;
+ case 'x' | TYPE_IS_SHRIEKING:
+ if (!len) /* Avoid division by 0 */
+ len = 1;
+ star = total % len; /* Assumed: the start is aligned. */
+ if (star) /* Other portable ways? */
+ len = len - star;
+ else
+ len = 0;
+ /* FALL THROUGH */
+ case 'x':
+ case 'A':
+ case 'Z':
+ case 'a':
+ case 'c':
+ case 'C':
+ size = 1;
+ break;
+ case 'B':
+ case 'b':
+ len = (len + 7)/8;
+ size = 1;
+ break;
+ case 'H':
+ case 'h':
+ len = (len + 1)/2;
+ size = 1;
+ break;
+
+ case 'P':
+ len = 1;
+ size = sizeof(char*);
+ break;
+ }
}
total += len * size;
}
} else {
/* We should have found a template code */
I32 code = *patptr++ & 0xFF;
+ U32 inherited_modifiers = 0;
if (code == ','){ /* grandfather in commas but with a warning */
if (((symptr->flags & FLAG_COMMA) == 0) && ckWARN(WARN_UNPACK)){
symptr->flags & FLAG_PACK ? "pack" : "unpack" );
}
- /* test for '!' modifier */
- if (patptr < patend && *patptr == '!') {
- static const char natstr[] = "sSiIlLxX";
- patptr++;
- if (strchr(natstr, code))
- code |= TYPE_IS_SHRIEKING;
- else
- Perl_croak(aTHX_ "'!' allowed only after types %s in %s",
- natstr, symptr->flags & FLAG_PACK ? "pack" : "unpack" );
+ /* look for group modifiers to inherit */
+ if (TYPE_ENDIANNESS(symptr->flags)) {
+ if (strchr(ENDIANNESS_ALLOWED_TYPES, TYPE_NO_MODIFIERS(code)))
+ inherited_modifiers |= TYPE_ENDIANNESS(symptr->flags);
}
+ /* look for modifiers */
+ while (patptr < patend) {
+ const char *allowed;
+ I32 modifier = 0;
+ switch (*patptr) {
+ case '!':
+ modifier = TYPE_IS_SHRIEKING;
+ allowed = SHRIEKING_ALLOWED_TYPES;
+ break;
+#ifdef PERL_PACK_CAN_BYTEORDER
+ case '>':
+ modifier = TYPE_IS_BIG_ENDIAN;
+ allowed = ENDIANNESS_ALLOWED_TYPES;
+ break;
+ case '<':
+ modifier = TYPE_IS_LITTLE_ENDIAN;
+ allowed = ENDIANNESS_ALLOWED_TYPES;
+ break;
+#endif
+ default:
+ break;
+ }
+
+ if (modifier == 0)
+ break;
+
+ if (!strchr(allowed, TYPE_NO_MODIFIERS(code)))
+ Perl_croak(aTHX_ "'%c' allowed only after types %s in %s", *patptr,
+ allowed, symptr->flags & FLAG_PACK ? "pack" : "unpack" );
+
+ if (TYPE_ENDIANNESS(code | modifier) == TYPE_ENDIANNESS_MASK)
+ Perl_croak(aTHX_ "Can't use both '<' and '>' after type '%c' in %s",
+ (int) TYPE_NO_MODIFIERS(code),
+ symptr->flags & FLAG_PACK ? "pack" : "unpack" );
+ else if (TYPE_ENDIANNESS(code | modifier | inherited_modifiers) ==
+ TYPE_ENDIANNESS_MASK)
+ Perl_croak(aTHX_ "Can't use '%c' in a group with different byte-order in %s",
+ *patptr, symptr->flags & FLAG_PACK ? "pack" : "unpack" );
+
+ if (ckWARN(WARN_UNPACK)) {
+ if (code & modifier)
+ Perl_warner(aTHX_ packWARN(WARN_UNPACK),
+ "Duplicate modifier '%c' after '%c' in %s",
+ *patptr, (int) TYPE_NO_MODIFIERS(code),
+ symptr->flags & FLAG_PACK ? "pack" : "unpack" );
+ }
+
+ code |= modifier;
+ patptr++;
+ }
+
+ /* inherit modifiers */
+ code |= inherited_modifiers;
+
/* look for count and/or / */
if (patptr < patend) {
if (isDIGIT(*patptr)) {
if (patptr < patend)
patptr++;
} else {
- if( *patptr == '/' ){
+ if (*patptr == '/') {
symptr->flags |= FLAG_SLASH;
patptr++;
- if( patptr < patend &&
- (isDIGIT(*patptr) || *patptr == '*' || *patptr == '[') )
+ if (patptr < patend &&
+ (isDIGIT(*patptr) || *patptr == '*' || *patptr == '['))
Perl_croak(aTHX_ "'/' does not take a repeat count in %s",
symptr->flags & FLAG_PACK ? "pack" : "unpack" );
}
/*
=for apidoc unpackstring
-The engine implementing unpack() Perl function.
+The engine implementing unpack() Perl function. C<unpackstring> puts the
+extracted list items on the stack and returns the number of elements.
+Issue C<PUTBACK> before and C<SPAGAIN> after the call to this function.
=cut */
howlen_t howlen;
/* These must not be in registers: */
- short ashort;
- int aint;
- long along;
+ I16 ai16;
+ U16 au16;
+ I32 ai32;
+ U32 au32;
#ifdef HAS_QUAD
Quad_t aquad;
+ Uquad_t auquad;
+#endif
+#if SHORTSIZE != SIZE16
+ short ashort;
+ unsigned short aushort;
#endif
- U16 aushort;
+ int aint;
unsigned int auint;
- U32 aulong;
-#ifdef HAS_QUAD
- Uquad_t auquad;
+ long along;
+#if LONGSIZE != SIZE32
+ unsigned long aulong;
#endif
char *aptr;
float afloat;
double adouble;
+#if defined(HAS_LONG_DOUBLE) && defined(USE_LONG_DOUBLE)
+ long double aldouble;
+#endif
+ IV aiv;
+ UV auv;
+ NV anv;
+
I32 checksum = 0;
UV cuv = 0;
NV cdouble = 0.0;
const int bits_in_uv = 8 * sizeof(cuv);
char* strrelbeg = s;
bool beyond = FALSE;
+ bool explicit_length;
bool unpack_only_one = (symptr->flags & FLAG_UNPACK_ONLY_ONE) != 0;
- IV aiv;
- UV auv;
- NV anv;
-#if defined(HAS_LONG_DOUBLE) && defined(USE_LONG_DOUBLE)
- long double aldouble;
-#endif
-
while (next_symbol(symptr)) {
datumtype = symptr->code;
/* do first one only unless in list context
break;
}
+ explicit_length = TRUE;
redo_switch:
beyond = s >= strend;
- switch(datumtype) {
+ {
+ int which = (symptr->code & TYPE_IS_SHRIEKING)
+ ? PACK_SIZE_SHRIEKING : PACK_SIZE_NORMAL;
+ const int rawtype = TYPE_NO_MODIFIERS(datumtype);
+ int offset = rawtype - packsize[which].first;
+
+ if (offset >= 0 && offset < packsize[which].size) {
+ /* Data about this template letter */
+ unsigned char data = packsize[which].array[offset];
+
+ if (data) {
+ /* data nonzero means we can process this letter. */
+ long size = data & PACK_SIZE_MASK;
+ long howmany = (strend - s) / size;
+ if (len > howmany)
+ len = howmany;
+
+ /* In the old code, 'p' was the only type without shortcut
+ code to curtail unpacking to only one. As far as I can
+ see the only point of retaining this anomaly is to make
+ code such as $_ = unpack "p2", pack "pI", "Hi", 2
+ continue to segfault. ie, it probably should be
+ construed as a bug.
+ */
+
+ if (!checksum || (data & PACK_SIZE_CANNOT_CSUM)) {
+ if (len && unpack_only_one &&
+ rawtype != 'p')
+ len = 1;
+ EXTEND(SP, len);
+ EXTEND_MORTAL(len);
+ }
+ }
+ }
+ }
+ switch(TYPE_NO_ENDIANNESS(datumtype)) {
default:
- Perl_croak(aTHX_ "Invalid type '%c' in unpack", (int)datumtype );
+ Perl_croak(aTHX_ "Invalid type '%c' in unpack", (int)TYPE_NO_MODIFIERS(datumtype) );
case '%':
if (howlen == e_no_len)
{
char *ss = s; /* Move from register */
tempsym_t savsym = *symptr;
+ U32 group_modifiers = TYPE_MODIFIERS(datumtype & ~symptr->flags);
+ symptr->flags |= group_modifiers;
symptr->patend = savsym.grpend;
symptr->level++;
PUTBACK;
while (len--) {
symptr->patptr = savsym.grpbeg;
unpack_rec(symptr, ss, strbeg, strend, &ss );
+ if (savsym.flags & FLAG_UNPACK_DO_UTF8)
+ symptr->flags |= FLAG_UNPACK_DO_UTF8;
+ else
+ symptr->flags &= ~FLAG_UNPACK_DO_UTF8;
if (ss == strend && savsym.howlen == e_star)
break; /* No way to continue */
}
SPAGAIN;
s = ss;
+ symptr->flags &= ~group_modifiers;
savsym.flags = symptr->flags;
*symptr = savsym;
break;
len = strend - s;
if (checksum)
goto uchar_checksum;
- sv = NEWSV(35, len);
- sv_setpvn(sv, s, len);
+ sv = newSVpvn(s, len);
if (len > 0 && (datumtype == 'A' || datumtype == 'Z')) {
aptr = s; /* borrow register */
if (datumtype == 'Z') { /* 'Z' strips stuff after first null */
len -= 8;
}
if (len) {
- bits = *s;
+ bits = *s++;
if (datumtype == 'b') {
while (len-- > 0) {
if (bits & 1) cuv++;
XPUSHs(sv_2mortal(sv));
break;
case 'c':
- if (len > strend - s)
- len = strend - s;
- if (checksum) {
- while (len-- > 0) {
- aint = *s++;
- if (aint >= 128) /* fake up signed chars */
- aint -= 256;
- if (checksum > bits_in_uv)
- cdouble += (NV)aint;
- else
- cuv += aint;
- }
- }
- else {
- if (len && unpack_only_one)
- len = 1;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
- while (len-- > 0) {
- aint = *s++;
- if (aint >= 128) /* fake up signed chars */
- aint -= 256;
- sv = NEWSV(36, 0);
- sv_setiv(sv, (IV)aint);
- PUSHs(sv_2mortal(sv));
- }
+ while (len-- > 0) {
+ aint = *s++;
+ if (aint >= 128) /* fake up signed chars */
+ aint -= 256;
+ if (!checksum) {
+ PUSHs(sv_2mortal(newSViv((IV)aint)));
+ }
+ else if (checksum > bits_in_uv)
+ cdouble += (NV)aint;
+ else
+ cuv += aint;
}
break;
case 'C':
unpack_C: /* unpack U will jump here if not UTF-8 */
if (len == 0) {
- symptr->flags &= ~FLAG_UNPACK_DO_UTF8;
+ if (explicit_length)
+ symptr->flags &= ~FLAG_UNPACK_DO_UTF8;
break;
}
- if (len > strend - s)
- len = strend - s;
if (checksum) {
uchar_checksum:
while (len-- > 0) {
auint = *s++ & 255;
- cuv += auint;
+ if (checksum > bits_in_uv)
+ cdouble += (NV)auint;
+ else
+ cuv += auint;
}
}
else {
- if (len && unpack_only_one)
- len = 1;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
while (len-- > 0) {
auint = *s++ & 255;
- sv = NEWSV(37, 0);
- sv_setiv(sv, (IV)auint);
- PUSHs(sv_2mortal(sv));
+ PUSHs(sv_2mortal(newSViv((IV)auint)));
}
}
break;
case 'U':
if (len == 0) {
- symptr->flags |= FLAG_UNPACK_DO_UTF8;
+ if (explicit_length)
+ symptr->flags |= FLAG_UNPACK_DO_UTF8;
break;
}
if ((symptr->flags & FLAG_UNPACK_DO_UTF8) == 0)
goto unpack_C;
- if (len > strend - s)
- len = strend - s;
- if (checksum) {
- while (len-- > 0 && s < strend) {
- STRLEN alen;
- auint = NATIVE_TO_UNI(utf8n_to_uvchr((U8*)s, strend - s, &alen, ckWARN(WARN_UTF8) ? 0 : UTF8_ALLOW_ANYUV));
- along = alen;
- s += along;
- if (checksum > bits_in_uv)
- cdouble += (NV)auint;
- else
- cuv += auint;
- }
- }
- else {
- if (len && unpack_only_one)
- len = 1;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
- while (len-- > 0 && s < strend) {
- STRLEN alen;
- auint = NATIVE_TO_UNI(utf8n_to_uvchr((U8*)s, strend - s, &alen, ckWARN(WARN_UTF8) ? 0 : UTF8_ALLOW_ANYUV));
- along = alen;
- s += along;
- sv = NEWSV(37, 0);
- sv_setuv(sv, (UV)auint);
- PUSHs(sv_2mortal(sv));
- }
+ while (len-- > 0 && s < strend) {
+ STRLEN alen;
+ auint = NATIVE_TO_UNI(utf8n_to_uvchr((U8*)s, strend - s, &alen, ckWARN(WARN_UTF8) ? 0 : UTF8_ALLOW_ANYUV));
+ along = alen;
+ s += along;
+ if (!checksum) {
+ PUSHs(sv_2mortal(newSVuv((UV)auint)));
+ }
+ else if (checksum > bits_in_uv)
+ cdouble += (NV)auint;
+ else
+ cuv += auint;
}
break;
case 's' | TYPE_IS_SHRIEKING:
#if SHORTSIZE != SIZE16
- along = (strend - s) / sizeof(short);
- if (len > along)
- len = along;
- if (checksum) {
- short ashort;
- while (len-- > 0) {
- COPYNN(s, &ashort, sizeof(short));
- s += sizeof(short);
- if (checksum > bits_in_uv)
- cdouble += (NV)ashort;
- else
- cuv += ashort;
-
- }
- }
- else {
- short ashort;
- if (len && unpack_only_one)
- len = 1;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
- while (len-- > 0) {
- COPYNN(s, &ashort, sizeof(short));
- s += sizeof(short);
- sv = NEWSV(38, 0);
- sv_setiv(sv, (IV)ashort);
- PUSHs(sv_2mortal(sv));
- }
+ while (len-- > 0) {
+ COPYNN(s, &ashort, sizeof(short));
+ DO_BO_UNPACK(ashort, s);
+ s += sizeof(short);
+ if (!checksum) {
+ PUSHs(sv_2mortal(newSViv((IV)ashort)));
+ }
+ else if (checksum > bits_in_uv)
+ cdouble += (NV)ashort;
+ else
+ cuv += ashort;
}
break;
#else
/* Fallthrough! */
#endif
case 's':
- along = (strend - s) / SIZE16;
- if (len > along)
- len = along;
- if (checksum) {
- while (len-- > 0) {
- COPY16(s, &ashort);
-#if SHORTSIZE > SIZE16
- if (ashort > 32767)
- ashort -= 65536;
+ while (len-- > 0) {
+ COPY16(s, &ai16);
+ DO_BO_UNPACK(ai16, 16);
+#if U16SIZE > SIZE16
+ if (ai16 > 32767)
+ ai16 -= 65536;
#endif
- s += SIZE16;
- if (checksum > bits_in_uv)
- cdouble += (NV)ashort;
- else
- cuv += ashort;
- }
- }
- else {
- if (len && unpack_only_one)
- len = 1;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
-
- while (len-- > 0) {
- COPY16(s, &ashort);
-#if SHORTSIZE > SIZE16
- if (ashort > 32767)
- ashort -= 65536;
-#endif
- s += SIZE16;
- sv = NEWSV(38, 0);
- sv_setiv(sv, (IV)ashort);
- PUSHs(sv_2mortal(sv));
+ s += SIZE16;
+ if (!checksum) {
+ PUSHs(sv_2mortal(newSViv((IV)ai16)));
}
+ else if (checksum > bits_in_uv)
+ cdouble += (NV)ai16;
+ else
+ cuv += ai16;
}
break;
case 'S' | TYPE_IS_SHRIEKING:
#if SHORTSIZE != SIZE16
- along = (strend - s) / sizeof(unsigned short);
- if (len > along)
- len = along;
- if (checksum) {
- unsigned short aushort;
- while (len-- > 0) {
- COPYNN(s, &aushort, sizeof(unsigned short));
- s += sizeof(unsigned short);
- if (checksum > bits_in_uv)
- cdouble += (NV)aushort;
- else
- cuv += aushort;
- }
- }
- else {
- if (len && unpack_only_one)
- len = 1;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
- while (len-- > 0) {
- unsigned short aushort;
- COPYNN(s, &aushort, sizeof(unsigned short));
- s += sizeof(unsigned short);
- sv = NEWSV(39, 0);
- sv_setiv(sv, (UV)aushort);
- PUSHs(sv_2mortal(sv));
- }
+ while (len-- > 0) {
+ COPYNN(s, &aushort, sizeof(unsigned short));
+ DO_BO_UNPACK(aushort, s);
+ s += sizeof(unsigned short);
+ if (!checksum) {
+ PUSHs(sv_2mortal(newSViv((UV)aushort)));
+ }
+ else if (checksum > bits_in_uv)
+ cdouble += (NV)aushort;
+ else
+ cuv += aushort;
}
break;
#else
case 'v':
case 'n':
case 'S':
- along = (strend - s) / SIZE16;
- if (len > along)
- len = along;
- if (checksum) {
- while (len-- > 0) {
- COPY16(s, &aushort);
- s += SIZE16;
+ while (len-- > 0) {
+ COPY16(s, &au16);
+ DO_BO_UNPACK(au16, 16);
+ s += SIZE16;
#ifdef HAS_NTOHS
- if (datumtype == 'n')
- aushort = PerlSock_ntohs(aushort);
+ if (datumtype == 'n')
+ au16 = PerlSock_ntohs(au16);
#endif
#ifdef HAS_VTOHS
- if (datumtype == 'v')
- aushort = vtohs(aushort);
+ if (datumtype == 'v')
+ au16 = vtohs(au16);
#endif
- if (checksum > bits_in_uv)
- cdouble += (NV)aushort;
- else
- cuv += aushort;
+ if (!checksum) {
+ PUSHs(sv_2mortal(newSViv((UV)au16)));
}
+ else if (checksum > bits_in_uv)
+ cdouble += (NV)au16;
+ else
+ cuv += au16;
}
- else {
- if (len && unpack_only_one)
- len = 1;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
- while (len-- > 0) {
- COPY16(s, &aushort);
- s += SIZE16;
- sv = NEWSV(39, 0);
+ break;
+#ifdef PERL_PACK_CAN_SHRIEKSIGN
+ case 'v' | TYPE_IS_SHRIEKING:
+ case 'n' | TYPE_IS_SHRIEKING:
+ while (len-- > 0) {
+ COPY16(s, &ai16);
+ s += SIZE16;
#ifdef HAS_NTOHS
- if (datumtype == 'n')
- aushort = PerlSock_ntohs(aushort);
+ if (datumtype == ('n' | TYPE_IS_SHRIEKING))
+ ai16 = (I16)PerlSock_ntohs((U16)ai16);
#endif
#ifdef HAS_VTOHS
- if (datumtype == 'v')
- aushort = vtohs(aushort);
+ if (datumtype == ('v' | TYPE_IS_SHRIEKING))
+ ai16 = (I16)vtohs((U16)ai16);
#endif
- sv_setiv(sv, (UV)aushort);
- PUSHs(sv_2mortal(sv));
+ if (!checksum) {
+ PUSHs(sv_2mortal(newSViv((IV)ai16)));
}
+ else if (checksum > bits_in_uv)
+ cdouble += (NV)ai16;
+ else
+ cuv += ai16;
}
break;
+#endif
case 'i':
case 'i' | TYPE_IS_SHRIEKING:
- along = (strend - s) / sizeof(int);
- if (len > along)
- len = along;
- if (checksum) {
- while (len-- > 0) {
- Copy(s, &aint, 1, int);
- s += sizeof(int);
- if (checksum > bits_in_uv)
- cdouble += (NV)aint;
- else
- cuv += aint;
- }
- }
- else {
- if (len && unpack_only_one)
- len = 1;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
- while (len-- > 0) {
- Copy(s, &aint, 1, int);
- s += sizeof(int);
- sv = NEWSV(40, 0);
-#ifdef __osf__
- /* Without the dummy below unpack("i", pack("i",-1))
- * return 0xFFffFFff instead of -1 for Digital Unix V4.0
- * cc with optimization turned on.
- *
- * The bug was detected in
- * DEC C V5.8-009 on Digital UNIX V4.0 (Rev. 1091) (V4.0E)
- * with optimization (-O4) turned on.
- * DEC C V5.2-040 on Digital UNIX V4.0 (Rev. 564) (V4.0B)
- * does not have this problem even with -O4.
- *
- * This bug was reported as DECC_BUGS 1431
- * and tracked internally as GEM_BUGS 7775.
- *
- * The bug is fixed in
- * Tru64 UNIX V5.0: Compaq C V6.1-006 or later
- * UNIX V4.0F support: DEC C V5.9-006 or later
- * UNIX V4.0E support: DEC C V5.8-011 or later
- * and also in DTK.
- *
- * See also few lines later for the same bug.
- */
- (aint) ?
- sv_setiv(sv, (IV)aint) :
-#endif
- sv_setiv(sv, (IV)aint);
- PUSHs(sv_2mortal(sv));
- }
+ while (len-- > 0) {
+ Copy(s, &aint, 1, int);
+ DO_BO_UNPACK(aint, i);
+ s += sizeof(int);
+ if (!checksum) {
+ PUSHs(sv_2mortal(newSViv((IV)aint)));
+ }
+ else if (checksum > bits_in_uv)
+ cdouble += (NV)aint;
+ else
+ cuv += aint;
}
break;
case 'I':
case 'I' | TYPE_IS_SHRIEKING:
- along = (strend - s) / sizeof(unsigned int);
- if (len > along)
- len = along;
- if (checksum) {
- while (len-- > 0) {
- Copy(s, &auint, 1, unsigned int);
- s += sizeof(unsigned int);
- if (checksum > bits_in_uv)
- cdouble += (NV)auint;
- else
- cuv += auint;
- }
- }
- else {
- if (len && unpack_only_one)
- len = 1;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
- while (len-- > 0) {
- Copy(s, &auint, 1, unsigned int);
- s += sizeof(unsigned int);
- sv = NEWSV(41, 0);
-#ifdef __osf__
- /* Without the dummy below unpack("I", pack("I",0xFFFFFFFF))
- * returns 1.84467440737096e+19 instead of 0xFFFFFFFF.
- * See details few lines earlier. */
- (auint) ?
- sv_setuv(sv, (UV)auint) :
-#endif
- sv_setuv(sv, (UV)auint);
- PUSHs(sv_2mortal(sv));
- }
+ while (len-- > 0) {
+ Copy(s, &auint, 1, unsigned int);
+ DO_BO_UNPACK(auint, i);
+ s += sizeof(unsigned int);
+ if (!checksum) {
+ PUSHs(sv_2mortal(newSVuv((UV)auint)));
+ }
+ else if (checksum > bits_in_uv)
+ cdouble += (NV)auint;
+ else
+ cuv += auint;
}
break;
case 'j':
- along = (strend - s) / IVSIZE;
- if (len > along)
- len = along;
- if (checksum) {
- while (len-- > 0) {
- Copy(s, &aiv, 1, IV);
- s += IVSIZE;
- if (checksum > bits_in_uv)
- cdouble += (NV)aiv;
- else
- cuv += aiv;
- }
- }
- else {
- if (len && unpack_only_one)
- len = 1;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
- while (len-- > 0) {
- Copy(s, &aiv, 1, IV);
- s += IVSIZE;
- sv = NEWSV(40, 0);
- sv_setiv(sv, aiv);
- PUSHs(sv_2mortal(sv));
+ while (len-- > 0) {
+ Copy(s, &aiv, 1, IV);
+#if IVSIZE == INTSIZE
+ DO_BO_UNPACK(aiv, i);
+#elif IVSIZE == LONGSIZE
+ DO_BO_UNPACK(aiv, l);
+#elif defined(HAS_QUAD) && IVSIZE == U64SIZE
+ DO_BO_UNPACK(aiv, 64);
+#endif
+ s += IVSIZE;
+ if (!checksum) {
+ PUSHs(sv_2mortal(newSViv(aiv)));
}
+ else if (checksum > bits_in_uv)
+ cdouble += (NV)aiv;
+ else
+ cuv += aiv;
}
break;
case 'J':
- along = (strend - s) / UVSIZE;
- if (len > along)
- len = along;
- if (checksum) {
- while (len-- > 0) {
- Copy(s, &auv, 1, UV);
- s += UVSIZE;
- if (checksum > bits_in_uv)
- cdouble += (NV)auv;
- else
- cuv += auv;
- }
- }
- else {
- if (len && unpack_only_one)
- len = 1;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
- while (len-- > 0) {
- Copy(s, &auv, 1, UV);
- s += UVSIZE;
- sv = NEWSV(41, 0);
- sv_setuv(sv, auv);
- PUSHs(sv_2mortal(sv));
+ while (len-- > 0) {
+ Copy(s, &auv, 1, UV);
+#if UVSIZE == INTSIZE
+ DO_BO_UNPACK(auv, i);
+#elif UVSIZE == LONGSIZE
+ DO_BO_UNPACK(auv, l);
+#elif defined(HAS_QUAD) && UVSIZE == U64SIZE
+ DO_BO_UNPACK(auv, 64);
+#endif
+ s += UVSIZE;
+ if (!checksum) {
+ PUSHs(sv_2mortal(newSVuv(auv)));
}
+ else if (checksum > bits_in_uv)
+ cdouble += (NV)auv;
+ else
+ cuv += auv;
}
break;
case 'l' | TYPE_IS_SHRIEKING:
#if LONGSIZE != SIZE32
- along = (strend - s) / sizeof(long);
- if (len > along)
- len = along;
- if (checksum) {
- while (len-- > 0) {
- COPYNN(s, &along, sizeof(long));
- s += sizeof(long);
- if (checksum > bits_in_uv)
- cdouble += (NV)along;
- else
- cuv += along;
- }
- }
- else {
- if (len && unpack_only_one)
- len = 1;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
- while (len-- > 0) {
- COPYNN(s, &along, sizeof(long));
- s += sizeof(long);
- sv = NEWSV(42, 0);
- sv_setiv(sv, (IV)along);
- PUSHs(sv_2mortal(sv));
- }
+ while (len-- > 0) {
+ COPYNN(s, &along, sizeof(long));
+ DO_BO_UNPACK(along, l);
+ s += sizeof(long);
+ if (!checksum) {
+ PUSHs(sv_2mortal(newSViv((IV)along)));
+ }
+ else if (checksum > bits_in_uv)
+ cdouble += (NV)along;
+ else
+ cuv += along;
}
break;
#else
/* Fallthrough! */
#endif
case 'l':
- along = (strend - s) / SIZE32;
- if (len > along)
- len = along;
- if (checksum) {
- while (len-- > 0) {
-#if LONGSIZE > SIZE32 && INTSIZE == SIZE32
- I32 along;
-#endif
- COPY32(s, &along);
-#if LONGSIZE > SIZE32
- if (along > 2147483647)
- along -= 4294967296;
+ while (len-- > 0) {
+ COPY32(s, &ai32);
+ DO_BO_UNPACK(ai32, 32);
+#if U32SIZE > SIZE32
+ if (ai32 > 2147483647)
+ ai32 -= 4294967296;
#endif
- s += SIZE32;
- if (checksum > bits_in_uv)
- cdouble += (NV)along;
- else
- cuv += along;
- }
- }
- else {
- if (len && unpack_only_one)
- len = 1;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
- while (len-- > 0) {
-#if LONGSIZE > SIZE32 && INTSIZE == SIZE32
- I32 along;
-#endif
- COPY32(s, &along);
-#if LONGSIZE > SIZE32
- if (along > 2147483647)
- along -= 4294967296;
-#endif
- s += SIZE32;
- sv = NEWSV(42, 0);
- sv_setiv(sv, (IV)along);
- PUSHs(sv_2mortal(sv));
+ s += SIZE32;
+ if (!checksum) {
+ PUSHs(sv_2mortal(newSViv((IV)ai32)));
}
+ else if (checksum > bits_in_uv)
+ cdouble += (NV)ai32;
+ else
+ cuv += ai32;
}
break;
case 'L' | TYPE_IS_SHRIEKING:
#if LONGSIZE != SIZE32
- along = (strend - s) / sizeof(unsigned long);
- if (len > along)
- len = along;
- if (checksum) {
- while (len-- > 0) {
- unsigned long aulong;
- COPYNN(s, &aulong, sizeof(unsigned long));
- s += sizeof(unsigned long);
- if (checksum > bits_in_uv)
- cdouble += (NV)aulong;
- else
- cuv += aulong;
- }
- }
- else {
- if (len && unpack_only_one)
- len = 1;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
- while (len-- > 0) {
- unsigned long aulong;
- COPYNN(s, &aulong, sizeof(unsigned long));
- s += sizeof(unsigned long);
- sv = NEWSV(43, 0);
- sv_setuv(sv, (UV)aulong);
- PUSHs(sv_2mortal(sv));
- }
+ while (len-- > 0) {
+ COPYNN(s, &aulong, sizeof(unsigned long));
+ DO_BO_UNPACK(aulong, l);
+ s += sizeof(unsigned long);
+ if (!checksum) {
+ PUSHs(sv_2mortal(newSVuv((UV)aulong)));
+ }
+ else if (checksum > bits_in_uv)
+ cdouble += (NV)aulong;
+ else
+ cuv += aulong;
}
break;
#else
case 'V':
case 'N':
case 'L':
- along = (strend - s) / SIZE32;
- if (len > along)
- len = along;
- if (checksum) {
- while (len-- > 0) {
- COPY32(s, &aulong);
- s += SIZE32;
+ while (len-- > 0) {
+ COPY32(s, &au32);
+ DO_BO_UNPACK(au32, 32);
+ s += SIZE32;
#ifdef HAS_NTOHL
- if (datumtype == 'N')
- aulong = PerlSock_ntohl(aulong);
+ if (datumtype == 'N')
+ au32 = PerlSock_ntohl(au32);
#endif
#ifdef HAS_VTOHL
- if (datumtype == 'V')
- aulong = vtohl(aulong);
+ if (datumtype == 'V')
+ au32 = vtohl(au32);
#endif
- if (checksum > bits_in_uv)
- cdouble += (NV)aulong;
- else
- cuv += aulong;
- }
- }
- else {
- if (len && unpack_only_one)
- len = 1;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
- while (len-- > 0) {
- COPY32(s, &aulong);
- s += SIZE32;
+ if (!checksum) {
+ PUSHs(sv_2mortal(newSVuv((UV)au32)));
+ }
+ else if (checksum > bits_in_uv)
+ cdouble += (NV)au32;
+ else
+ cuv += au32;
+ }
+ break;
+#ifdef PERL_PACK_CAN_SHRIEKSIGN
+ case 'V' | TYPE_IS_SHRIEKING:
+ case 'N' | TYPE_IS_SHRIEKING:
+ while (len-- > 0) {
+ COPY32(s, &ai32);
+ s += SIZE32;
#ifdef HAS_NTOHL
- if (datumtype == 'N')
- aulong = PerlSock_ntohl(aulong);
+ if (datumtype == ('N' | TYPE_IS_SHRIEKING))
+ ai32 = (I32)PerlSock_ntohl((U32)ai32);
#endif
#ifdef HAS_VTOHL
- if (datumtype == 'V')
- aulong = vtohl(aulong);
+ if (datumtype == ('V' | TYPE_IS_SHRIEKING))
+ ai32 = (I32)vtohl((U32)ai32);
#endif
- sv = NEWSV(43, 0);
- sv_setuv(sv, (UV)aulong);
- PUSHs(sv_2mortal(sv));
+ if (!checksum) {
+ PUSHs(sv_2mortal(newSViv((IV)ai32)));
}
+ else if (checksum > bits_in_uv)
+ cdouble += (NV)ai32;
+ else
+ cuv += ai32;
}
break;
+#endif
case 'p':
- along = (strend - s) / sizeof(char*);
- if (len > along)
- len = along;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
while (len-- > 0) {
- if (sizeof(char*) > strend - s)
- break;
- else {
- Copy(s, &aptr, 1, char*);
- s += sizeof(char*);
- }
- sv = NEWSV(44, 0);
- if (aptr)
- sv_setpv(sv, aptr);
- PUSHs(sv_2mortal(sv));
+ assert (sizeof(char*) <= strend - s);
+ Copy(s, &aptr, 1, char*);
+ DO_BO_UNPACK_P(aptr);
+ s += sizeof(char*);
+ /* newSVpv generates undef if aptr is NULL */
+ PUSHs(sv_2mortal(newSVpv(aptr, 0)));
}
break;
case 'w':
- if (len && unpack_only_one)
- len = 1;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
{
UV auv = 0;
U32 bytes = 0;
/* UTF8_IS_XXXXX not right here - using constant 0x80 */
if ((U8)(*s++) < 0x80) {
bytes = 0;
- sv = NEWSV(40, 0);
- sv_setuv(sv, auv);
- PUSHs(sv_2mortal(sv));
+ PUSHs(sv_2mortal(newSVuv(auv)));
len--;
auv = 0;
}
break;
else {
Copy(s, &aptr, 1, char*);
+ DO_BO_UNPACK_P(aptr);
s += sizeof(char*);
}
- sv = NEWSV(44, 0);
- if (aptr)
- sv_setpvn(sv, aptr, len);
- PUSHs(sv_2mortal(sv));
+ /* newSVpvn generates undef if aptr is NULL */
+ PUSHs(sv_2mortal(newSVpvn(aptr, len)));
break;
#ifdef HAS_QUAD
case 'q':
- along = (strend - s) / sizeof(Quad_t);
- if (len > along)
- len = along;
- if (checksum) {
- while (len-- > 0) {
- Copy(s, &aquad, 1, Quad_t);
- s += sizeof(Quad_t);
- if (checksum > bits_in_uv)
- cdouble += (NV)aquad;
- else
- cuv += aquad;
- }
- }
- else {
- if (len && unpack_only_one)
- len = 1;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
- while (len-- > 0) {
- if (s + sizeof(Quad_t) > strend)
- aquad = 0;
- else {
- Copy(s, &aquad, 1, Quad_t);
- s += sizeof(Quad_t);
- }
- sv = NEWSV(42, 0);
- if (aquad >= IV_MIN && aquad <= IV_MAX)
- sv_setiv(sv, (IV)aquad);
- else
- sv_setnv(sv, (NV)aquad);
- PUSHs(sv_2mortal(sv));
+ while (len-- > 0) {
+ assert (s + sizeof(Quad_t) <= strend);
+ Copy(s, &aquad, 1, Quad_t);
+ DO_BO_UNPACK(aquad, 64);
+ s += sizeof(Quad_t);
+ if (!checksum) {
+ PUSHs(sv_2mortal((aquad >= IV_MIN && aquad <= IV_MAX) ?
+ newSViv((IV)aquad) : newSVnv((NV)aquad)));
}
- }
+ else if (checksum > bits_in_uv)
+ cdouble += (NV)aquad;
+ else
+ cuv += aquad;
+ }
break;
case 'Q':
- along = (strend - s) / sizeof(Uquad_t);
- if (len > along)
- len = along;
- if (checksum) {
- while (len-- > 0) {
- Copy(s, &auquad, 1, Uquad_t);
- s += sizeof(Uquad_t);
- if (checksum > bits_in_uv)
- cdouble += (NV)auquad;
- else
- cuv += auquad;
- }
+ while (len-- > 0) {
+ assert (s + sizeof(Uquad_t) <= strend);
+ Copy(s, &auquad, 1, Uquad_t);
+ DO_BO_UNPACK(auquad, 64);
+ s += sizeof(Uquad_t);
+ if (!checksum) {
+ PUSHs(sv_2mortal((auquad <= UV_MAX) ?
+ newSVuv((UV)auquad) : newSVnv((NV)auquad)));
+ }
+ else if (checksum > bits_in_uv)
+ cdouble += (NV)auquad;
+ else
+ cuv += auquad;
}
- else {
- if (len && unpack_only_one)
- len = 1;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
- while (len-- > 0) {
- if (s + sizeof(Uquad_t) > strend)
- auquad = 0;
- else {
- Copy(s, &auquad, 1, Uquad_t);
- s += sizeof(Uquad_t);
- }
- sv = NEWSV(43, 0);
- if (auquad <= UV_MAX)
- sv_setuv(sv, (UV)auquad);
- else
- sv_setnv(sv, (NV)auquad);
- PUSHs(sv_2mortal(sv));
- }
- }
break;
#endif
/* float and double added gnb@melba.bby.oz.au 22/11/89 */
case 'f':
- along = (strend - s) / sizeof(float);
- if (len > along)
- len = along;
- if (checksum) {
- while (len-- > 0) {
- Copy(s, &afloat, 1, float);
- s += sizeof(float);
- cdouble += afloat;
+ while (len-- > 0) {
+ Copy(s, &afloat, 1, float);
+ DO_BO_UNPACK_N(afloat, float);
+ s += sizeof(float);
+ if (!checksum) {
+ PUSHs(sv_2mortal(newSVnv((NV)afloat)));
}
- }
- else {
- if (len && unpack_only_one)
- len = 1;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
- while (len-- > 0) {
- Copy(s, &afloat, 1, float);
- s += sizeof(float);
- sv = NEWSV(47, 0);
- sv_setnv(sv, (NV)afloat);
- PUSHs(sv_2mortal(sv));
+ else {
+ cdouble += afloat;
}
}
break;
case 'd':
- along = (strend - s) / sizeof(double);
- if (len > along)
- len = along;
- if (checksum) {
- while (len-- > 0) {
- Copy(s, &adouble, 1, double);
- s += sizeof(double);
- cdouble += adouble;
+ while (len-- > 0) {
+ Copy(s, &adouble, 1, double);
+ DO_BO_UNPACK_N(adouble, double);
+ s += sizeof(double);
+ if (!checksum) {
+ PUSHs(sv_2mortal(newSVnv((NV)adouble)));
}
- }
- else {
- if (len && unpack_only_one)
- len = 1;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
- while (len-- > 0) {
- Copy(s, &adouble, 1, double);
- s += sizeof(double);
- sv = NEWSV(48, 0);
- sv_setnv(sv, (NV)adouble);
- PUSHs(sv_2mortal(sv));
+ else {
+ cdouble += adouble;
}
}
break;
case 'F':
- along = (strend - s) / NVSIZE;
- if (len > along)
- len = along;
- if (checksum) {
- while (len-- > 0) {
- Copy(s, &anv, 1, NV);
- s += NVSIZE;
- cdouble += anv;
+ while (len-- > 0) {
+ Copy(s, &anv, 1, NV);
+ DO_BO_UNPACK_N(anv, NV);
+ s += NVSIZE;
+ if (!checksum) {
+ PUSHs(sv_2mortal(newSVnv(anv)));
}
- }
- else {
- if (len && unpack_only_one)
- len = 1;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
- while (len-- > 0) {
- Copy(s, &anv, 1, NV);
- s += NVSIZE;
- sv = NEWSV(48, 0);
- sv_setnv(sv, anv);
- PUSHs(sv_2mortal(sv));
+ else {
+ cdouble += anv;
}
}
break;
#if defined(HAS_LONG_DOUBLE) && defined(USE_LONG_DOUBLE)
case 'D':
- along = (strend - s) / LONG_DOUBLESIZE;
- if (len > along)
- len = along;
- if (checksum) {
- while (len-- > 0) {
- Copy(s, &aldouble, 1, long double);
- s += LONG_DOUBLESIZE;
- cdouble += aldouble;
+ while (len-- > 0) {
+ Copy(s, &aldouble, 1, long double);
+ DO_BO_UNPACK_N(aldouble, long double);
+ s += LONG_DOUBLESIZE;
+ if (!checksum) {
+ PUSHs(sv_2mortal(newSVnv((NV)aldouble)));
}
- }
- else {
- if (len && unpack_only_one)
- len = 1;
- EXTEND(SP, len);
- EXTEND_MORTAL(len);
- while (len-- > 0) {
- Copy(s, &aldouble, 1, long double);
- s += LONG_DOUBLESIZE;
- sv = NEWSV(48, 0);
- sv_setnv(sv, (NV)aldouble);
- PUSHs(sv_2mortal(sv));
+ else {cdouble += aldouble;
}
}
break;
}
if (checksum) {
- sv = NEWSV(42, 0);
- if (strchr("fFdD", datumtype) ||
+ if (strchr("fFdD", TYPE_NO_MODIFIERS(datumtype)) ||
(checksum > bits_in_uv &&
- strchr("csSiIlLnNUvVqQjJ", datumtype&0xFF)) ) {
+ strchr("cCsSiIlLnNUvVqQjJ", TYPE_NO_MODIFIERS(datumtype))) ) {
NV trouble;
adouble = (NV) (1 << (checksum & 15));
while (cdouble < 0.0)
cdouble += adouble;
cdouble = Perl_modf(cdouble / adouble, &trouble) * adouble;
- sv_setnv(sv, cdouble);
+ sv = newSVnv(cdouble);
}
else {
if (checksum < bits_in_uv) {
UV mask = ((UV)1 << checksum) - 1;
cuv &= mask;
}
- sv_setuv(sv, cuv);
+ sv = newSVuv(cuv);
}
XPUSHs(sv_2mortal(sv));
checksum = 0;
Perl_croak(aTHX_ "Code missing after '/' in unpack" );
}
datumtype = symptr->code;
+ explicit_length = FALSE;
goto redo_switch;
}
}
/* These must not be in registers: */
char achar;
- I16 ashort;
- int aint;
- unsigned int auint;
- I32 along;
- U32 aulong;
- IV aiv;
- UV auv;
- NV anv;
-#if defined(HAS_LONG_DOUBLE) && defined(USE_LONG_DOUBLE)
- long double aldouble;
-#endif
+ I16 ai16;
+ U16 au16;
+ I32 ai32;
+ U32 au32;
#ifdef HAS_QUAD
Quad_t aquad;
Uquad_t auquad;
#endif
+#if SHORTSIZE != SIZE16
+ short ashort;
+ unsigned short aushort;
+#endif
+ int aint;
+ unsigned int auint;
+#if LONGSIZE != SIZE32
+ long along;
+ unsigned long aulong;
+#endif
char *aptr;
float afloat;
double adouble;
+#if defined(HAS_LONG_DOUBLE) && defined(USE_LONG_DOUBLE)
+ long double aldouble;
+#endif
+ IV aiv;
+ UV auv;
+ NV anv;
+
int strrelbeg = SvCUR(cat);
tempsym_t lookahead;
len = symptr->length;
break;
case e_star:
- len = strchr("@Xxu", datumtype) ? 0 : items;
+ len = strchr("@Xxu", TYPE_NO_MODIFIERS(datumtype)) ? 0 : items;
break;
}
}
}
- switch(datumtype) {
+ switch(TYPE_NO_ENDIANNESS(datumtype)) {
default:
- Perl_croak(aTHX_ "Invalid type '%c' in pack", (int)datumtype);
+ Perl_croak(aTHX_ "Invalid type '%c' in pack", (int)TYPE_NO_MODIFIERS(datumtype));
case '%':
Perl_croak(aTHX_ "'%%' may not be used in pack");
case '@':
case '(':
{
tempsym_t savsym = *symptr;
+ U32 group_modifiers = TYPE_MODIFIERS(datumtype & ~symptr->flags);
+ symptr->flags |= group_modifiers;
symptr->patend = savsym.grpend;
symptr->level++;
while (len--) {
if (savsym.howlen == e_star && beglist == endlist)
break; /* No way to continue */
}
+ symptr->flags &= ~group_modifiers;
lookahead.flags = symptr->flags;
*symptr = savsym;
break;
}
if ((I32)fromlen >= len) {
sv_catpvn(cat, aptr, len);
- if (datumtype == 'Z')
+ if (datumtype == 'Z' && len > 0)
*(SvEND(cat)-1) = '\0';
}
else {
case 'c':
while (len-- > 0) {
fromstr = NEXTFROM;
- switch (datumtype) {
+ switch (TYPE_NO_MODIFIERS(datumtype)) {
case 'C':
aint = SvIV(fromstr);
if ((aint < 0 || aint > 255) &&
while (len-- > 0) {
fromstr = NEXTFROM;
auint = UNI_TO_NATIVE(SvUV(fromstr));
- SvGROW(cat, SvCUR(cat) + UTF8_MAXLEN + 1);
+ SvGROW(cat, SvCUR(cat) + UTF8_MAXBYTES + 1);
SvCUR_set(cat,
(char*)uvchr_to_utf8_flags((U8*)SvEND(cat),
auint,
afloat = (float)SvNV(fromstr);
# endif
#endif
+ DO_BO_PACK_N(afloat, float);
sv_catpvn(cat, (char *)&afloat, sizeof (float));
}
break;
adouble = (double)SvNV(fromstr);
# endif
#endif
+ DO_BO_PACK_N(adouble, double);
sv_catpvn(cat, (char *)&adouble, sizeof (double));
}
break;
case 'F':
+ Zero(&anv, 1, NV); /* can be long double with unused bits */
while (len-- > 0) {
fromstr = NEXTFROM;
anv = SvNV(fromstr);
+ DO_BO_PACK_N(anv, NV);
sv_catpvn(cat, (char *)&anv, NVSIZE);
}
break;
#if defined(HAS_LONG_DOUBLE) && defined(USE_LONG_DOUBLE)
case 'D':
+ /* long doubles can have unused bits, which may be nonzero */
+ Zero(&aldouble, 1, long double);
while (len-- > 0) {
fromstr = NEXTFROM;
aldouble = (long double)SvNV(fromstr);
+ DO_BO_PACK_N(aldouble, long double);
sv_catpvn(cat, (char *)&aldouble, LONG_DOUBLESIZE);
}
break;
#endif
+#ifdef PERL_PACK_CAN_SHRIEKSIGN
+ case 'n' | TYPE_IS_SHRIEKING:
+#endif
case 'n':
while (len-- > 0) {
fromstr = NEXTFROM;
- ashort = (I16)SvIV(fromstr);
+ ai16 = (I16)SvIV(fromstr);
#ifdef HAS_HTONS
- ashort = PerlSock_htons(ashort);
+ ai16 = PerlSock_htons(ai16);
#endif
- CAT16(cat, &ashort);
+ CAT16(cat, &ai16);
}
break;
+#ifdef PERL_PACK_CAN_SHRIEKSIGN
+ case 'v' | TYPE_IS_SHRIEKING:
+#endif
case 'v':
while (len-- > 0) {
fromstr = NEXTFROM;
- ashort = (I16)SvIV(fromstr);
+ ai16 = (I16)SvIV(fromstr);
#ifdef HAS_HTOVS
- ashort = htovs(ashort);
+ ai16 = htovs(ai16);
#endif
- CAT16(cat, &ashort);
+ CAT16(cat, &ai16);
}
break;
case 'S' | TYPE_IS_SHRIEKING:
#if SHORTSIZE != SIZE16
{
- unsigned short aushort;
-
while (len-- > 0) {
fromstr = NEXTFROM;
aushort = SvUV(fromstr);
+ DO_BO_PACK(aushort, s);
sv_catpvn(cat, (char *)&aushort, sizeof(unsigned short));
}
}
#endif
case 'S':
{
- U16 aushort;
-
while (len-- > 0) {
fromstr = NEXTFROM;
- aushort = (U16)SvUV(fromstr);
- CAT16(cat, &aushort);
+ au16 = (U16)SvUV(fromstr);
+ DO_BO_PACK(au16, 16);
+ CAT16(cat, &au16);
}
}
case 's' | TYPE_IS_SHRIEKING:
#if SHORTSIZE != SIZE16
{
- short ashort;
-
while (len-- > 0) {
fromstr = NEXTFROM;
ashort = SvIV(fromstr);
+ DO_BO_PACK(ashort, s);
sv_catpvn(cat, (char *)&ashort, sizeof(short));
}
}
case 's':
while (len-- > 0) {
fromstr = NEXTFROM;
- ashort = (I16)SvIV(fromstr);
- CAT16(cat, &ashort);
+ ai16 = (I16)SvIV(fromstr);
+ DO_BO_PACK(ai16, 16);
+ CAT16(cat, &ai16);
}
break;
case 'I':
while (len-- > 0) {
fromstr = NEXTFROM;
auint = SvUV(fromstr);
+ DO_BO_PACK(auint, i);
sv_catpvn(cat, (char*)&auint, sizeof(unsigned int));
}
break;
while (len-- > 0) {
fromstr = NEXTFROM;
aiv = SvIV(fromstr);
+#if IVSIZE == INTSIZE
+ DO_BO_PACK(aiv, i);
+#elif IVSIZE == LONGSIZE
+ DO_BO_PACK(aiv, l);
+#elif defined(HAS_QUAD) && IVSIZE == U64SIZE
+ DO_BO_PACK(aiv, 64);
+#endif
sv_catpvn(cat, (char*)&aiv, IVSIZE);
}
break;
while (len-- > 0) {
fromstr = NEXTFROM;
auv = SvUV(fromstr);
+#if UVSIZE == INTSIZE
+ DO_BO_PACK(auv, i);
+#elif UVSIZE == LONGSIZE
+ DO_BO_PACK(auv, l);
+#elif defined(HAS_QUAD) && UVSIZE == U64SIZE
+ DO_BO_PACK(auv, 64);
+#endif
sv_catpvn(cat, (char*)&auv, UVSIZE);
}
break;
given 10**(NV_MAX_10_EXP+1) == 128 ** x solve for x:
x = (NV_MAX_10_EXP+1) * log (10) / log (128)
And with that many bytes only Inf can overflow.
+ Some C compilers are strict about integral constant
+ expressions so we conservatively divide by a slightly
+ smaller integer instead of multiplying by the exact
+ floating-point value.
*/
#ifdef NV_MAX_10_EXP
- char buf[1 + (int)((NV_MAX_10_EXP + 1) * 0.47456)];
+/* char buf[1 + (int)((NV_MAX_10_EXP + 1) * 0.47456)]; -- invalid C */
+ char buf[1 + (int)((NV_MAX_10_EXP + 1) / 2)]; /* valid C */
#else
- char buf[1 + (int)((308 + 1) * 0.47456)];
+/* char buf[1 + (int)((308 + 1) * 0.47456)]; -- invalid C */
+ char buf[1 + (int)((308 + 1) / 2)]; /* valid C */
#endif
char *in = buf + sizeof(buf);
while (len-- > 0) {
fromstr = NEXTFROM;
aint = SvIV(fromstr);
+ DO_BO_PACK(aint, i);
sv_catpvn(cat, (char*)&aint, sizeof(int));
}
break;
+#ifdef PERL_PACK_CAN_SHRIEKSIGN
+ case 'N' | TYPE_IS_SHRIEKING:
+#endif
case 'N':
while (len-- > 0) {
fromstr = NEXTFROM;
- aulong = SvUV(fromstr);
+ au32 = SvUV(fromstr);
#ifdef HAS_HTONL
- aulong = PerlSock_htonl(aulong);
+ au32 = PerlSock_htonl(au32);
#endif
- CAT32(cat, &aulong);
+ CAT32(cat, &au32);
}
break;
+#ifdef PERL_PACK_CAN_SHRIEKSIGN
+ case 'V' | TYPE_IS_SHRIEKING:
+#endif
case 'V':
while (len-- > 0) {
fromstr = NEXTFROM;
- aulong = SvUV(fromstr);
+ au32 = SvUV(fromstr);
#ifdef HAS_HTOVL
- aulong = htovl(aulong);
+ au32 = htovl(au32);
#endif
- CAT32(cat, &aulong);
+ CAT32(cat, &au32);
}
break;
case 'L' | TYPE_IS_SHRIEKING:
#if LONGSIZE != SIZE32
{
- unsigned long aulong;
-
while (len-- > 0) {
fromstr = NEXTFROM;
aulong = SvUV(fromstr);
+ DO_BO_PACK(aulong, l);
sv_catpvn(cat, (char *)&aulong, sizeof(unsigned long));
}
}
{
while (len-- > 0) {
fromstr = NEXTFROM;
- aulong = SvUV(fromstr);
- CAT32(cat, &aulong);
+ au32 = SvUV(fromstr);
+ DO_BO_PACK(au32, 32);
+ CAT32(cat, &au32);
}
}
break;
case 'l' | TYPE_IS_SHRIEKING:
#if LONGSIZE != SIZE32
{
- long along;
-
while (len-- > 0) {
fromstr = NEXTFROM;
along = SvIV(fromstr);
+ DO_BO_PACK(along, l);
sv_catpvn(cat, (char *)&along, sizeof(long));
}
}
case 'l':
while (len-- > 0) {
fromstr = NEXTFROM;
- along = SvIV(fromstr);
- CAT32(cat, &along);
+ ai32 = SvIV(fromstr);
+ DO_BO_PACK(ai32, 32);
+ CAT32(cat, &ai32);
}
break;
#ifdef HAS_QUAD
while (len-- > 0) {
fromstr = NEXTFROM;
auquad = (Uquad_t)SvUV(fromstr);
+ DO_BO_PACK(auquad, 64);
sv_catpvn(cat, (char*)&auquad, sizeof(Uquad_t));
}
break;
while (len-- > 0) {
fromstr = NEXTFROM;
aquad = (Quad_t)SvIV(fromstr);
+ DO_BO_PACK(aquad, 64);
sv_catpvn(cat, (char*)&aquad, sizeof(Quad_t));
}
break;
case 'p':
while (len-- > 0) {
fromstr = NEXTFROM;
- if (fromstr == &PL_sv_undef)
- aptr = NULL;
+ SvGETMAGIC(fromstr);
+ if (!SvOK(fromstr)) aptr = NULL;
else {
STRLEN n_a;
/* XXX better yet, could spirit away the string to
"Attempt to pack pointer to temporary value");
}
if (SvPOK(fromstr) || SvNIOK(fromstr))
- aptr = SvPV(fromstr,n_a);
+ aptr = SvPV_flags(fromstr, n_a, 0);
else
- aptr = SvPV_force(fromstr,n_a);
+ aptr = SvPV_force_flags(fromstr, n_a, 0);
}
+ DO_BO_PACK_P(aptr);
sv_catpvn(cat, (char*)&aptr, sizeof(char*));
}
break;
RETURN;
}
+/*
+ * Local variables:
+ * c-indentation-style: bsd
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vim: shiftwidth=4:
+*/
https://perl5.git.perl.org / perl5.git / blobdiff