X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp_pack.c;h=784d16e177474363c63d06a9ded451e4723cb91d;hb=8bbf3450a1ff0a3996dade29a4194cc0939d871f;hp=55469fb0abba23c3372deee1dd73e6e0f958e6d5;hpb=608d3aed02075391572aedd203d1c73a9f25a2f0;p=p5sagit%2Fp5-mst-13.2.git diff --git a/pp_pack.c b/pp_pack.c index 55469fb..784d16e 100644 --- a/pp_pack.c +++ b/pp_pack.c @@ -1,7 +1,7 @@ /* 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, 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. @@ -21,17 +21,6 @@ #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); -#endif - -/* * Offset for integer pack/unpack. * * On architectures where I16 and I32 aren't really 16 and 32 bits, @@ -55,16 +44,12 @@ static double UV_MAX_cxux = ((double)UV_MAX); /* 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 @@ -135,6 +120,108 @@ S_mul128(pTHX_ SV *sv, U8 m) #endif #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_NO_ENDIANNESS(t) ((t) & ~TYPE_ENDIANNESS_MASK) +#define TYPE_NO_MODIFIERS(t) ((t) & 0xFF) + +#define DO_BO_UNPACK(var, type) \ + STMT_START { \ + switch (datumtype & TYPE_ENDIANNESS_MASK) { \ + 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 (datumtype & TYPE_ENDIANNESS_MASK) { \ + 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 (datumtype & TYPE_ENDIANNESS_MASK) { \ + 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 (datumtype & TYPE_ENDIANNESS_MASK) { \ + 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 (datumtype & TYPE_ENDIANNESS_MASK) { \ + 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 (datumtype & TYPE_ENDIANNESS_MASK) { \ + 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 (datumtype & TYPE_ENDIANNESS_MASK) { \ + 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 /* Returns the sizeof() struct described by pat */ STATIC I32 @@ -159,10 +246,11 @@ S_measure_struct(pTHX_ register tempsym_t* symptr) break; } - switch(symptr->code) { + /* 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)symptr->code, + Perl_croak(aTHX_ "Invalid type '%c' in %s", + (int)TYPE_NO_MODIFIERS(symptr->code), symptr->flags & FLAG_PACK ? "pack" : "unpack" ); case '@': case '/': @@ -244,6 +332,8 @@ S_measure_struct(pTHX_ register tempsym_t* symptr) #else /* FALL THROUGH */ #endif + case 'v' | TYPE_IS_SHRIEKING: + case 'n' | TYPE_IS_SHRIEKING: case 'v': case 'n': case 'S': @@ -280,6 +370,8 @@ S_measure_struct(pTHX_ register tempsym_t* symptr) #else /* FALL THROUGH */ #endif + case 'V' | TYPE_IS_SHRIEKING: + case 'N' | TYPE_IS_SHRIEKING: case 'V': case 'N': case 'L': @@ -411,15 +503,44 @@ S_next_symbol(pTHX_ register tempsym_t* symptr ) 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 modifiers */ + while (patptr < patend) { + const char *allowed; + I32 modifier = 0; + switch (*patptr) { + case '!': + modifier = TYPE_IS_SHRIEKING; + allowed = "sSiIlLxXnNvV"; + break; + case '>': + modifier = TYPE_IS_BIG_ENDIAN; + allowed = "sSiIlLqQjJfFdDpP"; + break; + case '<': + modifier = TYPE_IS_LITTLE_ENDIAN; + allowed = "sSiIlLqQjJfFdDpP"; + break; + 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 ((code | modifier) == (code | TYPE_IS_BIG_ENDIAN | TYPE_IS_LITTLE_ENDIAN)) + Perl_croak(aTHX_ "Can't use both '<' and '>' after type '%c' in %s", + (int) TYPE_NO_MODIFIERS(code), + 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++; } /* look for count and/or / */ @@ -544,21 +665,34 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c 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; @@ -567,13 +701,6 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c bool beyond = FALSE; 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 @@ -596,9 +723,9 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c redo_switch: beyond = s >= strend; - switch(datumtype) { + 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) @@ -886,25 +1013,24 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c 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; - + COPYNN(s, &ashort, sizeof(short)); + DO_BO_UNPACK(ashort, s); + 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)); + DO_BO_UNPACK(ashort, s); s += sizeof(short); sv = NEWSV(38, 0); sv_setiv(sv, (IV)ashort); @@ -921,16 +1047,17 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c len = along; if (checksum) { while (len-- > 0) { - COPY16(s, &ashort); -#if SHORTSIZE > SIZE16 - if (ashort > 32767) - ashort -= 65536; + 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; + cdouble += (NV)ai16; else - cuv += ashort; + cuv += ai16; } } else { @@ -940,14 +1067,15 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c EXTEND_MORTAL(len); while (len-- > 0) { - COPY16(s, &ashort); -#if SHORTSIZE > SIZE16 - if (ashort > 32767) - ashort -= 65536; + COPY16(s, &ai16); + DO_BO_UNPACK(ai16, 16); +#if U16SIZE > SIZE16 + if (ai16 > 32767) + ai16 -= 65536; #endif s += SIZE16; sv = NEWSV(38, 0); - sv_setiv(sv, (IV)ashort); + sv_setiv(sv, (IV)ai16); PUSHs(sv_2mortal(sv)); } } @@ -958,9 +1086,9 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c if (len > along) len = along; if (checksum) { - unsigned short aushort; while (len-- > 0) { COPYNN(s, &aushort, sizeof(unsigned short)); + DO_BO_UNPACK(aushort, s); s += sizeof(unsigned short); if (checksum > bits_in_uv) cdouble += (NV)aushort; @@ -974,8 +1102,8 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c EXTEND(SP, len); EXTEND_MORTAL(len); while (len-- > 0) { - unsigned short aushort; COPYNN(s, &aushort, sizeof(unsigned short)); + DO_BO_UNPACK(aushort, s); s += sizeof(unsigned short); sv = NEWSV(39, 0); sv_setiv(sv, (UV)aushort); @@ -994,20 +1122,21 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c len = along; if (checksum) { while (len-- > 0) { - COPY16(s, &aushort); + COPY16(s, &au16); + DO_BO_UNPACK(au16, 16); s += SIZE16; #ifdef HAS_NTOHS if (datumtype == 'n') - aushort = PerlSock_ntohs(aushort); + au16 = PerlSock_ntohs(au16); #endif #ifdef HAS_VTOHS if (datumtype == 'v') - aushort = vtohs(aushort); + au16 = vtohs(au16); #endif if (checksum > bits_in_uv) - cdouble += (NV)aushort; + cdouble += (NV)au16; else - cuv += aushort; + cuv += au16; } } else { @@ -1016,18 +1145,64 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c EXTEND(SP, len); EXTEND_MORTAL(len); while (len-- > 0) { - COPY16(s, &aushort); + COPY16(s, &au16); + DO_BO_UNPACK(au16, 16); s += SIZE16; sv = NEWSV(39, 0); #ifdef HAS_NTOHS if (datumtype == 'n') - aushort = PerlSock_ntohs(aushort); + au16 = PerlSock_ntohs(au16); #endif #ifdef HAS_VTOHS if (datumtype == 'v') - aushort = vtohs(aushort); + au16 = vtohs(au16); #endif - sv_setiv(sv, (UV)aushort); + sv_setiv(sv, (UV)au16); + PUSHs(sv_2mortal(sv)); + } + } + break; + case 'v' | TYPE_IS_SHRIEKING: + case 'n' | TYPE_IS_SHRIEKING: + along = (strend - s) / SIZE16; + if (len > along) + len = along; + if (checksum) { + while (len-- > 0) { + COPY16(s, &ai16); + s += SIZE16; +#ifdef HAS_NTOHS + if (datumtype == ('n' | TYPE_IS_SHRIEKING)) + ai16 = (I16)PerlSock_ntohs((U16)ai16); +#endif +#ifdef HAS_VTOHS + if (datumtype == ('v' | TYPE_IS_SHRIEKING)) + ai16 = (I16)vtohs((U16)ai16); +#endif + if (checksum > bits_in_uv) + cdouble += (NV)ai16; + else + cuv += ai16; + } + } + else { + if (len && unpack_only_one) + len = 1; + EXTEND(SP, len); + EXTEND_MORTAL(len); + while (len-- > 0) { + COPY16(s, &ai16); + s += SIZE16; +#ifdef HAS_NTOHS + if (datumtype == ('n' | TYPE_IS_SHRIEKING)) + ai16 = (I16)PerlSock_ntohs((U16)ai16); +#endif +#ifdef HAS_VTOHS + if (datumtype == ('v' | TYPE_IS_SHRIEKING)) + ai16 = (I16)vtohs((U16)ai16); +#endif + sv = NEWSV(39, 0); + sv_setiv(sv, (IV)ai16); PUSHs(sv_2mortal(sv)); } } @@ -1040,6 +1215,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c if (checksum) { while (len-- > 0) { Copy(s, &aint, 1, int); + DO_BO_UNPACK(aint, i); s += sizeof(int); if (checksum > bits_in_uv) cdouble += (NV)aint; @@ -1054,6 +1230,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c EXTEND_MORTAL(len); while (len-- > 0) { Copy(s, &aint, 1, int); + DO_BO_UNPACK(aint, i); s += sizeof(int); sv = NEWSV(40, 0); #ifdef __osf__ @@ -1094,6 +1271,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c if (checksum) { while (len-- > 0) { Copy(s, &auint, 1, unsigned int); + DO_BO_UNPACK(auint, i); s += sizeof(unsigned int); if (checksum > bits_in_uv) cdouble += (NV)auint; @@ -1108,6 +1286,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c EXTEND_MORTAL(len); while (len-- > 0) { Copy(s, &auint, 1, unsigned int); + DO_BO_UNPACK(auint, i); s += sizeof(unsigned int); sv = NEWSV(41, 0); #ifdef __osf__ @@ -1129,6 +1308,13 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c if (checksum) { 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 > bits_in_uv) cdouble += (NV)aiv; @@ -1143,6 +1329,13 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c EXTEND_MORTAL(len); 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; sv = NEWSV(40, 0); sv_setiv(sv, aiv); @@ -1157,6 +1350,13 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c if (checksum) { 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 > bits_in_uv) cdouble += (NV)auv; @@ -1171,6 +1371,13 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c EXTEND_MORTAL(len); 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; sv = NEWSV(41, 0); sv_setuv(sv, auv); @@ -1186,6 +1393,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c if (checksum) { while (len-- > 0) { COPYNN(s, &along, sizeof(long)); + DO_BO_UNPACK(along, l); s += sizeof(long); if (checksum > bits_in_uv) cdouble += (NV)along; @@ -1200,6 +1408,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c EXTEND_MORTAL(len); while (len-- > 0) { COPYNN(s, &along, sizeof(long)); + DO_BO_UNPACK(along, l); s += sizeof(long); sv = NEWSV(42, 0); sv_setiv(sv, (IV)along); @@ -1220,6 +1429,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c I32 along; #endif COPY32(s, &along); + DO_BO_UNPACK(along, 32); #if LONGSIZE > SIZE32 if (along > 2147483647) along -= 4294967296; @@ -1241,6 +1451,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c I32 along; #endif COPY32(s, &along); + DO_BO_UNPACK(along, 32); #if LONGSIZE > SIZE32 if (along > 2147483647) along -= 4294967296; @@ -1259,8 +1470,8 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c len = along; if (checksum) { while (len-- > 0) { - unsigned long aulong; COPYNN(s, &aulong, sizeof(unsigned long)); + DO_BO_UNPACK(aulong, l); s += sizeof(unsigned long); if (checksum > bits_in_uv) cdouble += (NV)aulong; @@ -1274,8 +1485,8 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c EXTEND(SP, len); EXTEND_MORTAL(len); while (len-- > 0) { - unsigned long aulong; COPYNN(s, &aulong, sizeof(unsigned long)); + DO_BO_UNPACK(aulong, l); s += sizeof(unsigned long); sv = NEWSV(43, 0); sv_setuv(sv, (UV)aulong); @@ -1294,20 +1505,21 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c len = along; if (checksum) { while (len-- > 0) { - COPY32(s, &aulong); + COPY32(s, &au32); + DO_BO_UNPACK(au32, 32); s += SIZE32; #ifdef HAS_NTOHL if (datumtype == 'N') - aulong = PerlSock_ntohl(aulong); + au32 = PerlSock_ntohl(au32); #endif #ifdef HAS_VTOHL if (datumtype == 'V') - aulong = vtohl(aulong); + au32 = vtohl(au32); #endif if (checksum > bits_in_uv) - cdouble += (NV)aulong; + cdouble += (NV)au32; else - cuv += aulong; + cuv += au32; } } else { @@ -1316,18 +1528,64 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c EXTEND(SP, len); EXTEND_MORTAL(len); while (len-- > 0) { - COPY32(s, &aulong); + COPY32(s, &au32); + DO_BO_UNPACK(au32, 32); s += SIZE32; #ifdef HAS_NTOHL if (datumtype == 'N') - aulong = PerlSock_ntohl(aulong); + au32 = PerlSock_ntohl(au32); #endif #ifdef HAS_VTOHL if (datumtype == 'V') - aulong = vtohl(aulong); + au32 = vtohl(au32); #endif sv = NEWSV(43, 0); - sv_setuv(sv, (UV)aulong); + sv_setuv(sv, (UV)au32); + PUSHs(sv_2mortal(sv)); + } + } + break; + case 'V' | TYPE_IS_SHRIEKING: + case 'N' | TYPE_IS_SHRIEKING: + along = (strend - s) / SIZE32; + if (len > along) + len = along; + if (checksum) { + while (len-- > 0) { + COPY32(s, &ai32); + s += SIZE32; +#ifdef HAS_NTOHL + if (datumtype == ('N' | TYPE_IS_SHRIEKING)) + ai32 = (I32)PerlSock_ntohl((U32)ai32); +#endif +#ifdef HAS_VTOHL + if (datumtype == ('V' | TYPE_IS_SHRIEKING)) + ai32 = (I32)vtohl((U32)ai32); +#endif + if (checksum > bits_in_uv) + cdouble += (NV)ai32; + else + cuv += ai32; + } + } + else { + if (len && unpack_only_one) + len = 1; + EXTEND(SP, len); + EXTEND_MORTAL(len); + while (len-- > 0) { + COPY32(s, &ai32); + s += SIZE32; +#ifdef HAS_NTOHL + if (datumtype == ('N' | TYPE_IS_SHRIEKING)) + ai32 = (I32)PerlSock_ntohl((U32)ai32); +#endif +#ifdef HAS_VTOHL + if (datumtype == ('V' | TYPE_IS_SHRIEKING)) + ai32 = (I32)vtohl((U32)ai32); +#endif + sv = NEWSV(43, 0); + sv_setiv(sv, (IV)ai32); PUSHs(sv_2mortal(sv)); } } @@ -1343,6 +1601,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c break; else { Copy(s, &aptr, 1, char*); + DO_BO_UNPACK_P(aptr); s += sizeof(char*); } sv = NEWSV(44, 0); @@ -1404,6 +1663,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c break; else { Copy(s, &aptr, 1, char*); + DO_BO_UNPACK_P(aptr); s += sizeof(char*); } sv = NEWSV(44, 0); @@ -1419,6 +1679,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c if (checksum) { while (len-- > 0) { Copy(s, &aquad, 1, Quad_t); + DO_BO_UNPACK(aquad, 64); s += sizeof(Quad_t); if (checksum > bits_in_uv) cdouble += (NV)aquad; @@ -1436,6 +1697,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c aquad = 0; else { Copy(s, &aquad, 1, Quad_t); + DO_BO_UNPACK(aquad, 64); s += sizeof(Quad_t); } sv = NEWSV(42, 0); @@ -1454,6 +1716,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c if (checksum) { while (len-- > 0) { Copy(s, &auquad, 1, Uquad_t); + DO_BO_UNPACK(auquad, 64); s += sizeof(Uquad_t); if (checksum > bits_in_uv) cdouble += (NV)auquad; @@ -1471,6 +1734,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c auquad = 0; else { Copy(s, &auquad, 1, Uquad_t); + DO_BO_UNPACK(auquad, 64); s += sizeof(Uquad_t); } sv = NEWSV(43, 0); @@ -1491,6 +1755,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c if (checksum) { while (len-- > 0) { Copy(s, &afloat, 1, float); + DO_BO_UNPACK_N(afloat, float); s += sizeof(float); cdouble += afloat; } @@ -1502,6 +1767,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c EXTEND_MORTAL(len); while (len-- > 0) { Copy(s, &afloat, 1, float); + DO_BO_UNPACK_N(afloat, float); s += sizeof(float); sv = NEWSV(47, 0); sv_setnv(sv, (NV)afloat); @@ -1516,6 +1782,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c if (checksum) { while (len-- > 0) { Copy(s, &adouble, 1, double); + DO_BO_UNPACK_N(adouble, double); s += sizeof(double); cdouble += adouble; } @@ -1527,6 +1794,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c EXTEND_MORTAL(len); while (len-- > 0) { Copy(s, &adouble, 1, double); + DO_BO_UNPACK_N(adouble, double); s += sizeof(double); sv = NEWSV(48, 0); sv_setnv(sv, (NV)adouble); @@ -1541,6 +1809,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c if (checksum) { while (len-- > 0) { Copy(s, &anv, 1, NV); + DO_BO_UNPACK_N(anv, NV); s += NVSIZE; cdouble += anv; } @@ -1552,6 +1821,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c EXTEND_MORTAL(len); while (len-- > 0) { Copy(s, &anv, 1, NV); + DO_BO_UNPACK_N(anv, NV); s += NVSIZE; sv = NEWSV(48, 0); sv_setnv(sv, anv); @@ -1567,6 +1837,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c if (checksum) { while (len-- > 0) { Copy(s, &aldouble, 1, long double); + DO_BO_UNPACK_N(aldouble, long double); s += LONG_DOUBLESIZE; cdouble += aldouble; } @@ -1578,6 +1849,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c EXTEND_MORTAL(len); while (len-- > 0) { Copy(s, &aldouble, 1, long double); + DO_BO_UNPACK_N(aldouble, long double); s += LONG_DOUBLESIZE; sv = NEWSV(48, 0); sv_setnv(sv, (NV)aldouble); @@ -1649,9 +1921,9 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c 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("csSiIlLnNUvVqQjJ", TYPE_NO_MODIFIERS(datumtype))) ) { NV trouble; adouble = (NV) (1 << (checksum & 15)); @@ -1707,8 +1979,7 @@ S_unpack_rec(pTHX_ register tempsym_t* symptr, register char *s, char *strbeg, c PP(pp_unpack) { dSP; - SV *right = (MAXARG > 1) ? POPs : GvSV(PL_defgv); - SV *left = POPs; + dPOPPOPssrl; I32 gimme = GIMME_V; STRLEN llen; STRLEN rlen; @@ -1898,24 +2169,34 @@ S_pack_rec(pTHX_ SV *cat, register tempsym_t* symptr, register SV **beglist, SV /* 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; @@ -1941,7 +2222,7 @@ S_pack_rec(pTHX_ SV *cat, register tempsym_t* symptr, register SV **beglist, SV len = symptr->length; break; case e_star: - len = strchr("@Xxu", datumtype) ? 0 : items; + len = strchr("@Xxu", TYPE_NO_MODIFIERS(datumtype)) ? 0 : items; break; } @@ -1961,9 +2242,9 @@ S_pack_rec(pTHX_ SV *cat, register tempsym_t* symptr, register SV **beglist, SV } } - 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 '@': @@ -2169,7 +2450,7 @@ S_pack_rec(pTHX_ SV *cat, register tempsym_t* symptr, register SV **beglist, SV case 'c': while (len-- > 0) { fromstr = NEXTFROM; - switch (datumtype) { + switch (TYPE_NO_MODIFIERS(datumtype)) { case 'C': aint = SvIV(fromstr); if ((aint < 0 || aint > 255) && @@ -2235,6 +2516,7 @@ S_pack_rec(pTHX_ SV *cat, register tempsym_t* symptr, register SV **beglist, SV afloat = (float)SvNV(fromstr); # endif #endif + DO_BO_PACK_N(afloat, float); sv_catpvn(cat, (char *)&afloat, sizeof (float)); } break; @@ -2267,53 +2549,60 @@ S_pack_rec(pTHX_ SV *cat, register tempsym_t* symptr, register SV **beglist, SV 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 + case 'n' | TYPE_IS_SHRIEKING: 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; + case 'v' | TYPE_IS_SHRIEKING: 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)); } } @@ -2323,12 +2612,11 @@ S_pack_rec(pTHX_ SV *cat, register tempsym_t* symptr, register SV **beglist, SV #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); } } @@ -2336,11 +2624,10 @@ S_pack_rec(pTHX_ SV *cat, register tempsym_t* symptr, register SV **beglist, SV 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)); } } @@ -2351,8 +2638,9 @@ S_pack_rec(pTHX_ SV *cat, register tempsym_t* symptr, register SV **beglist, SV 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': @@ -2360,6 +2648,7 @@ S_pack_rec(pTHX_ SV *cat, register tempsym_t* symptr, register SV **beglist, SV while (len-- > 0) { fromstr = NEXTFROM; auint = SvUV(fromstr); + DO_BO_PACK(auint, i); sv_catpvn(cat, (char*)&auint, sizeof(unsigned int)); } break; @@ -2367,6 +2656,13 @@ S_pack_rec(pTHX_ SV *cat, register tempsym_t* symptr, register SV **beglist, SV 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; @@ -2374,6 +2670,13 @@ S_pack_rec(pTHX_ SV *cat, register tempsym_t* symptr, register SV **beglist, SV 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; @@ -2430,11 +2733,17 @@ S_pack_rec(pTHX_ SV *cat, register tempsym_t* symptr, register SV **beglist, SV 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); @@ -2477,37 +2786,39 @@ S_pack_rec(pTHX_ SV *cat, register tempsym_t* symptr, register SV **beglist, SV while (len-- > 0) { fromstr = NEXTFROM; aint = SvIV(fromstr); + DO_BO_PACK(aint, i); sv_catpvn(cat, (char*)&aint, sizeof(int)); } break; + case 'N' | TYPE_IS_SHRIEKING: 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; + case 'V' | TYPE_IS_SHRIEKING: 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)); } } @@ -2519,19 +2830,19 @@ S_pack_rec(pTHX_ SV *cat, register tempsym_t* symptr, register SV **beglist, SV { 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)); } } @@ -2542,8 +2853,9 @@ S_pack_rec(pTHX_ SV *cat, register tempsym_t* symptr, register SV **beglist, SV 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 @@ -2551,6 +2863,7 @@ S_pack_rec(pTHX_ SV *cat, register tempsym_t* symptr, register SV **beglist, SV while (len-- > 0) { fromstr = NEXTFROM; auquad = (Uquad_t)SvUV(fromstr); + DO_BO_PACK(auquad, 64); sv_catpvn(cat, (char*)&auquad, sizeof(Uquad_t)); } break; @@ -2558,6 +2871,7 @@ S_pack_rec(pTHX_ SV *cat, register tempsym_t* symptr, register SV **beglist, SV while (len-- > 0) { fromstr = NEXTFROM; aquad = (Quad_t)SvIV(fromstr); + DO_BO_PACK(aquad, 64); sv_catpvn(cat, (char*)&aquad, sizeof(Quad_t)); } break; @@ -2589,6 +2903,7 @@ S_pack_rec(pTHX_ SV *cat, register tempsym_t* symptr, register SV **beglist, SV else aptr = SvPV_force(fromstr,n_a); } + DO_BO_PACK_P(aptr); sv_catpvn(cat, (char*)&aptr, sizeof(char*)); } break;