kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* pack.c (pack_unpack): Remove specialized unpackers for integers.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41567 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2013-06-22 12:05:31 +00:00
parent 972ae3e538
commit cdd1c04453
2 changed files with 23 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sat Jun 22 21:03:58 2013 Tanaka Akira <akr@fsij.org>
* pack.c (pack_unpack): Remove specialized unpackers for integers.
Sat Jun 22 20:36:50 2013 Tanaka Akira <akr@fsij.org> Sat Jun 22 20:36:50 2013 Tanaka Akira <akr@fsij.org>
* bignum.c (bary_unpack_internal): Specialized unpacker implemented. * bignum.c (bary_unpack_internal): Specialized unpacker implemented.

128
pack.c
View file

@ -226,7 +226,6 @@ TOKEN_PASTE(swap,x)(xtype z) \
#endif #endif
#define MAX_INTEGER_PACK_SIZE 8 #define MAX_INTEGER_PACK_SIZE 8
/* #define FORCE_BIG_PACK */
static const char toofew[] = "too few arguments"; static const char toofew[] = "too few arguments";
@ -1421,23 +1420,16 @@ pack_unpack(VALUE str, VALUE fmt)
break; break;
case 'c': case 'c':
PACK_LENGTH_ADJUST_SIZE(sizeof(char)); signed_p = 1;
while (len-- > 0) { integer_size = 1;
int c = *s++; bigendian_p = BIGENDIAN_P(); /* not effective */
if (c > (char)127) c-=256; goto unpack_integer;
UNPACK_PUSH(INT2FIX(c));
}
PACK_ITEM_ADJUST();
break;
case 'C': case 'C':
PACK_LENGTH_ADJUST_SIZE(sizeof(unsigned char)); signed_p = 0;
while (len-- > 0) { integer_size = 1;
unsigned char c = *s++; bigendian_p = BIGENDIAN_P(); /* not effective */
UNPACK_PUSH(INT2FIX(c)); goto unpack_integer;
}
PACK_ITEM_ADJUST();
break;
case 's': case 's':
signed_p = 1; signed_p = 1;
@ -1515,108 +1507,6 @@ pack_unpack(VALUE str, VALUE fmt)
if (explicit_endian) { if (explicit_endian) {
bigendian_p = explicit_endian == '>'; bigendian_p = explicit_endian == '>';
} }
switch (integer_size) {
#if defined(HAVE_INT16_T) && !defined(FORCE_BIG_PACK)
case SIZEOF_INT16_T:
if (signed_p) {
PACK_LENGTH_ADJUST_SIZE(sizeof(int16_t));
while (len-- > 0) {
union {
int16_t i;
char a[sizeof(int16_t)];
} v;
memcpy(v.a, s, sizeof(int16_t));
if (bigendian_p != BIGENDIAN_P()) v.i = swap16(v.i);
s += sizeof(int16_t);
UNPACK_PUSH(INT2FIX(v.i));
}
PACK_ITEM_ADJUST();
}
else {
PACK_LENGTH_ADJUST_SIZE(sizeof(uint16_t));
while (len-- > 0) {
union {
uint16_t i;
char a[sizeof(uint16_t)];
} v;
memcpy(v.a, s, sizeof(uint16_t));
if (bigendian_p != BIGENDIAN_P()) v.i = swap16(v.i);
s += sizeof(uint16_t);
UNPACK_PUSH(INT2FIX(v.i));
}
PACK_ITEM_ADJUST();
}
break;
#endif
#if defined(HAVE_INT32_T) && !defined(FORCE_BIG_PACK)
case SIZEOF_INT32_T:
if (signed_p) {
PACK_LENGTH_ADJUST_SIZE(sizeof(int32_t));
while (len-- > 0) {
union {
int32_t i;
char a[sizeof(int32_t)];
} v;
memcpy(v.a, s, sizeof(int32_t));
if (bigendian_p != BIGENDIAN_P()) v.i = swap32(v.i);
s += sizeof(int32_t);
UNPACK_PUSH(INT2NUM(v.i));
}
PACK_ITEM_ADJUST();
}
else {
PACK_LENGTH_ADJUST_SIZE(sizeof(uint32_t));
while (len-- > 0) {
union {
uint32_t i;
char a[sizeof(uint32_t)];
} v;
memcpy(v.a, s, sizeof(uint32_t));
if (bigendian_p != BIGENDIAN_P()) v.i = swap32(v.i);
s += sizeof(uint32_t);
UNPACK_PUSH(UINT2NUM(v.i));
}
PACK_ITEM_ADJUST();
}
break;
#endif
#if defined(HAVE_INT64_T) && !defined(FORCE_BIG_PACK)
case SIZEOF_INT64_T:
if (signed_p) {
PACK_LENGTH_ADJUST_SIZE(sizeof(int64_t));
while (len-- > 0) {
union {
int64_t i;
char a[sizeof(int64_t)];
} v;
memcpy(v.a, s, sizeof(int64_t));
if (bigendian_p != BIGENDIAN_P()) v.i = swap64(v.i);
s += sizeof(int64_t);
UNPACK_PUSH(INT64toNUM(v.i));
}
PACK_ITEM_ADJUST();
}
else {
PACK_LENGTH_ADJUST_SIZE(sizeof(uint64_t));
while (len-- > 0) {
union {
uint64_t i;
char a[sizeof(uint64_t)];
} v;
memcpy(v.a, s, sizeof(uint64_t));
if (bigendian_p != BIGENDIAN_P()) v.i = swap64(v.i);
s += sizeof(uint64_t);
UNPACK_PUSH(UINT64toNUM(v.i));
}
PACK_ITEM_ADJUST();
}
break;
#endif
default:
PACK_LENGTH_ADJUST_SIZE(integer_size); PACK_LENGTH_ADJUST_SIZE(integer_size);
while (len-- > 0) { while (len-- > 0) {
int flags = bigendian_p ? INTEGER_PACK_BIG_ENDIAN : INTEGER_PACK_LITTLE_ENDIAN; int flags = bigendian_p ? INTEGER_PACK_BIG_ENDIAN : INTEGER_PACK_LITTLE_ENDIAN;
@ -1629,8 +1519,6 @@ pack_unpack(VALUE str, VALUE fmt)
} }
PACK_ITEM_ADJUST(); PACK_ITEM_ADJUST();
break; break;
}
break;
case 'f': case 'f':
case 'F': case 'F':