diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | bignum.c | 1 | ||||
| -rw-r--r-- | internal.h | 3 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Jun 21 20:28:09 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * internal.h (roomof): extract from type_roomof, and move from + bignum.c. + Sun Jun 21 18:32:37 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * ruby_atomic.h (ATOMIC_PTR_CAS): define by generic CAS macro, not @@ -98,7 +98,6 @@ STATIC_ASSERT(sizeof_long_and_sizeof_bdigit, SIZEOF_BDIGIT % SIZEOF_LONG == 0); rb_absint_size(x, NULL)) #define BIGDIVREM_EXTRA_WORDS 1 -#define roomof(n, m) ((long)(((n)+(m)-1) / (m))) #define bdigit_roomof(n) roomof(n, SIZEOF_BDIGIT) #define BARY_ARGS(ary) ary, numberof(ary) diff --git a/internal.h b/internal.h index 5fb1493be6..84eb6e204e 100644 --- a/internal.h +++ b/internal.h @@ -611,7 +611,8 @@ struct MEMO { #define MEMO_NEW(a, b, c) ((struct MEMO *)rb_imemo_new(imemo_memo, (VALUE)(a), (VALUE)(b), (VALUE)(c), 0)) -#define type_roomof(x, y) ((sizeof(x) + sizeof(y) - 1) / sizeof(y)) +#define roomof(x, y) (((x) + (y) - 1) / (y)) +#define type_roomof(x, y) roomof(sizeof(x), sizeof(y)) #define MEMO_FOR(type, value) ((type *)RARRAY_PTR(value)) #define NEW_MEMO_FOR(type, value) \ ((value) = rb_ary_tmp_new_fill(type_roomof(type, VALUE)), MEMO_FOR(type, value)) |