1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* bignum.c (validate_integer_format): Extracted from rb_int_export and

Browse Source 
rb_int_import.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41144 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2013-06-07 10:49:12 +00:00
parent 84d8e58249
commit de1b0c96f0
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Jun 7 19:48:38 2013 Tanaka Akira <akr@fsij.org>
* bignum.c (validate_integer_format): Extracted from rb_int_export and
rb_int_import.
Fri Jun 7 19:23:15 2013 Tanaka Akira <akr@fsij.org> Fri Jun 7 19:23:15 2013 Tanaka Akira <akr@fsij.org>
* bignum.c (rb_absint_size): Use numberof. * bignum.c (rb_absint_size): Use numberof.

42
bignum.c
View File

@ -537,6 +537,21 @@ rb_absint_size_in_word(VALUE val, size_t word_numbits_arg, size_t *number_of_lea
return numwords; return numwords;
} }
static void
validate_integer_format(int wordorder, size_t wordsize, int endian, size_t nails)
{
if (wordorder != 1 && wordorder != -1)
rb_raise(rb_eArgError, "unexpected wordorder: %d", wordorder);
if (endian != 1 && endian != -1 && endian != 0)
rb_raise(rb_eArgError, "unexpected endian: %d", endian);
if (wordsize == 0)
rb_raise(rb_eArgError, "invalid wordsize: %"PRI_SIZE_PREFIX"u", wordsize);
if (SSIZE_MAX < wordsize)
rb_raise(rb_eArgError, "too big wordsize: %"PRI_SIZE_PREFIX"u", wordsize);
if (wordsize <= nails / CHAR_BIT)
rb_raise(rb_eArgError, "too big nails: %"PRI_SIZE_PREFIX"u", nails);
}
static inline void static inline void
int_export_fill_dd(BDIGIT **dpp, BDIGIT **dep, BDIGIT_DBL *ddp, int *numbits_in_dd_p) int_export_fill_dd(BDIGIT **dpp, BDIGIT **dep, BDIGIT_DBL *ddp, int *numbits_in_dd_p)
{ {
@ -580,6 +595,7 @@ int_export_take_lowbits(int n, BDIGIT_DBL *ddp, int *numbits_in_dd_p)
* This function returns words or the allocated buffer if words is NULL. * This function returns words or the allocated buffer if words is NULL.
* *
*/ */
void * void *
rb_int_export(VALUE val, int *signp, size_t *wordcount_allocated, void *words, size_t wordcount, int wordorder, size_t wordsize, int endian, size_t nails) rb_int_export(VALUE val, int *signp, size_t *wordcount_allocated, void *words, size_t wordcount, int wordorder, size_t wordsize, int endian, size_t nails)
{ {
@ -591,18 +607,9 @@ rb_int_export(VALUE val, int *signp, size_t *wordcount_allocated, void *words, s
val = rb_to_int(val); val = rb_to_int(val);
if (wordorder != 1 && wordorder != -1) validate_integer_format(wordorder, wordsize, endian, nails);
rb_raise(rb_eArgError, "unexpected wordorder: %d", wordorder);
if (endian != 1 && endian != -1 && endian != 0)
rb_raise(rb_eArgError, "unexpected endian: %d", endian);
if (wordsize == 0)
rb_raise(rb_eArgError, "invalid wordsize: %"PRI_SIZE_PREFIX"u", wordsize);
if (SSIZE_MAX < wordsize)
rb_raise(rb_eArgError, "too big wordsize: %"PRI_SIZE_PREFIX"u", wordsize);
if (words && SIZE_MAX / wordsize < wordcount) if (words && SIZE_MAX / wordsize < wordcount)
rb_raise(rb_eArgError, "too big count * wordsize: %"PRI_SIZE_PREFIX"u * %"PRI_SIZE_PREFIX"u", wordcount, wordsize); rb_raise(rb_eArgError, "too big count * wordsize: %"PRI_SIZE_PREFIX"u * %"PRI_SIZE_PREFIX"u", wordcount, wordsize);
if (wordsize <= nails / CHAR_BIT)
rb_raise(rb_eArgError, "too big nails: %"PRI_SIZE_PREFIX"u", nails);
if (endian == 0) { if (endian == 0) {
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
@ -822,20 +829,11 @@ rb_int_import(int sign, const void *words, size_t wordcount, int wordorder, size
BDIGIT_DBL dd; BDIGIT_DBL dd;
int numbits_in_dd; int numbits_in_dd;
if (sign != 1 && sign != 0 && sign != -1) validate_integer_format(wordorder, wordsize, endian, nails);
rb_raise(rb_eArgError, "unexpected sign: %d", sign);
if (wordorder != 1 && wordorder != -1)
rb_raise(rb_eArgError, "unexpected wordorder: %d", wordorder);
if (endian != 1 && endian != -1 && endian != 0)
rb_raise(rb_eArgError, "unexpected endian: %d", endian);
if (wordsize == 0)
rb_raise(rb_eArgError, "invalid wordsize: %"PRI_SIZE_PREFIX"u", wordsize);
if (SSIZE_MAX < wordsize)
rb_raise(rb_eArgError, "too big wordsize: %"PRI_SIZE_PREFIX"u", wordsize);
if (SIZE_MAX / wordsize < wordcount) if (SIZE_MAX / wordsize < wordcount)
rb_raise(rb_eArgError, "too big wordcount * wordsize: %"PRI_SIZE_PREFIX"u * %"PRI_SIZE_PREFIX"u", wordcount, wordsize); rb_raise(rb_eArgError, "too big wordcount * wordsize: %"PRI_SIZE_PREFIX"u * %"PRI_SIZE_PREFIX"u", wordcount, wordsize);
if (wordsize <= nails / CHAR_BIT) if (sign != 1 && sign != 0 && sign != -1)
rb_raise(rb_eArgError, "too big nails: %"PRI_SIZE_PREFIX"u", nails); rb_raise(rb_eArgError, "unexpected sign: %d", sign);
if (endian == 0) { if (endian == 0) {
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN