From a30d9f9e1e853d7e28f4ad4b77e4db37ee05ae15 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 19 Jun 2013 16:07:41 +0000 Subject: [PATCH] gc.c: refine macros * gc.c (MARKED_IN_BITMAP, FL_TEST2): return boolean value since always used as boolean value. * gc.c (MARK_IN_BITMAP, CLEAR_IN_BITMAP): evaluate bits once. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41445 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ gc.c | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ddff140e60..016e04f272 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Jun 20 01:07:39 2013 Nobuyoshi Nakada + + * gc.c (MARKED_IN_BITMAP, FL_TEST2): return boolean value since always + used as boolean value. + + * gc.c (MARK_IN_BITMAP, CLEAR_IN_BITMAP): evaluate bits once. + Thu Jun 20 00:05:07 2013 Koichi Sasada * gc.c (RVALUE_PROMOTED): fix type. diff --git a/gc.c b/gc.c index 6a3586dcca..cd0188844a 100644 --- a/gc.c +++ b/gc.c @@ -445,9 +445,9 @@ VALUE *ruby_initial_gc_stress_ptr = &rb_objspace.gc_stress; #define BITMAP_OFFSET(p) (NUM_IN_SLOT(p) & ((sizeof(uintptr_t) * CHAR_BIT)-1)) #define BITMAP_BIT(p) ((uintptr_t)1 << BITMAP_OFFSET(p)) /* Marking */ -#define MARKED_IN_BITMAP(bits, p) (bits[BITMAP_INDEX(p)] & BITMAP_BIT(p)) -#define MARK_IN_BITMAP(bits, p) (bits[BITMAP_INDEX(p)] = bits[BITMAP_INDEX(p)] | BITMAP_BIT(p)) -#define CLEAR_IN_BITMAP(bits, p) (bits[BITMAP_INDEX(p)] = bits[BITMAP_INDEX(p)] & ~BITMAP_BIT(p)) +#define MARKED_IN_BITMAP(bits, p) (((bits)[BITMAP_INDEX(p)] & BITMAP_BIT(p)) != 0) +#define MARK_IN_BITMAP(bits, p) ((bits)[BITMAP_INDEX(p)] |= BITMAP_BIT(p)) +#define CLEAR_IN_BITMAP(bits, p) ((bits)[BITMAP_INDEX(p)] &= ~BITMAP_BIT(p)) #ifndef HEAP_ALIGN_LOG @@ -513,7 +513,7 @@ static void rgengc_remember(rb_objspace_t *objspace, VALUE obj); static void rgengc_mark_and_rememberset_clear(rb_objspace_t *objspace); static size_t rgengc_rememberset_mark(rb_objspace_t *objspace); -#define FL_TEST2(x,f) ((RGENGC_CHECK_MODE && SPECIAL_CONST_P(x)) ? (rb_bug("FL_TEST2: SPECIAL_CONST"), 0) : FL_TEST_RAW((x),(f))) +#define FL_TEST2(x,f) ((RGENGC_CHECK_MODE && SPECIAL_CONST_P(x)) ? (rb_bug("FL_TEST2: SPECIAL_CONST"), 0) : FL_TEST_RAW((x),(f)) != 0) #define FL_SET2(x,f) do {if (RGENGC_CHECK_MODE && SPECIAL_CONST_P(x)) rb_bug("FL_SET2: SPECIAL_CONST"); RBASIC(x)->flags |= (f);} while (0) #define FL_UNSET2(x,f) do {if (RGENGC_CHECK_MODE && SPECIAL_CONST_P(x)) rb_bug("FL_UNSET2: SPECIAL_CONST"); RBASIC(x)->flags &= ~(f);} while (0)