* 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);
-#endif
-
-/*
* Offset for integer pack/unpack.
*
* On architectures where I16 and I32 aren't really 16 and 32 bits,
/* 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_ENDIANNESS(t) ((t) & TYPE_ENDIANNESS_MASK)
#define TYPE_NO_ENDIANNESS(t) ((t) & ~TYPE_ENDIANNESS_MASK)
+#define TYPE_MODIFIERS(t) ((t) & ~0xFF)
#define TYPE_NO_MODIFIERS(t) ((t) & 0xFF)
+#define ENDIANNESS_ALLOWED_TYPES "sSiIlLqQjJfFdDpP("
+
#define DO_BO_UNPACK(var, type) \
STMT_START { \
- switch (datumtype & TYPE_ENDIANNESS_MASK) { \
+ 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; \
#define DO_BO_PACK(var, type) \
STMT_START { \
- switch (datumtype & TYPE_ENDIANNESS_MASK) { \
+ 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; \
#define DO_BO_UNPACK_PTR(var, type, pre_cast) \
STMT_START { \
- switch (datumtype & TYPE_ENDIANNESS_MASK) { \
+ switch (TYPE_ENDIANNESS(datumtype)) { \
case TYPE_IS_BIG_ENDIAN: \
var = (void *) my_betoh ## type ((pre_cast) var); \
break; \
#define DO_BO_PACK_PTR(var, type, pre_cast) \
STMT_START { \
- switch (datumtype & TYPE_ENDIANNESS_MASK) { \
+ switch (TYPE_ENDIANNESS(datumtype)) { \
case TYPE_IS_BIG_ENDIAN: \
var = (void *) my_htobe ## type ((pre_cast) var); \
break; \
} STMT_END
#define BO_CANT_DOIT(action, type) \
- STMT_START { \
- switch (datumtype & TYPE_ENDIANNESS_MASK) { \
+ 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); \
defined(my_htoben) && defined(my_betohn)
# define DO_BO_UNPACK_N(var, type) \
STMT_START { \
- switch (datumtype & TYPE_ENDIANNESS_MASK) { \
+ 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; \
# define DO_BO_PACK_N(var, type) \
STMT_START { \
- switch (datumtype & TYPE_ENDIANNESS_MASK) { \
+ 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; \
} 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" );
}
+ /* 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;
break;
case '>':
modifier = TYPE_IS_BIG_ENDIAN;
- allowed = "sSiIlLqQjJfFdDpP";
+ allowed = ENDIANNESS_ALLOWED_TYPES;
break;
case '<':
modifier = TYPE_IS_LITTLE_ENDIAN;
- allowed = "sSiIlLqQjJfFdDpP";
+ allowed = ENDIANNESS_ALLOWED_TYPES;
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))
+
+ 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),
*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" );
}
howlen_t howlen;
/* These must not be in registers: */
- 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;
- I16 asshort;
+ int aint;
unsigned int auint;
- U32 aulong;
- I32 aslong;
-#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;
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
{
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;
}
SPAGAIN;
s = ss;
+ symptr->flags &= ~group_modifiers;
savsym.flags = symptr->flags;
*symptr = savsym;
break;
if (len > along)
len = along;
if (checksum) {
- short ashort;
while (len-- > 0) {
COPYNN(s, &ashort, sizeof(short));
DO_BO_UNPACK(ashort, s);
}
}
else {
- short ashort;
if (len && unpack_only_one)
len = 1;
EXTEND(SP, len);
len = along;
if (checksum) {
while (len-- > 0) {
- COPY16(s, &asshort);
- DO_BO_UNPACK(asshort, 16);
+ COPY16(s, &ai16);
+ DO_BO_UNPACK(ai16, 16);
#if U16SIZE > SIZE16
- if (asshort > 32767)
- asshort -= 65536;
+ if (ai16 > 32767)
+ ai16 -= 65536;
#endif
s += SIZE16;
if (checksum > bits_in_uv)
- cdouble += (NV)asshort;
+ cdouble += (NV)ai16;
else
- cuv += asshort;
+ cuv += ai16;
}
}
else {
EXTEND_MORTAL(len);
while (len-- > 0) {
- COPY16(s, &asshort);
- DO_BO_UNPACK(asshort, 16);
+ COPY16(s, &ai16);
+ DO_BO_UNPACK(ai16, 16);
#if U16SIZE > SIZE16
- if (asshort > 32767)
- asshort -= 65536;
+ if (ai16 > 32767)
+ ai16 -= 65536;
#endif
s += SIZE16;
sv = NEWSV(38, 0);
- sv_setiv(sv, (IV)asshort);
+ sv_setiv(sv, (IV)ai16);
PUSHs(sv_2mortal(sv));
}
}
if (len > along)
len = along;
if (checksum) {
- unsigned short aushort;
while (len-- > 0) {
COPYNN(s, &aushort, sizeof(unsigned short));
DO_BO_UNPACK(aushort, s);
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);
len = along;
if (checksum) {
while (len-- > 0) {
- COPY16(s, &aushort);
- DO_BO_UNPACK(aushort, 16);
+ 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 {
EXTEND(SP, len);
EXTEND_MORTAL(len);
while (len-- > 0) {
- COPY16(s, &aushort);
- DO_BO_UNPACK(aushort, 16);
+ 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));
}
}
len = along;
if (checksum) {
while (len-- > 0) {
- COPY16(s, &asshort);
+ COPY16(s, &ai16);
s += SIZE16;
#ifdef HAS_NTOHS
if (datumtype == ('n' | TYPE_IS_SHRIEKING))
- asshort = (I16)PerlSock_ntohs((U16)asshort);
+ ai16 = (I16)PerlSock_ntohs((U16)ai16);
#endif
#ifdef HAS_VTOHS
if (datumtype == ('v' | TYPE_IS_SHRIEKING))
- asshort = (I16)vtohs((U16)asshort);
+ ai16 = (I16)vtohs((U16)ai16);
#endif
if (checksum > bits_in_uv)
- cdouble += (NV)asshort;
+ cdouble += (NV)ai16;
else
- cuv += asshort;
+ cuv += ai16;
}
}
else {
EXTEND(SP, len);
EXTEND_MORTAL(len);
while (len-- > 0) {
- COPY16(s, &asshort);
+ COPY16(s, &ai16);
s += SIZE16;
#ifdef HAS_NTOHS
if (datumtype == ('n' | TYPE_IS_SHRIEKING))
- asshort = (I16)PerlSock_ntohs((U16)asshort);
+ ai16 = (I16)PerlSock_ntohs((U16)ai16);
#endif
#ifdef HAS_VTOHS
if (datumtype == ('v' | TYPE_IS_SHRIEKING))
- asshort = (I16)vtohs((U16)asshort);
+ ai16 = (I16)vtohs((U16)ai16);
#endif
sv = NEWSV(39, 0);
- sv_setiv(sv, (IV)asshort);
+ sv_setiv(sv, (IV)ai16);
PUSHs(sv_2mortal(sv));
}
}
len = along;
if (checksum) {
while (len-- > 0) {
-#if LONGSIZE > SIZE32 && INTSIZE == SIZE32
- I32 along;
-#endif
- COPY32(s, &along);
- DO_BO_UNPACK(along, 32);
-#if LONGSIZE > SIZE32
- if (along > 2147483647)
- along -= 4294967296;
+ 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;
+ cdouble += (NV)ai32;
else
- cuv += along;
+ cuv += ai32;
}
}
else {
EXTEND(SP, len);
EXTEND_MORTAL(len);
while (len-- > 0) {
-#if LONGSIZE > SIZE32 && INTSIZE == SIZE32
- I32 along;
-#endif
- COPY32(s, &along);
- DO_BO_UNPACK(along, 32);
-#if LONGSIZE > SIZE32
- if (along > 2147483647)
- along -= 4294967296;
+ COPY32(s, &ai32);
+ DO_BO_UNPACK(ai32, 32);
+#if U32SIZE > SIZE32
+ if (ai32 > 2147483647)
+ ai32 -= 4294967296;
#endif
s += SIZE32;
sv = NEWSV(42, 0);
- sv_setiv(sv, (IV)along);
+ sv_setiv(sv, (IV)ai32);
PUSHs(sv_2mortal(sv));
}
}
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);
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);
len = along;
if (checksum) {
while (len-- > 0) {
- COPY32(s, &aulong);
- DO_BO_UNPACK(aulong, 32);
+ 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 {
EXTEND(SP, len);
EXTEND_MORTAL(len);
while (len-- > 0) {
- COPY32(s, &aulong);
- DO_BO_UNPACK(aulong, 32);
+ 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));
}
}
len = along;
if (checksum) {
while (len-- > 0) {
- COPY32(s, &aslong);
+ COPY32(s, &ai32);
s += SIZE32;
#ifdef HAS_NTOHL
if (datumtype == ('N' | TYPE_IS_SHRIEKING))
- aslong = (I32)PerlSock_ntohl((U32)aslong);
+ ai32 = (I32)PerlSock_ntohl((U32)ai32);
#endif
#ifdef HAS_VTOHL
if (datumtype == ('V' | TYPE_IS_SHRIEKING))
- aslong = (I32)vtohl((U32)aslong);
+ ai32 = (I32)vtohl((U32)ai32);
#endif
if (checksum > bits_in_uv)
- cdouble += (NV)aslong;
+ cdouble += (NV)ai32;
else
- cuv += aslong;
+ cuv += ai32;
}
}
else {
EXTEND(SP, len);
EXTEND_MORTAL(len);
while (len-- > 0) {
- COPY32(s, &aslong);
+ COPY32(s, &ai32);
s += SIZE32;
#ifdef HAS_NTOHL
if (datumtype == ('N' | TYPE_IS_SHRIEKING))
- aslong = (I32)PerlSock_ntohl((U32)aslong);
+ ai32 = (I32)PerlSock_ntohl((U32)ai32);
#endif
#ifdef HAS_VTOHL
if (datumtype == ('V' | TYPE_IS_SHRIEKING))
- aslong = (I32)vtohl((U32)aslong);
+ ai32 = (I32)vtohl((U32)ai32);
#endif
sv = NEWSV(43, 0);
- sv_setiv(sv, (IV)aslong);
+ sv_setiv(sv, (IV)ai32);
PUSHs(sv_2mortal(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;
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;
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);
#endif
case 'S':
{
- U16 aushort;
-
while (len-- > 0) {
fromstr = NEXTFROM;
- aushort = (U16)SvUV(fromstr);
- DO_BO_PACK(aushort, 16);
- 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);
case 's':
while (len-- > 0) {
fromstr = NEXTFROM;
- ashort = (I16)SvIV(fromstr);
- DO_BO_PACK(ashort, 16);
- CAT16(cat, &ashort);
+ ai16 = (I16)SvIV(fromstr);
+ DO_BO_PACK(ai16, 16);
+ CAT16(cat, &ai16);
}
break;
case 'I':
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);
{
while (len-- > 0) {
fromstr = NEXTFROM;
- aulong = SvUV(fromstr);
- DO_BO_PACK(aulong, 32);
- 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);
case 'l':
while (len-- > 0) {
fromstr = NEXTFROM;
- along = SvIV(fromstr);
- DO_BO_PACK(along, 32);
- CAT32(cat, &along);
+ ai32 = SvIV(fromstr);
+ DO_BO_PACK(ai32, 32);
+ CAT32(cat, &ai32);
}
break;
#ifdef HAS_QUAD
https://perl5.git.perl.org / perl5.git / blobdiff